diff --git a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
index c037a96..3c3835e 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
@@ -50,7 +50,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:06Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-01-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
index f549c03..00393a2 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
@@ -50,7 +50,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:06Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-01-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
index 574c77b..aceb267 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
@@ -49,7 +49,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-01-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
index 6ab6263..2f4e38c 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
@@ -49,7 +49,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-01-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml
index 74a92e1..14de8cc 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml
@@ -49,7 +49,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2014-07-31T10:43:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
index 8b4348f..70c6947 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
@@ -49,7 +49,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2014-07-31T10:43:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
index e2b0316..831b582 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
@@ -49,7 +49,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-01-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml
index 817b940..a9d6c1e 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml
@@ -49,7 +49,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2011-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-01-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml b/NumericalData/AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml
index 51f5d52..f5dd6c1 100644
--- a/NumericalData/AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml
+++ b/NumericalData/AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml
@@ -66,7 +66,7 @@
       <Keyword>magnetotail</Keyword>
 
       <Parameter>
-         <Name>Double Star 1 HIA Ion Density Prime Parameter</Name>
+         <Name>ion density</Name>
          <ParameterKey>ds1_n</ParameterKey>
          <Description>Double Star 1 HIA ion number density at spin resolution in units of #/cm^3.</Description>
          <Ucd>phys.density;phys.atmol.ionStage</Ucd>
@@ -89,7 +89,7 @@
          </Particle>
       </Parameter>
       <Parameter>
-         <Name>Double Star 1 HIA Ion Bulk Velocity Prime Parameter</Name>
+         <Name>v_gse</Name>
          <ParameterKey>ds1_v</ParameterKey>
          <Description>Double Star 1 HIA ion bulk velocity at spin resolution in GSE Coordinates in units of km/s.</Description>
          <Ucd>phys.velocity;phys.atmol.ionStage</Ucd>
@@ -108,19 +108,19 @@
          <Structure>
             <Size>3</Size>
             <Element>
-               <Name>VX-GSE</Name>
+               <Name>vx</Name>
                <Qualifier>Component.I</Qualifier>
                <Index>1</Index>
                <ParameterKey>ds1_v(0)</ParameterKey>
             </Element>
             <Element>
-               <Name>VY-GSE</Name>
+               <Name>vy</Name>
                <Qualifier>Component.J</Qualifier>
                <Index>2</Index>
                <ParameterKey>ds1_v(1)</ParameterKey>
             </Element>
             <Element>
-               <Name>VZ-GSE</Name>
+               <Name>vz</Name>
                <Qualifier>Component.K</Qualifier>
                <Index>3</Index>
                <ParameterKey>ds1_v(2)</ParameterKey>
@@ -136,7 +136,7 @@
          </Particle>
       </Parameter>
       <Parameter>
-         <Name>Double Star 1 HIA Ion Bulk Velocity (GSM)Prime Parameter</Name>
+         <Name>v_gsm</Name>
          <ParameterKey>ds1_v_gsm</ParameterKey>
          <Description>Double Star 1 HIA ion bulk velocity at spin resolution in GSM Coordinates in units of km/s.</Description>
          <Ucd>phys.velocity;phys.atmol.ionStage</Ucd>
@@ -155,19 +155,19 @@
          <Structure>
             <Size>3</Size>
             <Element>
-               <Name>VX-GSM</Name>
+               <Name>vx</Name>
                <Qualifier>Component.I</Qualifier>
                <Index>1</Index>
                <ParameterKey>ds1_v_gsm(0)</ParameterKey>
             </Element>
             <Element>
-               <Name>VY-GSM</Name>
+               <Name>vy</Name>
                <Qualifier>Component.J</Qualifier>
                <Index>2</Index>
                <ParameterKey>ds1_v_gsm(1)</ParameterKey>
             </Element>
             <Element>
-               <Name>VZ-GSM</Name>
+               <Name>vz</Name>
                <Qualifier>Component.K</Qualifier>
                <Index>3</Index>
                <ParameterKey>ds1_v_gsm(2)</ParameterKey>
@@ -183,7 +183,7 @@
          </Particle>
       </Parameter>
       <Parameter>
-         <Name>Double Star 1 HIA Ion Temperature Prime Parameter</Name>
+         <Name>temperature</Name>
          <ParameterKey>ds1_t</ParameterKey>
          <Description>Double Star 1 HIA ion temperature at spin resolution in units of eV.</Description>
          <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
@@ -192,12 +192,12 @@
          <Structure>
             <Size>2</Size>
             <Element>
-               <Name>Double Star 1 HIA Parallel Ion Temperature Prime Parameter</Name>
+               <Name>t_para</Name>
                <Index>1</Index>
                <ParameterKey>ds1_t(0)</ParameterKey>
             </Element>
             <Element>
-               <Name>Double Star 1 HIA Perpendicular Ion Temperature Prime Parameter</Name>
+               <Name>t_perp</Name>
                <Index>2</Index>
                <ParameterKey>ds1_t(1)</ParameterKey>
             </Element>
diff --git a/NumericalData/AMDA/ICE/ice-mag-p21.xml b/NumericalData/AMDA/ICE/ice-mag-p21.xml
index 00b0e9b..0a48d34 100644
--- a/NumericalData/AMDA/ICE/ice-mag-p21.xml
+++ b/NumericalData/AMDA/ICE/ice-mag-p21.xml
@@ -4,7 +4,7 @@
   <NumericalData>
     <ResourceID>spase://CDPP/NumericalData/AMDA/ICE/MAG/ice-mag-p21</ResourceID>
     <ResourceHeader>
-      <ResourceName>Magnetic Field</ResourceName>
+      <ResourceName>flyby Giacobini-Zinner</ResourceName>
       <ReleaseDate>2015-10-16T00:00:00Z</ReleaseDate>
       <Description/>
         <Acknowledgement/>
@@ -34,7 +34,7 @@
     </TemporalDescription>
     <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
     <Parameter>
-      <Name>B_cse</Name>
+      <Name>b_cse</Name>
       <ParameterKey>ice_b_cse</ParameterKey>
       <Description/>
       <Ucd>phys.magField</Ucd>
@@ -45,17 +45,17 @@
       <Structure>
         <Size>3</Size>
         <Element>
-          <Name>Bx</Name>
+          <Name>bx</Name>
           <Index>1</Index>
           <ParameterKey>ice_b_cse(0)</ParameterKey>
         </Element>
         <Element>
-          <Name>By</Name>
+          <Name>by</Name>
           <Index>1</Index>
           <ParameterKey>ice_b_cse(1)</ParameterKey>
         </Element>
         <Element>
-          <Name>Bz</Name>
+          <Name>bz</Name>
           <Index>1</Index>
           <ParameterKey>ice_b_cse(2)</ParameterKey>
         </Element>
@@ -66,7 +66,7 @@
       </Field>
     </Parameter>
     <Parameter>
-      <Name>|B|</Name>
+      <Name>|b|</Name>
       <ParameterKey>ice_b_tot</ParameterKey>
       <Description>Magnetic Field Magnitude</Description>
       <Ucd>phys.magField</Ucd>
--
libgit2 0.21.2