diff --git a/NumericalData/CDPP-AMDA/ARTEMIS/P2/Ephemeris/athp2-orb-all.xml b/NumericalData/CDPP-AMDA/ARTEMIS/P2/Ephemeris/athp2-orb-all.xml
index 956c4b3..efade0a 100644
--- a/NumericalData/CDPP-AMDA/ARTEMIS/P2/Ephemeris/athp2-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/ARTEMIS/P2/Ephemeris/athp2-orb-all.xml
@@ -72,17 +72,17 @@
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>athp2_xyz(0)</ParameterKey>
+          <ParameterKey>athp2_xyz_gse(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
           <Index>2</Index>
-          <ParameterKey>athp2_xyz(1)</ParameterKey>
+          <ParameterKey>athp2_xyz_gse(1)</ParameterKey>
         </Element>
         <Element>
           <Name>z</Name>
           <Index>3</Index>
-          <ParameterKey>athp2_xyz(2)</ParameterKey>
+          <ParameterKey>athp2_xyz_gse(2)</ParameterKey>
         </Element>
       </Structure>
       <Support>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
index 7564531..58fe41e 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
@@ -113,7 +113,7 @@
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>amal_sat_jso(0)</ParameterKey>
+          <ParameterKey>amal_jup_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
index 79c1f40..4858814 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
@@ -124,7 +124,7 @@ The radiation level at Callisto's surface is equivalent to a dose of about 0.01 
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>cal_sat_jso(0)</ParameterKey>
+          <ParameterKey>cal_jup_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
index bf091ce..887d5a4 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
@@ -131,7 +131,7 @@ orbital resonance.</Description>
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>eur_sat_jso(0)</ParameterKey>
+          <ParameterKey>eur_jup_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
index 3de3d89..719503b 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
@@ -121,7 +121,7 @@ resonance. </Description>
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>gan_sat_jso(0)</ParameterKey>
+          <ParameterKey>gan_jup_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
index 6a5b8b4..3b99b82 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
@@ -117,7 +117,7 @@ as the trailing hemisphere.</Description>
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>io_sat_jso(0)</ParameterKey>
+          <ParameterKey>io_jup_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/mars-deimos-orb.xml b/NumericalData/CDPP-AMDA/Ephemerides/mars-deimos-orb.xml
index a9911be..81158ff 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/mars-deimos-orb.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/mars-deimos-orb.xml
@@ -73,17 +73,17 @@
         <Element>
           <Name>deimos_x</Name>
           <Index>1</Index>
-          <ParameterKey>deimos_xyz_mso(0)</ParameterKey>
+          <ParameterKey>xyz_deimos(0)</ParameterKey>
         </Element>
         <Element>
           <Name>deimos_y</Name>
           <Index>2</Index>
-          <ParameterKey>deimos_xyz_mso(1)</ParameterKey>
+          <ParameterKey>xyz_deimos(1)</ParameterKey>
         </Element>
         <Element>
           <Name>deimos_z</Name>
           <Index>3</Index>
-          <ParameterKey>deimos_xyz_mso(2)</ParameterKey>
+          <ParameterKey>xyz_deimos(2)</ParameterKey>
         </Element>
       </Structure>
       <Support>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
index 43899e8..ded6229 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
@@ -80,7 +80,7 @@
         <Element>
           <Name>x_ephio</Name>
           <Index>1</Index>
-          <ParameterKey>gll_orb_euxyziphio(0)</ParameterKey>
+          <ParameterKey>gll_orb_euxyzephio(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y_ephio</Name>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
index 29ded6b..58c1444 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
@@ -150,17 +150,17 @@
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>juice_jucr30_js0(0)</ParameterKey>
+          <ParameterKey>juice_jucr30_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
           <Index>2</Index>
-          <ParameterKey>juice_jucr30_js0(1)</ParameterKey>
+          <ParameterKey>juice_jucr30_jso(1)</ParameterKey>
         </Element>
         <Element>
           <Name>z</Name>
           <Index>3</Index>
-          <ParameterKey>juice_jucr30_js0(2)</ParameterKey>
+          <ParameterKey>juice_jucr30_jso(2)</ParameterKey>
         </Element>
       </Structure>
       <Support>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
index 422b095..b5654b9 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
@@ -148,17 +148,17 @@
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>juice_jucr32_js0(0)</ParameterKey>
+          <ParameterKey>juice_jucr32_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
           <Index>2</Index>
-          <ParameterKey>juice_jucr32_js0(1)</ParameterKey>
+          <ParameterKey>juice_jucr32_jso(1)</ParameterKey>
         </Element>
         <Element>
           <Name>z</Name>
           <Index>3</Index>
-          <ParameterKey>juice_jucr32_js0(2)</ParameterKey>
+          <ParameterKey>juice_jucr32_jso(2)</ParameterKey>
         </Element>
       </Structure>
       <Support>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
index 1c56add..27ee2c2 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
@@ -148,17 +148,17 @@
         <Element>
           <Name>x</Name>
           <Index>1</Index>
-          <ParameterKey>juice_jucr41_js0(0)</ParameterKey>
+          <ParameterKey>juice_jucr41_jso(0)</ParameterKey>
         </Element>
         <Element>
           <Name>y</Name>
           <Index>2</Index>
-          <ParameterKey>juice_jucr41_js0(1)</ParameterKey>
+          <ParameterKey>juice_jucr41_jso(1)</ParameterKey>
         </Element>
         <Element>
           <Name>z</Name>
           <Index>3</Index>
-          <ParameterKey>juice_jucr41_js0(2)</ParameterKey>
+          <ParameterKey>juice_jucr41_jso(2)</ParameterKey>
         </Element>
       </Structure>
       <Support>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs1s.xml b/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs1s.xml
index c11be0e..40121be 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs1s.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs1s.xml
@@ -119,7 +119,7 @@
         <Element>
           <Name>y</Name>
           <Index>2</Index>
-          <ParameterKey>mav_xyz_mso(11s)</ParameterKey>
+          <ParameterKey>mav_xyz_mso1s(1)</ParameterKey>
         </Element>
         <Element>
           <Name>z</Name>
diff --git a/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-Hmom.xml b/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-Hmom.xml
index a90d996..cc4d24a 100644
--- a/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-Hmom.xml
+++ b/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-Hmom.xml
@@ -273,7 +273,7 @@
           <Name>vz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
-          <ParameterKey>psp_spc_Hv_inst(2)</ParameterKey>
+          <ParameterKey>psp_spi_Hv_inst(2)</ParameterKey>
         </Element>
       </Structure>
       <Particle>
diff --git a/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-amom.xml b/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-amom.xml
index 04da7cf..5466be2 100644
--- a/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-amom.xml
+++ b/NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-amom.xml
@@ -283,7 +283,7 @@
           <Name>vz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
-          <ParameterKey>psp_spc_av_inst(2)</ParameterKey>
+          <ParameterKey>psp_spi_av_inst(2)</ParameterKey>
         </Element>
       </Structure>
       <Particle>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
index 2e0ba62..3e84180 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
@@ -150,7 +150,7 @@
           <Name>bz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
-          <ParameterKey>solo_b_sr_8s(2)</ParameterKey>
+          <ParameterKey>solo_b_srf_8s(2)</ParameterKey>
         </Element>
       </Structure>
       <Field>
diff --git a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
index fe7de90..3e8e7c8 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
@@ -85,7 +85,7 @@
         <Element>
           <Name>bn</Name>
           <Index>3</Index>
-          <ParameterKey>vo2_b_uratn(2)</ParameterKey>
+          <ParameterKey>vo2_b_urartn(2)</ParameterKey>
         </Element>
       </Structure>
       <Field>
--
libgit2 0.21.2