diff --git a/.gitignore b/.gitignore
index d4afbc1..f4b99d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@
 .DS_Store
 docs/_build
 docs/.ipynb_checkpoints/
-6843672087120107264_gaiaxp_0.jpg
-6843672087120107264_gaiaxp_spec.dat
-docs/6843672087120107264_gaiaxp_0.jpg
-docs/6843672087120107264_gaiaxp_spec.dat
+gaiaxp_6843672087120107264_0.jpg
+gaiaxp_6843672087120107264.dat
+docs/gaiaxp_6843672087120107264_0.jpg
+docs/gaiaxp_6843672087120107264.dat
 build/
 dist/
 calistar.egg-info/
diff --git a/Makefile b/Makefile
index 24bbd39..ecd23f3 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,10 @@ clean:
 	rm -f coverage.xml
 	rm -f docs/calib_*
 	rm -f docs/target_*
-	rm -f 6843672087120107264_gaiaxp_0.jpg
-	rm -f 6843672087120107264_gaiaxp_spec.dat
-	rm -f docs/6843672087120107264_gaiaxp_0.jpg
-	rm -f docs/6843672087120107264_gaiaxp_spec.dat
+	rm -f gaiaxp_6843672087120107264_0.jpg
+	rm -f gaiaxp_6843672087120107264.dat
+	rm -f docs/gaiaxp_6843672087120107264_0.jpg
+	rm -f docs/gaiaxp_6843672087120107264.dat
 	rm -f calib_*
 	rm -f target_*
 	rm -rf .pytest_cache/
diff --git a/calistar/calistar.py b/calistar/calistar.py
index 2eee41b..a6a0205 100644
--- a/calistar/calistar.py
+++ b/calistar/calistar.py
@@ -432,7 +432,7 @@ def target_star(
                 password=None,
             )
 
-            xp_plot = f"{self.gaia_source}_gaiaxp"
+            xp_plot = f"gaiaxp_{self.gaia_source}"
             print(f"\nStoring Gaia XP plot: {xp_plot}_0.jpg")
 
             plot_spectra(
@@ -451,7 +451,7 @@ def target_star(
             xp_error = 1e3 * df_cal["flux_error"].to_numpy()[0]
 
             header = "Wavelength (um) - Flux (W m-2 um-1) - Uncertainty (W m-2 um-1)"
-            xp_file = f"{self.gaia_source}_gaiaxp_spec.dat"
+            xp_file = f"gaiaxp_{self.gaia_source}.dat"
             xp_spec = np.column_stack([xp_wavel, xp_flux, xp_error])
             np.savetxt(xp_file, xp_spec, header=header)
             print(f"Storing Gaia XP spectrum: {xp_file}")
diff --git a/docs/tutorial.ipynb b/docs/tutorial.ipynb
index ac827b2..8ca855c 100644
--- a/docs/tutorial.ipynb
+++ b/docs/tutorial.ipynb
@@ -50,11 +50,11 @@
     {
      "data": {
       "text/html": [
-       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">calistar v0.</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">0.2</span>\n",
+       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">calistar v0.</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">0.3</span>\n",
        "</pre>\n"
       ],
       "text/plain": [
-       "\u001b[1;35mcalistar v0.\u001b[0m\u001b[1;35m0.2\u001b[0m\n"
+       "\u001b[1;35mcalistar v0.\u001b[0m\u001b[1;35m0.3\u001b[0m\n"
       ]
      },
      "metadata": {},
@@ -132,8 +132,8 @@
      "output_type": "stream",
      "text": [
       "\n",
-      "Storing Gaia XP plot: 6843672087120107264_gaiaxp_0.jpg\n",
-      "Storing Gaia XP spectrum: 6843672087120107264_gaiaxp_spec.dat\n",
+      "Storing Gaia XP plot: gaiaxp_6843672087120107264_0.jpg\n",
+      "Storing Gaia XP spectrum: gaiaxp_6843672087120107264.dat\n",
       "\n",
       "-> Querying Simbad...\n",
       "\n",
@@ -203,7 +203,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "af3fceb7cea7429b8b3e88f043b05add",
+       "model_id": "e46346ca1e934b4fb7939d2b007a1565",
        "version_major": 2,
        "version_minor": 0
       },
@@ -319,7 +319,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "c1fe7e9fede142b18e1206f65e90980e",
+       "model_id": "0fa9bdc204894a4a89cc002f348ce29c",
        "version_major": 2,
        "version_minor": 0
       },