diff --git a/Instrument/AMDA/STEREO-A/Ephemeris.xml b/Instrument/AMDA/STEREO-A/Ephemeris.xml
index 85677f0..08cd3f7 100644
--- a/Instrument/AMDA/STEREO-A/Ephemeris.xml
+++ b/Instrument/AMDA/STEREO-A/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/STEREO-A/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>STEREO-A Position</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>STEREO-A Ephemeris</AlternateName>
       <ReleaseDate>2009-05-20T21:10:10Z</ReleaseDate>
       <Description>STEREO-A spacecraft position in various coordinate systems</Description>
diff --git a/Instrument/AMDA/STEREO-B/Ephemeris.xml b/Instrument/AMDA/STEREO-B/Ephemeris.xml
index fba55bd..581cc41 100644
--- a/Instrument/AMDA/STEREO-B/Ephemeris.xml
+++ b/Instrument/AMDA/STEREO-B/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/STEREO-B/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>STEREO-B Position</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>STEREO-B Ephemeris</AlternateName>
       <ReleaseDate>2009-05-20T21:10:12Z</ReleaseDate>
       <Description>STEREO-B spacecraft position in various coordinate systems</Description>
diff --git a/Instrument/AMDA/THEMIS/A/Ephemeris.xml b/Instrument/AMDA/THEMIS/A/Ephemeris.xml
index 611deab..625616d 100644
--- a/Instrument/AMDA/THEMIS/A/Ephemeris.xml
+++ b/Instrument/AMDA/THEMIS/A/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/THEMIS/A/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>THEMIS-A Probe Status</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>THEMIS-A Positions</AlternateName>
       <ReleaseDate>2009-05-20T21:10:04Z</ReleaseDate>
       <Description>THEMIS-A probe status (including position)</Description>
diff --git a/Instrument/AMDA/THEMIS/B/Ephemeris.xml b/Instrument/AMDA/THEMIS/B/Ephemeris.xml
index b783a58..f4a9eaf 100644
--- a/Instrument/AMDA/THEMIS/B/Ephemeris.xml
+++ b/Instrument/AMDA/THEMIS/B/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/THEMIS/B/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>THEMIS-B Probe Status</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>THEMIS-B Positions</AlternateName>
       <ReleaseDate>2009-05-20T21:10:04Z</ReleaseDate>
       <Description>THEMIS-B probe status (including position)</Description>
diff --git a/Instrument/AMDA/THEMIS/C/Ephemeris.xml b/Instrument/AMDA/THEMIS/C/Ephemeris.xml
index 7f7a601..0cf0b8c 100644
--- a/Instrument/AMDA/THEMIS/C/Ephemeris.xml
+++ b/Instrument/AMDA/THEMIS/C/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/THEMIS/C/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>THEMIS-C Probe Status</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>THEMIS-C Positions</AlternateName>
       <ReleaseDate>2009-05-20T21:10:04Z</ReleaseDate>
       <Description>THEMIS-B probe status (including position)</Description>
diff --git a/Instrument/AMDA/THEMIS/D/Ephemeris.xml b/Instrument/AMDA/THEMIS/D/Ephemeris.xml
index 3bd8169..fcd1ad6 100644
--- a/Instrument/AMDA/THEMIS/D/Ephemeris.xml
+++ b/Instrument/AMDA/THEMIS/D/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/THEMIS/D/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>THEMIS-D Probe Status</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>THEMIS-D Positions</AlternateName>
       <ReleaseDate>2009-05-20T21:10:04Z</ReleaseDate>
       <Description>THEMIS-D probe status (including position)</Description>
diff --git a/Instrument/AMDA/THEMIS/E/Ephemeris.xml b/Instrument/AMDA/THEMIS/E/Ephemeris.xml
index df5b24c..7ab17fe 100644
--- a/Instrument/AMDA/THEMIS/E/Ephemeris.xml
+++ b/Instrument/AMDA/THEMIS/E/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/THEMIS/E/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>THEMIS-E Probe Status</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>THEMIS-E Positions</AlternateName>
       <ReleaseDate>2009-05-20T21:10:04Z</ReleaseDate>
       <Description>THEMIS-D probe status (including position)</Description>
