diff --git a/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml b/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml
index 4426c99..7afae44 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml
@@ -14,7 +14,7 @@
             <Association>
                 <AssociationID>mes-mag-cruise</AssociationID>
                 <AssociationType>PartOf</AssociationType>
-                <Note>B @ Heliosphere</Note>
+                <Note>cruise</Note>
             </Association>
         </ResourceHeader>
         <AccessInformation>
@@ -50,17 +50,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>bx</Name>
+                    <Name>br</Name>
                     <Index>0</Index>
                     <ParameterKey>mes_b_rtn1s(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>by</Name>
+                    <Name>bt</Name>
                     <Index>1</Index>
                     <ParameterKey>mes_b_rtn1s(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>bz</Name>
+                    <Name>bn</Name>
                     <Index>2</Index>
                     <ParameterKey>mes_b_rtn1s(2)</ParameterKey>
                 </Element>
@@ -71,7 +71,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b_mag</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_rtn1s</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml b/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml
index 832168d..fb2ab11 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml
@@ -14,7 +14,7 @@
             <Association>
                 <AssociationID>mes-mag-cruise</AssociationID>
                 <AssociationType>PartOf</AssociationType>
-                <Note>B @ Heliosphere</Note>
+                <Note>cruise</Note>
             </Association>
         </ResourceHeader>
         <AccessInformation>
@@ -50,17 +50,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>bx</Name>
+                    <Name>br</Name>
                     <Index>0</Index>
                     <ParameterKey>mes_b_rtn1m(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>by</Name>
+                    <Name>bt</Name>
                     <Index>1</Index>
                     <ParameterKey>mes_b_rtn1m(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>bz</Name>
+                    <Name>bn</Name>
                     <Index>2</Index>
                     <ParameterKey>mes_b_rtn1m(2)</ParameterKey>
                 </Element>
@@ -71,7 +71,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b_mag</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_rtn1m</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml b/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml
index 810d9e7..326aadc 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml
@@ -14,7 +14,7 @@
             <Association>
                 <AssociationID>mes-mag-orb</AssociationID>
                 <AssociationType>PartOf</AssociationType>
-                <Note>B @ Mercury Orbit</Note>
+                <Note>orbit mercury</Note>
             </Association>
         </ResourceHeader>
         <AccessInformation>
@@ -116,17 +116,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>bx</Name>
+                    <Name>br</Name>
                     <Index>0</Index>
                     <ParameterKey>mes_b_orbrtn1s(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>by</Name>
+                    <Name>bt</Name>
                     <Index>1</Index>
                     <ParameterKey>mes_b_orbrtn1s(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>bz</Name>
+                    <Name>bn</Name>
                     <Index>2</Index>
                     <ParameterKey>mes_b_orbrtn1s(2)</ParameterKey>
                 </Element>
@@ -137,7 +137,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b_mag</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_orb1s</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml b/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml
index 18dae1a..35f9c28 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml
@@ -14,7 +14,7 @@
             <Association>
                 <AssociationID>mes-mag-orb</AssociationID>
                 <AssociationType>PartOf</AssociationType>
-                <Note>B @ Mercury Orbit</Note>
+                <Note>orbit mercury</Note>
             </Association>
         </ResourceHeader>
         <AccessInformation>
@@ -116,17 +116,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>bx</Name>
+                    <Name>br</Name>
                     <Index>0</Index>
                     <ParameterKey>mes_b_orbrtn1m(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>by</Name>
+                    <Name>bt</Name>
                     <Index>1</Index>
                     <ParameterKey>mes_b_orbrtn1m(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>bz</Name>
+                    <Name>bn</Name>
                     <Index>2</Index>
                     <ParameterKey>mes_b_orbrtn1m(2)</ParameterKey>
                 </Element>
@@ -137,7 +137,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b_mag</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_orb1m</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml b/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml
index f804c0b..370c4ab 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR</ResourceID>
         <ResourceHeader>
-            <ResourceName>High Resolution</ResourceName>
+            <ResourceName>0.05 sec</ResourceName>
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description/>
             <Contact>
@@ -14,7 +14,7 @@
               <Association>
                 <AssociationID>mes-mag-orb</AssociationID>
                 <AssociationType>PartOf</AssociationType>
-                <Note>B @ Mercury Orbit</Note>
+                <Note>orbit mercury</Note>
             </Association>
         </ResourceHeader>
         <AccessInformation>
@@ -116,17 +116,17 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>bx</Name>
+                    <Name>br</Name>
                     <Index>0</Index>
                     <ParameterKey>mes_b_orbrtn(0)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>by</Name>
+                    <Name>bt</Name>
                     <Index>1</Index>
                     <ParameterKey>mes_b_orbrtn(1)</ParameterKey>
                 </Element>
                 <Element>
-                    <Name>bz</Name>
+                    <Name>bn</Name>
                     <Index>2</Index>
                     <ParameterKey>mes_b_orbrtn(2)</ParameterKey>
                 </Element>
@@ -137,7 +137,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b_mag</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_orb</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby1.xml b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby1.xml
index c3cd42b..b995014 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby1.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby1.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby1</ResourceID>
         <ResourceHeader>
-            <ResourceName>B @ Mercury Flyby 1</ResourceName>
+            <ResourceName>flyby mercury 1</ResourceName>
             <ReleaseDate>2015-10-16T15:08:29Z</ReleaseDate>
             <Description>MESSENGER magnetometer data during first Mercury flyby</Description>
             <Contact>
@@ -29,8 +29,7 @@
                 <StartDate>2008-01-12T00:00:23Z</StartDate>
                 <StopDate>2008-01-17T00:01:42Z</StopDate>
             </TimeSpan>
-            <Cadence_Min>PT0.05S</Cadence_Min>
-            <Cadence_Max>PT1S</Cadence_Max>
+            <Cadence>PT0.05S</Cadence>
         </TemporalDescription>
         <ObservedRegion>Mercury</ObservedRegion>
         <Parameter>
@@ -100,9 +99,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Field Magnitude</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_flyby1</ParameterKey>
-            <Description>Scalar magnitude of the magnetic field in nT</Description>
+            <Description>Magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
             <UnitsConversion>1e-9&gt;T</UnitsConversion>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby2.xml b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby2.xml
index 96f8b11..c79f715 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby2.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby2.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby2</ResourceID>
         <ResourceHeader>
-            <ResourceName>B @ Mercury Flyby 2</ResourceName>
+            <ResourceName>flyby mercury 2</ResourceName>
             <ReleaseDate>2015-10-16T15:08:29Z</ReleaseDate>
             <Description>MESSENGER magnetometer data during second Mercury flyby</Description>
             <Contact>
@@ -29,8 +29,7 @@
                 <StartDate>2008-10-04T00:00:04Z</StartDate>
                 <StopDate>2008-10-09T00:00:33Z</StopDate>
             </TimeSpan>
-            <Cadence_Min>PT0.05S</Cadence_Min>
-            <Cadence_Max>PT1S</Cadence_Max>
+            <Cadence>PT0.05S</Cadence>
         </TemporalDescription>
         <ObservedRegion>Mercury</ObservedRegion>
         <Parameter>
@@ -100,7 +99,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Field Magnitude</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_flyby2</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby3.xml b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby3.xml
index 4559c55..f068508 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby3.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby3.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/MAG/mes-mag-flyby3</ResourceID>
         <ResourceHeader>
-            <ResourceName>B @ Mercury Flyby 3</ResourceName>
+            <ResourceName>flyby mercury 3</ResourceName>
             <ReleaseDate>2015-10-16T15:08:29Z</ReleaseDate>
             <Description>MESSENGER magnetometer data during third Mercury flyby</Description>
             <Contact>
@@ -29,8 +29,7 @@
                 <StartDate>2009-09-27T00:00:58Z</StartDate>
                 <StopDate>2009-10-02T00:01:19Z</StopDate>
             </TimeSpan>
-            <Cadence_Min>PT0.05S</Cadence_Min>
-            <Cadence_Max>PT1S</Cadence_Max>
+            <Cadence>PT0.05S</Cadence>           
         </TemporalDescription>
         <ObservedRegion>Mercury</ObservedRegion>
         <Parameter>
@@ -100,7 +99,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Field Magnitude</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_flyby3</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-venus.xml b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-venus.xml
index a860f24..864aa8f 100644
--- a/NumericalData/AMDA/MESSENGER/MAG/mes-mag-venus.xml
+++ b/NumericalData/AMDA/MESSENGER/MAG/mes-mag-venus.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/MAG/mes-mag-venus</ResourceID>
         <ResourceHeader>
-            <ResourceName>B @ Venus Flyby 2</ResourceName>
+            <ResourceName>flyby venus 2</ResourceName>
             <ReleaseDate>2015-10-16T14:58:29Z</ReleaseDate>
             <Description>MESSENGER magnetometer data during Venus flyby</Description>
             <Contact>
@@ -29,8 +29,7 @@
                 <StartDate>2007-06-04T00:01:37Z</StartDate>
                 <StopDate>2007-06-07T00:01:29Z</StopDate>
             </TimeSpan>
-            <Cadence_Min>PT0.05S</Cadence_Min>
-            <Cadence_Max>PT1S</Cadence_Max>
+            <Cadence>PT0.05S</Cadence>         
         </TemporalDescription>
         <ObservedRegion>Venus</ObservedRegion>
         <Parameter>
@@ -67,7 +66,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Field Magnitude</Name>
+            <Name>|b|</Name>
             <ParameterKey>mes_bmag_venus</ParameterKey>
             <Description>Scalar magnitude of the magnetic field in nT</Description>
             <Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/MESSENGER/ephemeris/mes-orb-all.xml b/NumericalData/AMDA/MESSENGER/ephemeris/mes-orb-all.xml
index a9330f8..b1f1a94 100644
--- a/NumericalData/AMDA/MESSENGER/ephemeris/mes-orb-all.xml
+++ b/NumericalData/AMDA/MESSENGER/ephemeris/mes-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/ephemeris/mes-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>full mission / heliosphere</ResourceName>
+            <ResourceName>full mission</ResourceName>
             <ReleaseDate>2015-10-15T14:40:00.000Z</ReleaseDate>
             <Description/>
             <Contact>
--
libgit2 0.21.2