diff --git a/Instrument/AMDA/ISEE1/Ephemeris.xml b/Instrument/AMDA/ISEE1/Ephemeris.xml
index e640006..047260f 100644
--- a/Instrument/AMDA/ISEE1/Ephemeris.xml
+++ b/Instrument/AMDA/ISEE1/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/ISEE1/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>ISEE1 Positions</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>ISEE1 Ephemeris</AlternateName>
       <ReleaseDate>2013-04-09T00:00:00Z</ReleaseDate>
       <Description>ISEE1 spacecraft positions in various coordinate systems</Description>
diff --git a/Instrument/AMDA/ISEE2/Ephemeris.xml b/Instrument/AMDA/ISEE2/Ephemeris.xml
index 93af096..fc16862 100644
--- a/Instrument/AMDA/ISEE2/Ephemeris.xml
+++ b/Instrument/AMDA/ISEE2/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/ISEE2/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>ISEE2 Positions</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>ISEE2 Ephemeris</AlternateName>
       <ReleaseDate>2013-04-09T00:00:00Z</ReleaseDate>
       <Description>ISEE2 spacecraft positions in various coordinate systems</Description>
diff --git a/Instrument/AMDA/Interball-1/Ephemeris.xml b/Instrument/AMDA/Interball-1/Ephemeris.xml
index ab314c3..ea902e2 100644
--- a/Instrument/AMDA/Interball-1/Ephemeris.xml
+++ b/Instrument/AMDA/Interball-1/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/Interball-1/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>Ephemiris</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>Spacecraft position</AlternateName>
       <ReleaseDate>2009-05-20T21:10:11Z</ReleaseDate>
       <Description></Description>
diff --git a/NumericalData/AMDA/INTERBALL-Tail/Ephemeris/intt-orb-all.xml b/NumericalData/AMDA/INTERBALL-Tail/Ephemeris/intt-orb-all.xml
index edb23f0..ec7d67d 100644
--- a/NumericalData/AMDA/INTERBALL-Tail/Ephemeris/intt-orb-all.xml
+++ b/NumericalData/AMDA/INTERBALL-Tail/Ephemeris/intt-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Interball-Tail/Ephemeris/intt-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>Interball Tail definitive orbital data</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-16T18:00:00.000</ReleaseDate>
             <Description>Definitive Interball Tail satellite and subsatellite (Interball-1 and Magion-4) orbital data: Spacecraft position, velocity, and status flags.</Description>
             <Acknowledgement>The Interball project, Russian Space Research Institute (IKI) and Dr. Prokhorenko</Acknowledgement>
@@ -55,7 +55,7 @@
         <ObservedRegion>Earth.Magnetosphere.Polar</ObservedRegion>
         <Caveats>The data cadence varies.</Caveats>
         <Parameter>
-            <Name>I1 position in GSE</Name>
+            <Name>xyz_gse</Name>
             <ParameterKey>it_xyz</ParameterKey>
             <Description>Interball-1 spacecraft position in GSE frame, 3 components in RE (6370km)</Description>
             <Ucd>pos.earth;instr.obsty</Ucd>
@@ -72,7 +72,7 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>I1 X (GSE)</Name>
+                    <Name>x</Name>
                     <Qualifier>Component.I</Qualifier>
                     <Index>1</Index>
                     <ParameterKey>it_xyz(0)</ParameterKey>
@@ -81,7 +81,7 @@
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>I1 Y (GSE)</Name>
+                    <Name>y</Name>
                     <Qualifier>Component.J</Qualifier>
                     <Index>2</Index>
                     <ParameterKey>it_xyz(1)</ParameterKey>
@@ -90,7 +90,7 @@
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>I1 Z (GSE)</Name>
+                    <Name>z</Name>
                     <Qualifier>Component.K</Qualifier>
                     <Index>3</Index>
                     <ParameterKey>it_xyz(2)</ParameterKey>
@@ -105,7 +105,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>I1 S/C position in GSM</Name>
+            <Name>xyz_gsm</Name>
             <ParameterKey>it_xyz_gsm</ParameterKey>
             <Description>Interball-1 spacecraft position in GSM frame, 3 components in RE (6370km)</Description>
             <Ucd>pos.earth;instr.obsty</Ucd>
@@ -122,7 +122,7 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>I1 X (GSM)</Name>
+                    <Name>x</Name>
                     <Qualifier>Component.I</Qualifier>
                     <Index>1</Index>
                     <ParameterKey>it_xyz_gsm(0)</ParameterKey>
@@ -131,7 +131,7 @@
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>I1 Y (GSM)</Name>
+                    <Name>y</Name>
                     <Qualifier>Component.J</Qualifier>
                     <Index>2</Index>
                     <ParameterKey>it_xyz_gsm(1)</ParameterKey>
@@ -140,7 +140,7 @@
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>I1 Z (GSM)</Name>
+                    <Name>z</Name>
                     <Qualifier>Component.K</Qualifier>
                     <Index>3</Index>
                     <ParameterKey>it_xyz_gsm(2)</ParameterKey>