diff --git a/NumericalData/AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml b/NumericalData/AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml
index b658258..f59d72f 100644
--- a/NumericalData/AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml
+++ b/NumericalData/AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/STEREO-A/Ephemeris/sta-l2-orb</ResourceID>
         <ResourceHeader>
-            <ResourceName>STEREO-A Spacecraft Positions</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-14T11:46:29Z</ReleaseDate>
             <Description>Ulysses spacecraft positions data product </Description>
             <Contact>
@@ -19,7 +19,7 @@
             <AccessURL>
                  <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
-            <Format>NetCDF</Format>
+            <Format>Text</Format>
         </AccessInformation>
         <ProviderName>SPICE</ProviderName>
         <InstrumentID>spase://CDPP/Instrument/AMDA/STEREO-A/Ephemeris</InstrumentID>
@@ -27,7 +27,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2006-10-27T00:00:00Z</StartDate>
-                <StopDate>2015-07-23T00:00:00Z</StopDate>
+                <StopDate>2016-01-21T00:00:00Z</StopDate>
             </TimeSpan>
             <Cadence>PT900S</Cadence>
         </TemporalDescription>
@@ -66,7 +66,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r_gse</Name>
+            <Name>distance sta-earth</Name>
             <ParameterKey>sta_r_gse</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>Re</Units>
@@ -112,7 +112,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r_hee</Name>
+            <Name>distance sta-sun</Name>
             <ParameterKey>sta_r_hee</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>AU</Units>
diff --git a/NumericalData/AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml b/NumericalData/AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml
index 7baa21b..3d77d69 100644
--- a/NumericalData/AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml
+++ b/NumericalData/AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/STEREO-B/Ephemeris/stb-l2-orb</ResourceID>
         <ResourceHeader>
-            <ResourceName>STEREO-B Spacecraft Positions</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-14T14:37:00Z</ReleaseDate>
             <Description>Ulysses spacecraft positions data product </Description>
             <Contact>
@@ -67,7 +67,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r_gse</Name>
+            <Name>distance stb-earth</Name>
             <ParameterKey>stb_r_gse</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>Re</Units>
@@ -113,7 +113,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r_gse</Name>
+            <Name>distance stb-sun</Name>
             <ParameterKey>stb_r_hee</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>AU</Units>
diff --git a/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml b/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
index 7796b75..b2d6702 100644
--- a/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
@@ -4,7 +4,7 @@
   <NumericalData>
     <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all</ResourceID>
     <ResourceHeader>
-        <ResourceName>Themis A ephemeris</ResourceName>
+        <ResourceName>orbit</ResourceName>
         <ReleaseDate>2015-10-13T15:10:00</ReleaseDate>
         <Description>
             THEMIS A ephemeris
@@ -88,17 +88,17 @@
         <Structure>
             <Size>3</Size>
             <Element>
-                <Name>x_gsm</Name>
+                <Name>x</Name>
                 <Index>0</Index>
                 <ParameterKey>tha_xyz_gsm(0)</ParameterKey>
             </Element>
             <Element>
-                <Name>y_gsm</Name>
+                <Name>y</Name>
                 <Index>1</Index>
                 <ParameterKey>tha_xyz_gsm(1)</ParameterKey>
             </Element>
             <Element>
-                <Name>z_gsm</Name>
+                <Name>z</Name>
                 <Index>2</Index>
                 <ParameterKey>tha_xyz_gsm(2)</ParameterKey>
             </Element>
@@ -108,7 +108,7 @@
         </Support>
     </Parameter> 
     <Parameter>
-          <Name>r</Name>
+          <Name>distance tha-earth</Name>
           <ParameterKey>tha_r</ParameterKey>
           <Ucd>pos.distance</Ucd>
           <Units>Re</Units>
diff --git a/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml b/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
index 413f82d..e21f9dc 100644
--- a/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>Themis B ephemeris</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-13T15:30:00</ReleaseDate>
             <Description>
                 THEMIS B ephemeris
