diff --git a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
index ce4a92e..9103137 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
@@ -49,12 +49,12 @@
       <Caveats>
       </Caveats>    
 <Parameter>
-   <Name>diff eflux 64Ex2M</Name>
+   <Name>ion diff eflux</Name>
    <ParameterKey>mav_sta_c0</ParameterKey>
    <Description>64 energy x 2 mass ion distributions in units of differential energy flux 
       (LID = urn:nasa:pds:maven.static.c:data.c0_64e2m)</Description>
    <Ucd>phys.atmol.ionStage</Ucd>
-   <Units>cm^2 sr eV/eV</Units>
+   <Units>eV/cm^2-sr-s-eV</Units>
    <UnitsConversion/>
    <RenderingHints>
       <DisplayType>Spectrogram</DisplayType>
diff --git a/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml b/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
index 2048be4..b86f2d3 100644
--- a/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
+++ b/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
@@ -70,11 +70,11 @@
    </Particle>
 </Parameter>
       <Parameter>
-         <Name>elec diff energy flux</Name>
+         <Name>elec diff eflux</Name>
          <ParameterKey>mav_swea_svyspecf</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units>cm^2 sr eV/eV</Units>
+         <Units>eV/cm^2 sr eV</Units>
          <UnitsConversion/>
          <RenderingHints>
             <DisplayType>Spectrogram</DisplayType>
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
index d9a1380..ebe7b7b 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
@@ -70,13 +70,13 @@
    </Particle>  
 </Parameter>
       <Parameter>
-         <Name>ion diff energy flux</Name>
+         <Name>ion diff eflux</Name>
          <ParameterKey>mav_swia_fspec</ParameterKey>
          <Description>Onboard Survey Spectra - Ion energy spectra in units of differential 
             energy flux calculated onboard from SWIA coarse data
             (LID = urn:nasa:pds:maven.swia.calibrated:data.onboard_svy_spec)</Description>
          <Ucd>phys.atmol.ionStage</Ucd>
-         <Units>cm^2 sr eV/eV</Units>
+         <Units>eV/cm^2 sr eV</Units>
          <UnitsConversion/>
          <RenderingHints>
             <DisplayType>Spectrogram</DisplayType>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
index 3d567a6..2c88200 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
@@ -120,10 +120,10 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>el omni energy flux</Name>
+            <Name>el omni eflux</Name>
             <ParameterKey>tha_el_sp</ParameterKey>
             <Ucd>phys.flux.density;phys.energy;phys.electron</Ucd>
-            <Units>eV/(cm^2-s-sr-eV)</Units>
+            <Units>eV/cm^2-s-sr-eV</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml
index 563bc51..4d072eb 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml
@@ -115,10 +115,10 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>el omni energy flux</Name>
+            <Name>el omni eflux</Name>
             <ParameterKey>thb_el_sp</ParameterKey>
             <Ucd>phys.flux.density;phys.energy;phys.electron</Ucd>
-            <Units>eV/(cm^2-s-sr-eV)</Units>
+            <Units>eV/cm^2-s-sr-eV</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml
index 690cab2..782bf66 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml
@@ -115,10 +115,10 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>el omni energy flux</Name>
+            <Name>el omni eflux</Name>
             <ParameterKey>thc_el_sp</ParameterKey>
             <Ucd>phys.flux.density;phys.energy;phys.electron</Ucd>
-            <Units>eV/(cm^2-s-sr-eV)</Units>
+            <Units>eV/cm^2-s-sr-eV</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml
index e57ba10..bfb060b 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml
@@ -115,10 +115,10 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>el omni energy flux</Name>
+            <Name>el omni eflux</Name>
             <ParameterKey>thd_el_sp</ParameterKey>
             <Ucd>phys.flux.density;phys.energy;phys.electron</Ucd>
-            <Units>eV/(cm^2-s-sr-eV)</Units>
+            <Units>eV/cm^2-s-sr-eV</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml
index c0fa3ef..3f51b33 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml
@@ -115,10 +115,10 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>el omni energy flux</Name>
+            <Name>el omni eflux</Name>
             <ParameterKey>the_el_sp</ParameterKey>
             <Ucd>phys.flux.density;phys.energy;phys.electron</Ucd>
-            <Units>eV/(cm^2-s-sr-eV)</Units>
+            <Units>eV/cm^2-s-sr-eV</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
--
libgit2 0.21.2