diff --git a/NumericalData/AMDA/ISEE/ISEE1/Ephemeris/isee1-orb-all.xml b/NumericalData/AMDA/ISEE/ISEE1/Ephemeris/isee1-orb-all.xml
index f14e92f..f6e8a56 100644
--- a/NumericalData/AMDA/ISEE/ISEE1/Ephemeris/isee1-orb-all.xml
+++ b/NumericalData/AMDA/ISEE/ISEE1/Ephemeris/isee1-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/ISEE/ISEE1/Ephemeris/isee1-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>ISEE 1 Orbit</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-16T14:28:00</ReleaseDate>
             <Description/>
             <Contact>
@@ -41,7 +41,7 @@
         <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
         <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
         <Parameter>
-            <Name>Spacecraft position vector, GSE</Name>
+            <Name>xyz_gse</Name>
             <ParameterKey>isee1_xyz</ParameterKey>
             <Description>
                 Spacecraft position vector, GSE Cartesian components, in Earth radii
@@ -82,7 +82,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>Spacecraft position vector, GSM</Name>
+            <Name>xyz_gsm</Name>
             <ParameterKey>isee1_xyz_gsm</ParameterKey>
             <Description>
                 Spacecraft position vector, GSM Cartesian components, in Earth radii
@@ -102,17 +102,17 @@
                 <Description>GSM X,Y,Z components of spacecraft position vector
                 </Description>
                 <Element>
-                    <Name>x gsm</Name>
+                    <Name>x</Name>
                     <Index>1</Index>
                     <ParameterKey>isee1_xyz_gsm(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>y gsm</Name>
+                    <Name>y</Name>
                     <Index>2</Index>
                     <ParameterKey>isee1_xyz_gsm(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>z gsm</Name>
+                    <Name>z</Name>
                     <Index>3</Index>
                     <ParameterKey>isee1_xyz_gsm(2)</ParameterKey>
                 </Element>
diff --git a/NumericalData/AMDA/ISEE/ISEE2/Ephemeris/isee2-orb-all.xml b/NumericalData/AMDA/ISEE/ISEE2/Ephemeris/isee2-orb-all.xml
index 8f5ef1e..9eee5e7 100644
--- a/NumericalData/AMDA/ISEE/ISEE2/Ephemeris/isee2-orb-all.xml
+++ b/NumericalData/AMDA/ISEE/ISEE2/Ephemeris/isee2-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/ISEE/ISEE2/Ephemeris/isee2-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>ISEE 2 magnetometer 1-min data at CDAWeb</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-16T14:30:00</ReleaseDate>
             <Description/>
             <Contact>
@@ -28,7 +28,7 @@
         </AccessInformation>
         <ProviderName>NSSDC</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/ISEE2/MAG</InstrumentID>
+        <InstrumentID>spase://CDPP/Instrument/AMDA/ISEE2/Ephemeris</InstrumentID>
         <MeasurementType>Ephemeris</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
@@ -41,7 +41,7 @@
         <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
         <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
         <Parameter>
-            <Name>Spacecraft position vector, GSE</Name>
+            <Name>xyz_gse</Name>
             <ParameterKey>isee2_xyz</ParameterKey>
             <Description>
                 Spacecraft position vector, GSE Cartesian components, in Earth radii
@@ -82,7 +82,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>Spacecraft position vector, GSM</Name>
+            <Name>xyz_gsm</Name>
             <ParameterKey>isee2_xyz_gsm</ParameterKey>
             <Description>
                 Spacecraft position vector, GSM Cartesian components, in Earth radii
@@ -102,17 +102,17 @@
                 <Description>GSM X,Y,Z components of spacecraft position vector
                 </Description>
                 <Element>
-                    <Name>x gsm</Name>
+                    <Name>x</Name>
                     <Index>1</Index>
                     <ParameterKey>isee2_xyz_gsm(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>y gsm</Name>
+                    <Name>y</Name>
                     <Index>2</Index>
                     <ParameterKey>isee2_xyz_gsm(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>z gsm</Name>
+                    <Name>z</Name>
                     <Index>3</Index>
                     <ParameterKey>isee2_xyz_gsm(2)</ParameterKey>
                 </Element>
diff --git a/Observatory/AMDA/Giotto.xml b/Observatory/AMDA/Giotto.xml
index 5118b3c..d3bea69 100644
--- a/Observatory/AMDA/Giotto.xml
+++ b/Observatory/AMDA/Giotto.xml
@@ -7,7 +7,7 @@
       <ResourceName>Giotto</ResourceName>
       <AlternateName>ESA's first deep space mission: P1/Halley Flyby</AlternateName>
       <ReleaseDate>2010-09-27T18:45:12Z</ReleaseDate>
-      <Description>Source: ESA PSA (http://www.rssd.esa.int/index.php?project=PSA&page=giotto)
+      <Description>Source: ESA PSA (http://www.rssd.esa.int/index.php?project=PSApage=giotto)
 
 ESA's first deep space mission, Giotto was designed to help solve the mysteries 
 surrounding Comet Halley by passing as close as possible to the comet's nucleus, 
--
libgit2 0.21.2