@@ -85,17 +85,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>x_gsm</Name>
+                    <Name>x</Name>
                     <Index>0</Index>
                     <ParameterKey>thb_xyz_gsm(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>y_gsm</Name>
+                    <Name>y</Name>
                     <Index>1</Index>
                     <ParameterKey>thb_xyz_gsm(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>z_gsm</Name>
+                    <Name>z</Name>
                     <Index>2</Index>
                     <ParameterKey>thb_xyz_gsm(2)</ParameterKey>
                 </Element>
@@ -105,7 +105,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r</Name>
+            <Name>distance thb-earth</Name>
             <ParameterKey>thb_r</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>Re</Units>
diff --git a/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml b/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
index ee188cc..45e110a 100644
--- a/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/C/Ephemeris/thb-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>Themis C ephemeris</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-13T15:42:30</ReleaseDate>
             <Description>
                 THEMIS C ephemeris
@@ -88,17 +88,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>x_gsm</Name>
+                    <Name>x</Name>
                     <Index>0</Index>
                     <ParameterKey>thc_xyz_gsm(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>y_gsm</Name>
+                    <Name>y</Name>
                     <Index>1</Index>
                     <ParameterKey>thc_xyz_gsm(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>z_gsm</Name>
+                    <Name>z</Name>
                     <Index>2</Index>
                     <ParameterKey>thc_xyz_gsm(2)</ParameterKey>
                 </Element>
@@ -108,7 +108,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r</Name>
+            <Name>distance thc-earth</Name>
             <ParameterKey>thc_r</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>Re</Units>
diff --git a/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml b/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
index d7e81d8..a57f27b 100644
--- a/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
@@ -2,12 +2,12 @@
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
     <Version>2.2.6</Version>
     <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all</ResourceID>
+        <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>Themis E ephemeris</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-13T15:45:00</ReleaseDate>
             <Description>
-                THEMIS E ephemeris
+                THEMIS D ephemeris
             </Description>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.budnik</PersonID>
@@ -27,7 +27,7 @@
             <Format>NetCDF</Format>
         </AccessInformation>
         <ProviderName>IRAP_THEMIS</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/THEMIS/E/Ephemeris</InstrumentID>
+        <InstrumentID>spase://CDPP/Instrument/AMDA/THEMIS/D/Ephemeris</InstrumentID>
         <MeasurementType>Ephemeris</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
@@ -88,17 +88,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>x_gsm</Name>
+                    <Name>x</Name>
                     <Index>0</Index>
                     <ParameterKey>thd_xyz_gsm(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>y_gsm</Name>
+                    <Name>y</Name>
                     <Index>1</Index>
                     <ParameterKey>thd_xyz_gsm(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>z_gsm</Name>
+                    <Name>z</Name>
                     <Index>2</Index>
                     <ParameterKey>thd_xyz_gsm(2)</ParameterKey>
                 </Element>
@@ -108,7 +108,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r</Name>
+            <Name>distance thd-earth</Name>
             <ParameterKey>thd_r</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>Re</Units>
diff --git a/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml b/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
index 94a5b1c..3004695 100644
--- a/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>Themis C ephemeris</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-13T15:42:30</ReleaseDate>
             <Description>
                 THEMIS E ephemeris
@@ -88,17 +88,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>x_gsm</Name>
+                    <Name>x</Name>
                     <Index>0</Index>
                     <ParameterKey>the_xyz_gsm(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>y_gsm</Name>
+                    <Name>y</Name>
                     <Index>1</Index>
                     <ParameterKey>the_xyz_gsm(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>z_gsm</Name>
+                    <Name>z</Name>
                     <Index>2</Index>
                     <ParameterKey>the_xyz_gsm(2)</ParameterKey>
                 </Element>
@@ -108,7 +108,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>r</Name>
+            <Name>distance the-earth</Name>
             <ParameterKey>the_r</ParameterKey>
             <Ucd>pos.distance</Ucd>
             <Units>Re</Units>
--
libgit2 0.21.2