diff --git a/send_data.py b/send_data.py
index e85bebf..6e03cf0 100644
--- a/send_data.py
+++ b/send_data.py
@@ -53,7 +53,7 @@ def put_mapping(index_name, mapping_file, quiet=False):
         print("Put '{}' mapping file...".format(mapping_file.name))
     res = requests.put(url=ELASTICSEARCH_URL + index_name,
                        data=mapping_file,
-                       headers={'Content-Type': 'application/x-ndjson'})
+                       headers={'Content-Type': 'application/json'})
     if res.status_code != 200:
         print("An error occured")
         print(res.text)
@@ -69,9 +69,9 @@ ELASTICSEARCH_URL = 'http://localhost:9200/'
 INDEX_NAME = "itunessongs"
 
 # Default file names
-DEFAULT_SONG_FILE = 'es-music-data.json'
-DEFAULT_ALBUM_FILE = 'es-albums-data.json'
-DEFAULT_ARTIST_FILE = 'es-artist-data.json'
+DEFAULT_SONG_FILE = 'es-songs.json'
+DEFAULT_ALBUM_FILE = 'es-albums.json'
+DEFAULT_ARTIST_FILE = 'es-artists.json'
 DEFAULT_MAPPING_FILE = 'mapping.json'
 
 # Get options
@@ -117,6 +117,7 @@ if __name__ == '__main__':
 
     # Overloaded setting value
     INDEX_NAME = args.index_name
+    # TODO Critical: index in in the file!
     ELASTICSEARCH_URL = args.elasticsearch_url
 
     if not args.quiet: