diff --git a/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml b/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml
index 2cae2c4..983349b 100644
--- a/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml
+++ b/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MEX/ephemeris/mex-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>orbit</ResourceName>
+            <ResourceName>orbit mars</ResourceName>
             <ReleaseDate>2015-10-15T10:17:29Z</ReleaseDate>
             <Description/>
             <Contact>
@@ -27,7 +27,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2004-01-10T07:54:21Z</StartDate>
-                <StopDate>2015-06-18T23:53:06Z</StopDate>
+                <StopDate>2016-03-11T07:16:20Z</StopDate>
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
@@ -63,32 +63,31 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>xyz areographoc</Name>
-            <ParameterKey>pol_mex_pc</ParameterKey>
+            <Name>distance mex-mars</Name>
+            <ParameterKey>pol_mex_pc(0)</ParameterKey>
             <Description>Mars Express trajectory in PC coordinates</Description>
             <Ucd>pos.bodyrc;instr.obsty</Ucd>
-            <Units>Rm</Units>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>r</Name>
-                    <Index>0</Index>
-                    <ParameterKey>pol_mex_pc(0)</ParameterKey>
-                </Element>
-                <Element>
-                    <Name>lon_pc</Name>
-                    <Index>1</Index>
-                    <ParameterKey>pol_mex_pc(1)</ParameterKey>
-                </Element>
-                <Element>
-                    <Name>lat_pc</Name>
-                    <Index>2</Index>
-                    <ParameterKey>pol_mex_pc(2)</ParameterKey>
-                </Element>
-            </Structure>
+            <Units>Rm</Units> 
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>
+         <Parameter>
+            <Name>lon_iau_mars</Name>
+            <ParameterKey>pol_mex_pc(1)</ParameterKey>
+            <Description>Mars Express trajectory in PC coordinates</Description>
+            <Ucd>pos.bodyrc;instr.obsty</Ucd>
+            <Units>deg</Units> 
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>  
+        <Parameter>
+            <Name>lat_iau_mars</Name>
+            <ParameterKey>pol_mex_pc(2)</ParameterKey>
+            <Description>Mars Express trajectory in PC coordinates</Description>
+            <Ucd>pos.bodyrc;instr.obsty</Ucd>
+            <Units>deg</Units> 
             <Support>
                 <SupportQuantity>Positional</SupportQuantity>
             </Support>
diff --git a/NumericalData/AMDA/MGS/Ephemeris/mgs-orb-all.xml b/NumericalData/AMDA/MGS/Ephemeris/mgs-orb-all.xml
index c4b5119..a6a5ba1 100644
--- a/NumericalData/AMDA/MGS/Ephemeris/mgs-orb-all.xml
+++ b/NumericalData/AMDA/MGS/Ephemeris/mgs-orb-all.xml
@@ -4,7 +4,7 @@
   <NumericalData>
     <ResourceID>spase://CDPP/NumericalData/AMDA/MGS/Ephemeris/mgs-orb-all</ResourceID>
     <ResourceHeader>
-      <ResourceName>MGS Positions</ResourceName>
+      <ResourceName>orbit mars</ResourceName>
       <ReleaseDate>2015-10-22T10:19:00Z</ReleaseDate>
       <Description>MGS satellite positions.</Description>
       <Contact>
@@ -19,7 +19,7 @@
       <AccessURL>
         <URL>http://amda.cdpp.eu</URL>
       </AccessURL>
-      <Format>NetCDF</Format>
+      <Format>Text</Format>
     </AccessInformation>
     <ProviderName>PDS:NAIF</ProviderName>
     <InstrumentID>spase://CDPP/Instrument/AMDA/MGS/Ephemeris</InstrumentID>
@@ -47,17 +47,17 @@
       <Structure>
         <Size>3</Size>
         <Element>
-          <Name>x_mso</Name>
+          <Name>x</Name>
           <Index>1</Index>
           <ParameterKey>xyz_mgs_mso(0)</ParameterKey>
         </Element>
         <Element>
-          <Name>y_mso</Name>
+          <Name>y</Name>
           <Index>2</Index>
           <ParameterKey>xyz_mgs_mso(1)</ParameterKey>
         </Element>
         <Element>
-          <Name>z_mso</Name>
+          <Name>z</Name>
           <Index>3</Index>
           <ParameterKey>xyz_mgs_mso(2)</ParameterKey>
         </Element>
@@ -67,32 +67,31 @@
       </Support>
     </Parameter>
     <Parameter>
-      <Name>polar_areographic</Name>
-      <ParameterKey>pol_mgs_pc</ParameterKey>
+      <Name>distance mgs-mars</Name>
+      <ParameterKey>pol_mgs_pc(0)</ParameterKey>
       <Description/>
       <Ucd>pos.earth</Ucd>
       <Units>Rm</Units>
-      <RenderingHints>
-        <DisplayType>TimeSeries</DisplayType>
-      </RenderingHints>
-      <Structure>
-        <Size>3</Size>
-        <Element>
-          <Name>r_pc</Name>
-          <Index>1</Index>
-          <ParameterKey>pol_mgs_pc(0)</ParameterKey>
-        </Element>
-        <Element>
-          <Name>lon_pc</Name>
-          <Index>2</Index>
-          <ParameterKey>pol_mgs_pc(1)</ParameterKey>
-        </Element>
-        <Element>
-          <Name>lat_pc</Name>
-          <Index>3</Index>
-          <ParameterKey>pol_mgs_pc(2)</ParameterKey>
-        </Element>
-      </Structure>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>lon_iau_mars</Name>
+      <ParameterKey>pol_mgs_pc(1)</ParameterKey>
+      <Description/>
+      <Ucd>pos.earth</Ucd>
+      <Units>rad</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter> 
+    <Parameter>
+      <Name>lat_iau_mars</Name>
+      <ParameterKey>pol_mgs_pc(2)</ParameterKey>
+      <Description/>
+      <Ucd>pos.earth</Ucd>
+      <Units>rad</Units>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
--
libgit2 0.21.2