diff --git a/src/yadg/extractors/eclab/mpr.py b/src/yadg/extractors/eclab/mpr.py
index a296039b..cb3dc982 100644
--- a/src/yadg/extractors/eclab/mpr.py
+++ b/src/yadg/extractors/eclab/mpr.py
@@ -298,14 +298,18 @@ def process_settings(data: bytes, minver: str) -> tuple[dict, list]:
     params = []
     for pardict in pardicts:
         for k, v in pardict.items():
-            # MPR quirk: I_range off by one
-            if k == "I_range":
+            # MPR quirk: I Range off by one
+            if k == "I Range":
                 v += 1
             pardict[k] = param_from_key(k, v, to_str=True)
             # Handle NaNs and +/-Inf in params here
             if np.isnan(v) or np.isinf(v):
                 pardict[k] = str(v)
         params.append(pardict)
+    if len(params) > 0:
+        params = {k: [d[k] for d in params] for k in params[0]}
+    else:
+        params = {}
     return settings, params
 
 
@@ -420,7 +424,7 @@ def process_data(
             elif unit is None:
                 intv = int(value)
                 if name == "I Range":
-                    vals[name] = param_from_key("I_range", intv)
+                    vals[name] = param_from_key("I Range", intv)
                 else:
                     vals[name] = intv
         if flaglist:
@@ -441,7 +445,7 @@ def process_data(
         Irstr = Iranges[Ns]
         if "I Range" in vals:
             Irstr = vals["I Range"]
-        Irange = param_from_key("I_range", Irstr, to_str=False)
+        Irange = param_from_key("I Range", Irstr, to_str=False)
 
         # I Range can be None if it's set to "Auto", "PAC" or other such string.
         if Irange is None:
@@ -569,20 +573,17 @@ def process_modules(contents: bytes) -> tuple[dict, list, list, dict, dict]:
         module_data = module[mhd.itemsize :]
         if name == "VMP Set":
             settings, params = process_settings(module_data, minver)
-            Eranges = []
-            Iranges = []
-            ctrls = []
-            for el in params:
-                E_range_max = el.get("E_range_max", float("inf"))
-                E_range_min = el.get("E_range_min", float("-inf"))
-                Eranges.append(E_range_max - E_range_min)
-                Iranges.append(el.get("I_range", "Auto"))
-                if "set_I/C" in el:
-                    ctrls.append(el["set_I/C"])
-                elif "apply_I/C" in el:
-                    ctrls.append(el["apply_I/C"])
-                else:
-                    ctrls.append(None)
+
+            E_range_max = params.get("E range max (V)", [float("inf")])
+            E_range_min = params.get("E range min (V)", [float("-inf")])
+            Eranges = [a - b for a, b in zip(E_range_max, E_range_min)]
+            Iranges = params.get("I Range", ["Auto"])
+            if "Set I/C" in params:
+                ctrls = params.get("Set I/C")
+            elif "Apply I/C" in params:
+                ctrls = params.get("Apply I/C")
+            else:
+                ctrls = [None] * len(Iranges)
         elif name == "VMP data":
             ds = process_data(module_data, version, Eranges, Iranges, ctrls)
         elif name == "VMP LOG":
diff --git a/src/yadg/extractors/eclab/mpt.py b/src/yadg/extractors/eclab/mpt.py
index 4574a318..3d3f2aca 100644
--- a/src/yadg/extractors/eclab/mpt.py
+++ b/src/yadg/extractors/eclab/mpt.py
@@ -262,7 +262,7 @@ def process_data(
             if units.get(name) is None:
                 ival = int(parse_decimal(value, locale=locale))
                 if name == "I Range":
-                    vals[name] = param_from_key("I_range", ival)
+                    vals[name] = param_from_key("I Range", ival)
                 else:
                     vals[name] = ival
             else:
@@ -280,7 +280,7 @@ def process_data(
         Irstr = Iranges[Ns] if isinstance(Iranges, list) else Iranges
         if "I Range" in vals:
             Irstr = vals["I Range"]
-        Irange = param_from_key("I_range", Irstr, to_str=False)
+        Irange = param_from_key("I Range", Irstr, to_str=False)
 
         # I Range can be None if it's set to "Auto", "PAC" or other such string.
         if Irange is None:
diff --git a/src/yadg/extractors/eclab/techniques.py b/src/yadg/extractors/eclab/techniques.py
index b5137463..39bd2935 100644
--- a/src/yadg/extractors/eclab/techniques.py
+++ b/src/yadg/extractors/eclab/techniques.py
@@ -39,31 +39,31 @@
     (
         np.dtype(
             [
-                ("Ei", "<f4"),
-                ("Ei_vs", "|u1"),
-                ("ti", "<f4"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u1"),
+                ("ti (h:m:s)", "<f4"),
                 ("Imax", "<f4"),
-                ("Imax_unit", "|u1"),
+                ("unit Imax", "|u1"),
                 ("Imin", "<f4"),
-                ("Imin_unit", "|u1"),
+                ("unit Imin", "|u1"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("record", "|u1"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
+                ("unit dI", "|u1"),
                 ("dQ", "<f4"),
-                ("dQ_unit", "|u1"),
-                ("dt", "<f4"),
-                ("dta", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "u1"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("unit dQ", "|u1"),
+                ("dt (s)", "<f4"),
+                ("dta (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"10.40"},
@@ -71,31 +71,31 @@
     (
         np.dtype(
             [
-                ("Ei", "<f4"),
-                ("Ei_vs", "|u4"),
-                ("ti", "<f4"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u4"),
+                ("ti (h:m:s)", "<f4"),
                 ("Imax", "<f4"),
-                ("Imax_unit", "|u1"),
+                ("unit Imax", "|u1"),
                 ("Imin", "<f4"),
-                ("Imin_unit", "|u1"),
+                ("unit Imin", "|u1"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("record", "|u1"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
+                ("unit dI", "|u1"),
                 ("dQ", "<f4"),
-                ("dQ_unit", "|u1"),
-                ("dt", "<f4"),
-                ("dta", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "u1"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("unit dQ", "|u1"),
+                ("dt (s)", "<f4"),
+                ("dta (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"11.50"},
@@ -109,21 +109,21 @@
         np.dtype(
             [
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u1"),
-                ("ts", "<f4"),
-                ("EM", "<f4"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u1"),
+                ("ts (h:m:s)", "<f4"),
+                ("EM (V)", "<f4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("record", "|u1"),
-                ("dEs", "<f4"),
-                ("dts", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("dEs (mV)", "<f4"),
+                ("dts (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"10.40"},
@@ -132,21 +132,21 @@
         np.dtype(
             [
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u4"),
-                ("ts", "<f4"),
-                ("EM", "<f4"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u4"),
+                ("ts (h:m:s)", "<f4"),
+                ("EM (V)", "<f4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("record", "|u1"),
-                ("dEs", "<f4"),
-                ("dts", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("dEs (mV)", "<f4"),
+                ("dts (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"11.50"},
@@ -159,31 +159,59 @@
     (
         np.dtype(
             [
-                ("Ei", "<f4"),
-                ("Ei_vs", "|u1"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u1"),
                 ("dE/dt", "<f4"),
-                ("dE/dt_unit", "|u1"),
-                ("E1", "<f4"),
-                ("E1_vs", "|u1"),
-                ("step_percent", "|u1"),
-                ("N", "<u4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "u1"),
-                ("E2", "<f4"),
-                ("E2_vs", "|u1"),
-                ("nc_cycles", "<u4"),
-                ("reverse_scan", "|u1"),
-                ("Ef", "<f4"),
-                ("Ef_vs", "|u1"),
+                ("dE/dt unit", "|u1"),
+                ("E1 (V)", "<f4"),
+                ("E1 (V) vs.", "|u1"),
+                ("Step percent", "|u1"),
+                ("N", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("E2 (V)", "<f4"),
+                ("E2 (V) vs.", "|u1"),
+                ("nc cycles", "|u4"),
+                ("Reverse Scan", "|u1"),
+                ("Ef (V)", "<f4"),
+                ("Ef (V) vs.", "|u1"),
             ]
         ),
-        {"10.40", "11.50"},
-    )
+        {"10.40"},
+    ),
+    (
+        np.dtype(
+            [
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u4"),
+                ("dE/dt", "<f4"),
+                ("dE/dt unit", "|u1"),
+                ("E1 (V)", "<f4"),
+                ("E1 (V) vs.", "|u4"),
+                ("Step percent", "|u1"),
+                ("N", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("E2 (V)", "<f4"),
+                ("E2 (V) vs.", "|u4"),
+                ("nc cycles", "|u4"),
+                ("Reverse Scan", "|u1"),
+                ("Ef (V)", "<f4"),
+                ("Ef (V) vs.", "|u4"),
+            ]
+        ),
+        {"11.50"},
+    ),
 ]
 
 
@@ -192,34 +220,34 @@
     (
         np.dtype(
             [
-                ("Ei", "<f4"),
-                ("Ei_vs", "|u1"),
-                ("ti", "<f4"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u1"),
+                ("ti (h:m:s)", "<f4"),
                 ("dti", "<f4"),
                 ("dE/dt", "<f4"),
-                ("dE/dt_unit", "|u1"),
-                ("E1", "<f4"),
-                ("E1_vs", "|u1"),
-                ("t1", "<f4"),
-                ("dt1", "<f4"),
-                ("step_percent", "|u1"),
-                ("N", "<u4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "u1"),
-                ("E2", "<f4"),
-                ("E2_vs", "|u1"),
+                ("dE/dt unit", "|u1"),
+                ("E1 (V)", "<f4"),
+                ("E1 (V) vs.", "|u1"),
+                ("t1 (h:m:s)", "<f4"),
+                ("dt1 (s)", "<f4"),
+                ("Step percent", "|u1"),
+                ("N", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("E2 (V)", "<f4"),
+                ("E2 (V) vs.", "|u1"),
                 ("t2", "<f4"),
                 ("dt2", "<f4"),
-                ("nc_cycles", "<u4"),
-                ("nr", "|u1"),
-                ("reverse_scan", "|u1"),
-                ("Ef", "<f4"),
-                ("Ef_vs", "|u1"),
+                ("nc cycles", "|u4"),
+                ("nr", "|u4"),
+                ("Reverse Scan", "|u1"),
+                ("Ef (V)", "<f4"),
+                ("Ef (V) vs.", "|u1"),
                 ("tf", "<f4"),
                 ("dtf", "<f4"),
             ]
@@ -234,38 +262,38 @@
     (
         np.dtype(
             [
-                ("set_I/C", "|u1"),
+                ("Set I/C", "|u1"),
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u1"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u1"),
                 ("N", "f4"),
-                ("I_sign", "|u1"),
-                ("t1", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("dE1", "<f4"),
-                ("dt1", "<f4"),
-                ("EM", "<f4"),
-                ("tM", "<f4"),
+                ("I sign", "|u1"),
+                ("t1 (h:m:s)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("dE1 (mV)", "<f4"),
+                ("dt1 (s)", "<f4"),
+                ("EM (V)", "<f4"),
+                ("tM (h:m:s)", "<f4"),
                 ("Im", "<f4"),
-                ("Im_unit", "|u1"),
+                ("unit Im", "|u1"),
                 ("dI/dt", "<f4"),
-                ("dI/dt_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
+                ("dunit dI/dt", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
                 ("dq", "<f4"),
-                ("dq_unit", "|u1"),
-                ("dtq", "<f4"),
+                ("unit dq", "|u1"),
+                ("dtq (s)", "<f4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("dxM", "<f4"),
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("EL", "<f4"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("EL (V)", "<f4"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"10.40"},
@@ -273,39 +301,39 @@
     (
         np.dtype(
             [
-                ("set_I/C", "|u1"),
+                ("Set I/C", "|u1"),
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u1"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u1"),
                 ("N", "f4"),
-                ("I_sign", "|u1"),
-                ("t1", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("dE1", "<f4"),
-                ("dt1", "<f4"),
-                ("EM", "<f4"),
-                ("tM", "<f4"),
+                ("I sign", "|u1"),
+                ("t1 (h:m:s)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("dE1 (mV)", "<f4"),
+                ("dt1 (s)", "<f4"),
+                ("EM (V)", "<f4"),
+                ("tM (h:m:s)", "<f4"),
                 ("Im", "<f4"),
-                ("Im_unit", "|u1"),
+                ("unit Im", "|u1"),
                 ("dI/dt", "<f4"),
-                ("dI/dt_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
+                ("dunit dI/dt", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
                 ("dq", "<f4"),
-                ("dq_unit", "|u1"),
-                ("dtq", "<f4"),
+                ("unit dq", "|u1"),
+                ("dtq (s)", "<f4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("dxM", "<f4"),
-                ("delta SoC", "<f4"),
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("EL", "<f4"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("delta SoC (%)", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("EL (V)", "<f4"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"10.40"},
@@ -313,39 +341,39 @@
     (
         np.dtype(
             [
-                ("set_I/C", "|u1"),
+                ("Set I/C", "|u1"),
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u4"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u4"),
                 ("N", "<f4"),
-                ("I_sign", "|u4"),
-                ("t1", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("dE1", "<f4"),
-                ("dt1", "<f4"),
-                ("EM", "<f4"),
-                ("tM", "<f4"),
+                ("I sign", "|u4"),
+                ("t1 (h:m:s)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("dE1 (mV)", "<f4"),
+                ("dt1 (s)", "<f4"),
+                ("EM (V)", "<f4"),
+                ("tM (h:m:s)", "<f4"),
                 ("Im", "<f4"),
-                ("Im_unit", "|u1"),
+                ("unit Im", "|u1"),
                 ("dI/dt", "<f4"),
-                ("dI/dt_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
+                ("dunit dI/dt", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
                 ("dq", "<f4"),
-                ("dq_unit", "|u1"),
-                ("dtq", "<f4"),
+                ("unit dq", "|u1"),
+                ("dtq (s)", "<f4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("dxM", "<f4"),
-                ("delta SoC", "<f4"),
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("EL", "<f4"),
-                ("goto_Ns", "u4"),
-                ("nc_cycles", "u4"),
+                ("delta SoC (%)", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("EL (V)", "<f4"),
+                ("goto Ns'", "u4"),
+                ("nc cycles", "u4"),
             ]
         ),
         {"11.50"},
@@ -358,27 +386,27 @@
     (
         np.dtype(
             [
-                ("sine_mode", "|u1"),
+                ("Mode", "|u1"),
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u1"),
-                ("tIs", "<f4"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u1"),
+                ("tIs (h:m:s)", "<f4"),
                 ("record", "|u1"),
-                ("dE", "<f4"),
-                ("dt", "<f4"),
+                ("dE (mV)", "<f4"),
+                ("dt (s)", "<f4"),
                 ("fi", "<f4"),
-                ("fi_unit", "|u1"),
+                ("unit fi", "|u1"),
                 ("ff", "<f4"),
-                ("ff_unit", "|u1"),
-                ("Nd", "<u4"),
-                ("points", "|u1"),
+                ("unit ff", "|u1"),
+                ("Nd", "|u4"),
+                ("Points", "|u1"),
                 ("spacing", "|u1"),
                 ("Ia/Va", "|u1"),
                 ("Ia", "<f4"),
-                ("Ia_unit", "|u1"),
-                ("va_pourcent", "<f4"),
+                ("unit  Ia", "|u1"),
+                ("va pourcent", "<f4"),
                 ("pw", "<f4"),
-                ("Na", "<u4"),
+                ("Na", "|u4"),
                 ("corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("limit_type1", "|u1"),
@@ -405,14 +433,14 @@
                 ("limit_comp6", "|u1"),
                 ("limit_value6", "<f4"),
                 ("limit_unit6", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("nc_cycles", "<u4"),
-                ("goto_Ns", "<u4"),
-                ("nr_cycles", "<u4"),
-                ("inc_cycle", "<u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("nc cycles", "|u4"),
+                ("goto Ns'", "|u4"),
+                ("nr cycles", "|u4"),
+                ("inc. cycle", "|u4"),
             ]
         ),
         {"10.40"},
@@ -420,27 +448,27 @@
     (
         np.dtype(
             [
-                ("sine_mode", "|u1"),
+                ("Mode", "|u1"),
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u4"),
-                ("tIs", "<f4"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u4"),
+                ("tIs (h:m:s)", "<f4"),
                 ("record", "|u1"),
-                ("dE", "<f4"),
-                ("dt", "<f4"),
+                ("dE (mV)", "<f4"),
+                ("dt (s)", "<f4"),
                 ("fi", "<f4"),
-                ("fi_unit", "|u1"),
+                ("unit fi", "|u1"),
                 ("ff", "<f4"),
-                ("ff_unit", "|u1"),
-                ("Nd", "<u4"),
-                ("points", "|u1"),
+                ("unit ff", "|u1"),
+                ("Nd", "|u4"),
+                ("Points", "|u1"),
                 ("spacing", "|u1"),
                 ("Ia/Va", "|u1"),
                 ("Ia", "<f4"),
-                ("Ia_unit", "|u1"),
-                ("va_pourcent", "<f4"),
+                ("unit  Ia", "|u1"),
+                ("va pourcent", "<f4"),
                 ("pw", "<f4"),
-                ("Na", "<u4"),
+                ("Na", "|u4"),
                 ("corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("limit_type1", "|u1"),
@@ -467,14 +495,14 @@
                 ("limit_comp6", "|u1"),
                 ("limit_value6", "<f4"),
                 ("limit_unit6", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("nc_cycles", "<u4"),
-                ("goto_Ns", "<u4"),
-                ("nr_cycles", "<u4"),
-                ("inc_cycle", "<u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("nc cycles", "|u4"),
+                ("goto Ns'", "|u4"),
+                ("nr cycles", "|u4"),
+                ("inc. cycle", "|u4"),
             ]
         ),
         {"11.50"},
@@ -487,29 +515,29 @@
     (
         np.dtype(
             [
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
                 ("dE/dt", "<f4"),
-                ("dE/dt_unit", "|u1"),
-                ("Ei", "<f4"),
-                ("Ei_vs", "|u1"),
-                ("EL", "<f4"),
-                ("EL_vs", "|u1"),
+                ("dE/dt unit", "|u1"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u1"),
+                ("EL (V)", "<f4"),
+                ("EL (V) vs.", "|u1"),
                 ("record", "|u1"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
-                ("tI", "<f4"),
-                ("step_percent", "|u1"),
-                ("N", "<u4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "|u1"),
+                ("unit dI", "|u1"),
+                ("tI (s)", "<f4"),
+                ("step percent", "|u1"),
+                ("N", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
             ]
         ),
         {"10.40", "11.50"},
@@ -523,7 +551,7 @@
         np.dtype(
             [
                 ("ctrl_type", "|u1"),
-                ("apply_I/C", "|u1"),
+                ("Apply I/C", "|u1"),
                 ("ctrl1_val", "<f4"),
                 ("ctrl1_val_unit", "|u1"),
                 ("ctrl1_val_vs", "|u1"),
@@ -536,17 +564,17 @@
                 ("N", "<f4"),
                 ("charge/discharge", "|u1"),
                 ("charge/discharge_1", "|u1"),
-                ("apply_I/C_1", "|u1"),
+                ("Apply I/C_1", "|u1"),
                 ("N1", "<f4"),
                 ("ctrl4_val", "<f4"),
                 ("ctrl4_val_unit", "|u1"),
-                ("ctrl_seq", "<u4"),
-                ("ctrl_repeat", "<u4"),
+                ("ctrl_seq", "|u4"),
+                ("ctrl_repeat", "|u4"),
                 ("ctrl_trigger", "|u1"),
                 ("ctrl_TO_t", "<f4"),
                 ("ctrl_TO_t_unit", "|u1"),
-                ("ctrl_Nd", "<u4"),
-                ("ctrl_Na", "<u4"),
+                ("ctrl_Nd", "|u4"),
+                ("ctrl_Na", "|u4"),
                 ("ctrl_corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("lim1_type", "|u1"),
@@ -555,21 +583,21 @@
                 ("lim1_value", "<f4"),
                 ("lim1_value_unit", "|u1"),
                 ("lim1_action", "|u1"),
-                ("lim1_seq", "<u4"),
+                ("lim1_seq", "|u4"),
                 ("lim2_type", "|u1"),
                 ("lim2_comp", "|u1"),
                 ("lim2_Q", "|u1"),
                 ("lim2_value", "<f4"),
                 ("lim2_value_unit", "|u1"),
                 ("lim2_action", "|u1"),
-                ("lim2_seq", "<u4"),
+                ("lim2_seq", "|u4"),
                 ("lim3_type", "|u1"),
                 ("lim3_comp", "|u1"),
                 ("lim3_Q", "|u1"),
                 ("lim3_value", "<f4"),
                 ("lim3_value_unit", "|u1"),
                 ("lim3_action", "|u1"),
-                ("lim3_seq", "<u4"),
+                ("lim3_seq", "|u4"),
                 ("rec_nb", "|u1"),
                 ("rec1_type", "|u1"),
                 ("rec1_value", "<f4"),
@@ -580,14 +608,14 @@
                 ("rec3_type", "|u1"),
                 ("rec3_value", "<f4"),
                 ("rec3_value_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
                 ("auto_rest", "|u1"),
-                ("bandwidth", "|u1"),
+                ("Bandwidth", "|u1"),
             ]
         ),
         {"10.40"},
@@ -596,7 +624,7 @@
         np.dtype(
             [
                 ("ctrl_type", "|u1"),
-                ("apply_I/C", "|u1"),
+                ("Apply I/C", "|u1"),
                 ("ctrl1_val", "<f4"),
                 ("ctrl1_val_unit", "|u1"),
                 ("ctrl1_val_vs", "|u1"),
@@ -608,13 +636,13 @@
                 ("ctrl3_val_vs", "|u1"),
                 ("N", "<f4"),
                 ("charge/discharge", "|u1"),
-                ("ctrl_seq", "<u4"),
-                ("ctrl_repeat", "<u4"),
+                ("ctrl_seq", "|u4"),
+                ("ctrl_repeat", "|u4"),
                 ("ctrl_trigger", "|u1"),
                 ("ctrl_TO_t", "<f4"),
                 ("ctrl_TO_t_unit", "|u1"),
-                ("ctrl_Nd", "<u4"),
-                ("ctrl_Na", "<u4"),
+                ("ctrl_Nd", "|u4"),
+                ("ctrl_Na", "|u4"),
                 ("ctrl_corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("lim1_type", "|u1"),
@@ -623,21 +651,21 @@
                 ("lim1_value", "<f4"),
                 ("lim1_value_unit", "|u1"),
                 ("lim1_action", "|u1"),
-                ("lim1_seq", "<u4"),
+                ("lim1_seq", "|u4"),
                 ("lim2_type", "|u1"),
                 ("lim2_comp", "|u1"),
                 ("lim2_Q", "|u1"),
                 ("lim2_value", "<f4"),
                 ("lim2_value_unit", "|u1"),
                 ("lim2_action", "|u1"),
-                ("lim2_seq", "<u4"),
+                ("lim2_seq", "|u4"),
                 ("lim3_type", "|u1"),
                 ("lim3_comp", "|u1"),
                 ("lim3_Q", "|u1"),
                 ("lim3_value", "<f4"),
                 ("lim3_value_unit", "|u1"),
                 ("lim3_action", "|u1"),
-                ("lim3_seq", "<u4"),
+                ("lim3_seq", "|u4"),
                 ("rec_nb", "|u1"),
                 ("rec1_type", "|u1"),
                 ("rec1_value", "<f4"),
@@ -648,14 +676,14 @@
                 ("rec3_type", "|u1"),
                 ("rec3_value", "<f4"),
                 ("rec3_value_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
                 ("auto_rest", "|u1"),
-                ("bandwidth", "|u1"),
+                ("Bandwidth", "|u1"),
             ]
         ),
         {"10.40"},
@@ -664,7 +692,7 @@
         np.dtype(
             [
                 ("ctrl_type", "|u1"),
-                ("apply_I/C", "|u1"),
+                ("Apply I/C", "|u1"),
                 ("current/potential", "|u1"),
                 ("ctrl1_val", "<f4"),
                 ("ctrl1_val_unit", "|u1"),
@@ -678,17 +706,17 @@
                 ("N", "<f4"),
                 ("charge/discharge", "|u1"),
                 ("charge/discharge_1", "|u1"),
-                ("apply_I/C_1", "|u1"),
+                ("Apply I/C_1", "|u1"),
                 ("N1", "<f4"),
                 ("ctrl4_val", "<f4"),
                 ("ctrl4_val_unit", "|u1"),
-                ("ctrl_seq", "<u4"),
-                ("ctrl_repeat", "<u4"),
+                ("ctrl_seq", "|u4"),
+                ("ctrl_repeat", "|u4"),
                 ("ctrl_trigger", "|u1"),
                 ("ctrl_TO_t", "<f4"),
                 ("ctrl_TO_t_unit", "|u1"),
-                ("ctrl_Nd", "<u4"),
-                ("ctrl_Na", "<u4"),
+                ("ctrl_Nd", "|u4"),
+                ("ctrl_Na", "|u4"),
                 ("ctrl_corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("lim1_type", "|u1"),
@@ -697,21 +725,21 @@
                 ("lim1_value", "<f4"),
                 ("lim1_value_unit", "|u1"),
                 ("lim1_action", "|u1"),
-                ("lim1_seq", "<u4"),
+                ("lim1_seq", "|u4"),
                 ("lim2_type", "|u1"),
                 ("lim2_comp", "|u1"),
                 ("lim2_Q", "|u1"),
                 ("lim2_value", "<f4"),
                 ("lim2_value_unit", "|u1"),
                 ("lim2_action", "|u1"),
-                ("lim2_seq", "<u4"),
+                ("lim2_seq", "|u4"),
                 ("lim3_type", "|u1"),
                 ("lim3_comp", "|u1"),
                 ("lim3_Q", "|u1"),
                 ("lim3_value", "<f4"),
                 ("lim3_value_unit", "|u1"),
                 ("lim3_action", "|u1"),
-                ("lim3_seq", "<u4"),
+                ("lim3_seq", "|u4"),
                 ("rec_nb", "|u1"),
                 ("rec1_type", "|u1"),
                 ("rec1_value", "<f4"),
@@ -722,14 +750,14 @@
                 ("rec3_type", "|u1"),
                 ("rec3_value", "<f4"),
                 ("rec3_value_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
                 ("auto_rest", "|u1"),
-                ("bandwidth", "|u1"),
+                ("Bandwidth", "|u1"),
             ]
         ),
         {"10.40"},
@@ -738,7 +766,7 @@
         np.dtype(
             [
                 ("ctrl_type", "|u2"),
-                ("apply_I/C", "|u2"),
+                ("Apply I/C", "|u2"),
                 ("current/potential", "|u2"),
                 ("ctrl1_val", "<f4"),
                 ("ctrl1_val_unit", "|u1"),
@@ -752,7 +780,7 @@
                 ("N", "<f4"),
                 ("charge/discharge", "|u1"),
                 ("charge/discharge_1", "|u2"),
-                ("apply_I/C_1", "|u4"),
+                ("Apply I/C_1", "|u4"),
                 ("N1", "<f4"),
                 ("ctrl4_val", "<f4"),
                 ("ctrl4_val_unit", "|u2"),
@@ -799,14 +827,14 @@
                 ("rec3_type", "|u1"),
                 ("rec3_value", "<f4"),
                 ("rec3_value_unit", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
                 ("auto_rest", "|u4"),
-                ("bandwidth", "|u1"),
+                ("Bandwidth", "|u1"),
             ]
         ),
         {"11.50"},
@@ -819,13 +847,13 @@
     (
         np.dtype(
             [
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
                 ("record", "|u1"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
             ]
         ),
         {"10.40", "11.50"},
@@ -833,12 +861,12 @@
     (
         np.dtype(
             [
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
             ]
         ),
         {"10.40", "11.50"},
@@ -851,24 +879,24 @@
     (
         np.dtype(
             [
-                ("sine_mode", "|u1"),
-                ("E", "<f4"),
-                ("E_vs", "|u1"),
-                ("tE", "<f4"),
+                ("Mode", "|u1"),
+                ("E (V)", "<f4"),
+                ("E (V) vs.", "|u1"),
+                ("tE (h:m:s)", "<f4"),
                 ("record", "|u1"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
-                ("dt", "<f4"),
+                ("unit dI", "|u1"),
+                ("dt (s)", "<f4"),
                 ("fi", "<f4"),
-                ("fi_unit", "|u1"),
+                ("unit fi", "|u1"),
                 ("ff", "<f4"),
-                ("ff_unit", "|u1"),
-                ("Nd", "<u4"),
-                ("points", "|u1"),
+                ("unit ff", "|u1"),
+                ("Nd", "|u4"),
+                ("Points", "|u1"),
                 ("spacing", "|u1"),
-                ("Va", "<f4"),
+                ("Va (mV)", "<f4"),
                 ("pw", "<f4"),
-                ("Na", "<u4"),
+                ("Na", "|u4"),
                 ("corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("limit_type1", "|u1"),
@@ -895,14 +923,14 @@
                 ("limit_comp6", "|u1"),
                 ("limit_value6", "<f4"),
                 ("limit_unit6", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("nc_cycles", "<u4"),
-                ("goto_Ns", "<u4"),
-                ("nr_cycles", "<u4"),
-                ("inc_cycle", "<u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("nc cycles", "|u4"),
+                ("goto Ns'", "|u4"),
+                ("nr cycles", "|u4"),
+                ("inc. cycle", "|u4"),
             ]
         ),
         {"10.40"},
@@ -910,24 +938,24 @@
     (
         np.dtype(
             [
-                ("sine_mode", "|u4"),
-                ("E", "<f4"),
-                ("E_vs", "|u1"),
-                ("tE", "<f4"),
+                ("Mode", "|u4"),
+                ("E (V)", "<f4"),
+                ("E (V) vs.", "|u1"),
+                ("tE (h:m:s)", "<f4"),
                 ("record", "|u1"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
-                ("dt", "<f4"),
+                ("unit dI", "|u1"),
+                ("dt (s)", "<f4"),
                 ("fi", "<f4"),
-                ("fi_unit", "|u1"),
+                ("unit fi", "|u1"),
                 ("ff", "<f4"),
-                ("ff_unit", "|u1"),
-                ("Nd", "<u4"),
-                ("points", "|u1"),
+                ("unit ff", "|u1"),
+                ("Nd", "|u4"),
+                ("Points", "|u1"),
                 ("spacing", "|u1"),
-                ("Va", "<f4"),
+                ("Va (mV)", "<f4"),
                 ("pw", "<f4"),
-                ("Na", "<u4"),
+                ("Na", "|u4"),
                 ("corr", "|u1"),
                 ("lim_nb", "|u1"),
                 ("limit_type1", "|u1"),
@@ -954,14 +982,14 @@
                 ("limit_comp6", "|u1"),
                 ("limit_value6", "<f4"),
                 ("limit_unit6", "|u1"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("nc_cycles", "<u4"),
-                ("goto_Ns", "<u4"),
-                ("nr_cycles", "<u4"),
-                ("inc_cycle", "<u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("nc cycles", "|u4"),
+                ("goto Ns'", "|u4"),
+                ("nr cycles", "|u4"),
+                ("inc. cycle", "|u4"),
             ]
         ),
         {"11.50"},
@@ -975,16 +1003,16 @@
         np.dtype(
             [
                 ("select", "|u1"),
-                ("td", "<u4"),
+                ("td (h:m:s)", "|u4"),
                 ("from", "|u1"),
-                ("tech_num", "|u1"),
-                ("ole_date", "<f4"),  # Why the hell would they split this?!
-                ("ole_time", "<f4"),
+                ("tech. num.", "|u1"),
+                ("date (m/d/y)", "<f4"),  # Why the hell would they split this?!
+                ("date (h:m:s)", "<f4"),
                 ("record", "|u1"),
-                ("dE", "<f4"),
+                ("dE (mV)", "<f4"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
-                ("dt", "<f4"),
+                ("unit dI", "|u1"),
+                ("dt (s)", "<f4"),
             ]
         ),
         {"10.40", "11.50"},
@@ -997,20 +1025,20 @@
     (
         np.dtype(
             [
-                ("E", "<f4"),
-                ("E_vs", "|u1"),
+                ("E (V)", "<f4"),
+                ("E (V) vs.", "|u1"),
                 ("f", "<f4"),
-                ("f_unit", "|u1"),
-                ("Va", "<f4"),
+                ("unit f", "|u1"),
+                ("Va (mV)", "<f4"),
                 ("pw", "<f4"),
-                ("Na", "<u4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("comp_level", "|u1"),
-                ("use_results", "|u1"),
-                ("comp_mode", "|u1"),
+                ("Na", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("comp. level (%)", "|u1"),
+                ("use results", "|u1"),
+                ("comp. mode", "|u1"),
             ]
         ),
         {"10.40", "11.50"},
@@ -1022,44 +1050,44 @@
     (
         np.dtype(
             [
-                ("Mode", "<u4"),
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("Es", "<f4"),
-                ("Es_vs", "<u4"),
-                ("ts", "<f4"),
+                ("Mode", "|u4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("Es (V)", "<f4"),
+                ("Es (V) vs.", "|u4"),
+                ("ts (h:m:s)", "<f4"),
                 ("dE/dt", "<f4"),
-                ("dE/dt_unit", "|u1"),
-                ("Ei", "<f4"),
-                ("Ei_vs", "<u4"),
-                ("Ef", "<f4"),
-                ("Ef_vs", "<u4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "|u1"),
+                ("dE/dt unit", "|u1"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u4"),
+                ("Ef (V)", "<f4"),
+                ("Ef (V) vs.", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
                 ("record", "|u1"),
                 ("dIp", "<f4"),
-                ("dIp_unit", "|u1"),
+                ("unit dIp", "|u1"),
                 ("dQp", "<f4"),
-                ("dQp_unit", "|u1"),
-                ("dtp", "<f4"),
-                ("dts", "<f4"),
-                ("step_percent", "|u1"),
-                ("N", "|u1"),
+                ("unit dQp", "|u1"),
+                ("dtp (s)", "<f4"),
+                ("dts (s)", "<f4"),
+                ("step percent", "|u1"),
+                ("N", "|u4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "<u4"),
+                ("unit dQM", "|u1"),
                 ("Imax", "<f4"),
-                ("Imax_unit", "|u1"),
+                ("unit Imax", "|u1"),
                 ("Imin", "<f4"),
-                ("Imin_unit", "|u1"),
-                ("goto_Ns", "|u4"),
-                ("nc_cycles", "<u4"),
+                ("unit Imin", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"11.50"},
@@ -1071,35 +1099,35 @@
     (
         np.dtype(
             [
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
-                ("Ei", "<f4"),
-                ("Ei_vs", "<u4"),
-                ("ti", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u4"),
+                ("ti (h:m:s)", "<f4"),
                 ("Imax", "<f4"),
-                ("Imax_unit", "|u1"),
+                ("unit Imax", "|u1"),
                 ("Imin", "<f4"),
-                ("Imin_unit", "|u1"),
+                ("unit Imin", "|u1"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "<u4"),
+                ("unit dQM", "|u1"),
                 ("record", "|u1"),
                 ("dI", "<f4"),
-                ("dI_unit", "|u1"),
+                ("unit dI", "|u1"),
                 ("dQ", "<f4"),
-                ("dQ_unit", "|u1"),
-                ("dt", "<f4"),
-                ("dta", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("I_range_min", "|u1"),
-                ("I_range_max", "|u1"),
-                ("I_range_init", "|u1"),
-                ("bandwidth", "|u1"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("unit dQ", "|u1"),
+                ("dt (s)", "<f4"),
+                ("dta (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"11.50"},
@@ -1111,26 +1139,26 @@
     (
         np.dtype(
             [
-                ("tR", "<f4"),
-                ("dER/dt", "<f4"),
-                ("dER", "<f4"),
-                ("dtR", "<f4"),
+                ("tR (h:m:s)", "<f4"),
+                ("dER/dt (mV/h)", "<f4"),
+                ("dER (mV)", "<f4"),
+                ("dtR (s)", "<f4"),
                 ("Is", "<f4"),
-                ("Is_unit", "|u1"),
-                ("Is_vs", "|u4"),
-                ("ts", "<f4"),
-                ("EM", "<f4"),
+                ("unit Is", "|u1"),
+                ("unit Is vs.", "|u4"),
+                ("ts (h:m:s)", "<f4"),
+                ("EM (V)", "<f4"),
                 ("dQM", "<f4"),
-                ("dQM_unit", "|u1"),
+                ("unit dQM", "|u1"),
                 ("record", "|u1"),
-                ("dEs", "<f4"),
-                ("dts", "<f4"),
-                ("E_range_min", "<f4"),
-                ("E_range_max", "<f4"),
-                ("I_range", "|u1"),
-                ("bandwidth", "|u1"),
-                ("goto_Ns", "<u4"),
-                ("nc_cycles", "<u4"),
+                ("dEs (mV)", "<f4"),
+                ("dts (s)", "<f4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("goto Ns'", "|u4"),
+                ("nc cycles", "|u4"),
             ]
         ),
         {"11.50"},
@@ -1159,8 +1187,39 @@
     0x7F: ("MB", _mb_params_dtypes),
 }
 
+unit_map = {
+    "f": (
+        ("MHz", 0, 1e6),
+        ("kHz", 1, 1e3),
+        ("Hz", 2, 1.0),
+        ("mHz", 3, 1e-3),
+    ),
+    "I": (
+        ("A", 0, 1.0),
+        ("mA", 1, 1e-3),
+        ("µA", 2, 1e-6),
+        ("nA", 3, 1e-9),
+        ("pA", 4, 1e-12),
+    ),
+    "Q": (
+        ("A.h", 0, 1.0),
+        ("mA.h", 1, 1e-3),
+        ("µA.h", 2, 1e-6),
+        ("nA.h", 3, 1e-9),
+        ("pA.h", 4, 1e-12),
+    ),
+    "vs.": (("<None>", 2),),
+}
+
+vs_map = (
+    ("Eoc", 0),
+    ("Emeas", 2),
+    ("Ei", 3),
+    ("Ref", 4),
+)
+
 param_map = {
-    "I_range": (
+    "I Range": (
         ("10 mA", 1, 1e-2),
         ("100 µA", 2, 1e-4),
         ("1 µA", 3, 1e-6),
@@ -1356,18 +1415,33 @@
         ("16 A", 193, 16.0),
         ("Auto", None, None),
     ),
-    "Is_unit": (
-        ("A", 0),  # guess
-        ("mA", 1),
-        ("µA", 2),
-        ("nA", 3),  # guess
-        ("pA", 4),  # guess
-    ),
-    "set_I/C": (
+    "unit dI": unit_map["I"],
+    "unit dIp": unit_map["I"],
+    "unit dq": unit_map["Q"],
+    "unit dQ": unit_map["Q"],
+    "unit dQM": unit_map["Q"],
+    "unit dQp": unit_map["Q"],
+    "unit f": unit_map["f"],
+    "unit fi": unit_map["f"],
+    "unit ff": unit_map["f"],
+    "unit  Ia": unit_map["I"],
+    "unit Im": unit_map["I"],
+    "unit Imax": unit_map["I"],
+    "unit Imin": unit_map["I"],
+    "unit Is": unit_map["I"],
+    "unit Is vs.": unit_map["vs."],
+    "E (V) vs.": vs_map,
+    "E1 (V) vs.": vs_map,
+    "E2 (V) vs.": vs_map,
+    "Ef (V) vs.": vs_map,
+    "Ei (V) vs.": vs_map,
+    "EL (V) vs.": vs_map,
+    "Es (V) vs.": vs_map,
+    "Set I/C": (
         ("I", 0),
-        ("C", 1),  # guess
+        ("C", 1),
     ),
-    "apply_I/C": (
+    "Apply I/C": (
         ("I", 0),
         ("C", 1),
     ),
diff --git a/tests/test_extract.py b/tests/test_extract.py
index 2529e1c7..57b0b16c 100644
--- a/tests/test_extract.py
+++ b/tests/test_extract.py
@@ -26,6 +26,6 @@ def test_yadg_extractors_extract_with_metadata(filetype, infile, datadir):
     ret = extract(
         filetype=filetype, path=infile, locale="en_GB", timezone="Europe/Berlin"
     )
-    # ret.to_netcdf(f"C:/Users/Kraus/Code/yadg/tests/test_extract/{outfile}", engine="h5netcdf")
+    ret.to_netcdf(f"{outfile}.tmp", engine="h5netcdf")
     ref = datatree.open_datatree(outfile, engine="h5netcdf")
     compare_datatrees(ret, ref, thislevel=True, descend=True)
diff --git a/tests/test_extract/cp.mpr.nc b/tests/test_extract/cp.mpr.nc
index 178ae023..f216c309 100644
Binary files a/tests/test_extract/cp.mpr.nc and b/tests/test_extract/cp.mpr.nc differ
diff --git a/tests/test_x_eclab.py b/tests/test_x_eclab.py
index 2377afe5..8c03d02d 100644
--- a/tests/test_x_eclab.py
+++ b/tests/test_x_eclab.py
@@ -18,6 +18,15 @@ def check_file(fname, kwargs, func):
     return ret
 
 
+def compare_params(left, right):
+    lpar = left.attrs["original_metadata"].get("params", {})
+    rpar = right.attrs["original_metadata"].get("params", {})
+    for k in rpar:
+        if k.endswith("vs.") or k.startswith("unit") or k == "I Range":
+            assert k in lpar, f"Param {k!r} not found in mpt file: {lpar.keys()}"
+            assert lpar[k] == rpar[k], f"Inconsistent param {k!r}: {lpar[k]}, {rpar[k]}"
+
+
 @pytest.mark.parametrize(
     "froot, locale",
     [
@@ -64,6 +73,7 @@ def test_eclab_consistency(froot, locale, datadir):
         except AssertionError as e:
             e.args = (e.args[0] + f"Error happened on key: {key!r}\n",)
             raise e
+    compare_params(aret, bret)
 
 
 @pytest.mark.parametrize(
@@ -101,6 +111,7 @@ def test_eclab_consistency_partial_1(froot, locale, datadir):
         except AssertionError as e:
             e.args = (e.args[0] + f"Error happened on key: {key!r}\n",)
             raise e
+    compare_params(aret, bret)
 
 
 @pytest.mark.parametrize(
@@ -126,6 +137,7 @@ def test_eclab_consistency_partial_2(froot, locale, datadir):
         except AssertionError as e:
             e.args = (e.args[0] + f"Error happened on key: {key!r}\n",)
             raise e
+    compare_params(aret, bret)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_x_eclab/ca.issue_134.mpr.pkl b/tests/test_x_eclab/ca.issue_134.mpr.pkl
index 80568680..ba3ee232 100644
Binary files a/tests/test_x_eclab/ca.issue_134.mpr.pkl and b/tests/test_x_eclab/ca.issue_134.mpr.pkl differ
diff --git a/tests/test_x_eclab/ca.issue_149.mpr.pkl b/tests/test_x_eclab/ca.issue_149.mpr.pkl
index afbe00e2..0fe8c9cb 100644
Binary files a/tests/test_x_eclab/ca.issue_149.mpr.pkl and b/tests/test_x_eclab/ca.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/ca.mpr.pkl b/tests/test_x_eclab/ca.mpr.pkl
index 683bb451..c507d448 100644
Binary files a/tests/test_x_eclab/ca.mpr.pkl and b/tests/test_x_eclab/ca.mpr.pkl differ
diff --git a/tests/test_x_eclab/coc.issue_185.mpr.pkl b/tests/test_x_eclab/coc.issue_185.mpr.pkl
index 4d1d7168..e470b8f7 100644
Binary files a/tests/test_x_eclab/coc.issue_185.mpr.pkl and b/tests/test_x_eclab/coc.issue_185.mpr.pkl differ
diff --git a/tests/test_x_eclab/cov.issue_185.mpr.pkl b/tests/test_x_eclab/cov.issue_185.mpr.pkl
index 4093fb6f..e38abed7 100644
Binary files a/tests/test_x_eclab/cov.issue_185.mpr.pkl and b/tests/test_x_eclab/cov.issue_185.mpr.pkl differ
diff --git a/tests/test_x_eclab/cp.issue_149.mpr.pkl b/tests/test_x_eclab/cp.issue_149.mpr.pkl
index 187660a2..66ab6236 100644
Binary files a/tests/test_x_eclab/cp.issue_149.mpr.pkl and b/tests/test_x_eclab/cp.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/cp.issue_61.mpr.pkl b/tests/test_x_eclab/cp.issue_61.mpr.pkl
index c90d7782..e10a9b75 100644
Binary files a/tests/test_x_eclab/cp.issue_61.mpr.pkl and b/tests/test_x_eclab/cp.issue_61.mpr.pkl differ
diff --git a/tests/test_x_eclab/cp.mpr.pkl b/tests/test_x_eclab/cp.mpr.pkl
index 92baa945..673bbe20 100644
Binary files a/tests/test_x_eclab/cp.mpr.pkl and b/tests/test_x_eclab/cp.mpr.pkl differ
diff --git a/tests/test_x_eclab/cv.issue_149.mpr.pkl b/tests/test_x_eclab/cv.issue_149.mpr.pkl
index c807b0c2..aea94093 100644
Binary files a/tests/test_x_eclab/cv.issue_149.mpr.pkl and b/tests/test_x_eclab/cv.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/cv.mpr.pkl b/tests/test_x_eclab/cv.mpr.pkl
index 73ca6f8b..058ab25a 100644
Binary files a/tests/test_x_eclab/cv.mpr.pkl and b/tests/test_x_eclab/cv.mpr.pkl differ
diff --git a/tests/test_x_eclab/cva.issue_135.mpr.pkl b/tests/test_x_eclab/cva.issue_135.mpr.pkl
index 9cbcf7de..cb4615ee 100644
Binary files a/tests/test_x_eclab/cva.issue_135.mpr.pkl and b/tests/test_x_eclab/cva.issue_135.mpr.pkl differ
diff --git a/tests/test_x_eclab/gcpl.issue_149.mpr.pkl b/tests/test_x_eclab/gcpl.issue_149.mpr.pkl
index 61b8ebff..49307f8d 100644
Binary files a/tests/test_x_eclab/gcpl.issue_149.mpr.pkl and b/tests/test_x_eclab/gcpl.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/gcpl.mpr.pkl b/tests/test_x_eclab/gcpl.mpr.pkl
index c23f771b..a118eb6c 100644
Binary files a/tests/test_x_eclab/gcpl.mpr.pkl and b/tests/test_x_eclab/gcpl.mpr.pkl differ
diff --git a/tests/test_x_eclab/gcpl.pr_182.1.mpr.pkl b/tests/test_x_eclab/gcpl.pr_182.1.mpr.pkl
index 33b82c57..8e22ea49 100644
Binary files a/tests/test_x_eclab/gcpl.pr_182.1.mpr.pkl and b/tests/test_x_eclab/gcpl.pr_182.1.mpr.pkl differ
diff --git a/tests/test_x_eclab/gcpl.pr_182.2.mpr.pkl b/tests/test_x_eclab/gcpl.pr_182.2.mpr.pkl
index ef672145..bef3c589 100644
Binary files a/tests/test_x_eclab/gcpl.pr_182.2.mpr.pkl and b/tests/test_x_eclab/gcpl.pr_182.2.mpr.pkl differ
diff --git a/tests/test_x_eclab/geis.issue_149.mpr.pkl b/tests/test_x_eclab/geis.issue_149.mpr.pkl
index 022cd27b..8f8c808a 100644
Binary files a/tests/test_x_eclab/geis.issue_149.mpr.pkl and b/tests/test_x_eclab/geis.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/geis.mpr.pkl b/tests/test_x_eclab/geis.mpr.pkl
index b5dcdae4..246f38bd 100644
Binary files a/tests/test_x_eclab/geis.mpr.pkl and b/tests/test_x_eclab/geis.mpr.pkl differ
diff --git a/tests/test_x_eclab/lsv.mpr.pkl b/tests/test_x_eclab/lsv.mpr.pkl
index 650dcab3..2aea06f0 100644
Binary files a/tests/test_x_eclab/lsv.mpr.pkl and b/tests/test_x_eclab/lsv.mpr.pkl differ
diff --git a/tests/test_x_eclab/mb.issue_149.mpr.pkl b/tests/test_x_eclab/mb.issue_149.mpr.pkl
index 2c591b7a..11a58e67 100644
Binary files a/tests/test_x_eclab/mb.issue_149.mpr.pkl and b/tests/test_x_eclab/mb.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/mb.issue_95.mpr.pkl b/tests/test_x_eclab/mb.issue_95.mpr.pkl
index a2131d95..cea0666b 100644
Binary files a/tests/test_x_eclab/mb.issue_95.mpr.pkl and b/tests/test_x_eclab/mb.issue_95.mpr.pkl differ
diff --git a/tests/test_x_eclab/mb.mpr.pkl b/tests/test_x_eclab/mb.mpr.pkl
index 3c54dc2e..4626f2b3 100644
Binary files a/tests/test_x_eclab/mb.mpr.pkl and b/tests/test_x_eclab/mb.mpr.pkl differ
diff --git a/tests/test_x_eclab/mp.issue_183.mpr.pkl b/tests/test_x_eclab/mp.issue_183.mpr.pkl
index 945973a5..017ff4fc 100644
Binary files a/tests/test_x_eclab/mp.issue_183.mpr.pkl and b/tests/test_x_eclab/mp.issue_183.mpr.pkl differ
diff --git a/tests/test_x_eclab/ocv.issue_149.mpr.pkl b/tests/test_x_eclab/ocv.issue_149.mpr.pkl
index df4a8a11..ac15b959 100644
Binary files a/tests/test_x_eclab/ocv.issue_149.mpr.pkl and b/tests/test_x_eclab/ocv.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/ocv.mpr.pkl b/tests/test_x_eclab/ocv.mpr.pkl
index 302fe03c..07b57edf 100644
Binary files a/tests/test_x_eclab/ocv.mpr.pkl and b/tests/test_x_eclab/ocv.mpr.pkl differ
diff --git a/tests/test_x_eclab/peis.issue_149.mpr.pkl b/tests/test_x_eclab/peis.issue_149.mpr.pkl
index 430c0a4a..45087c23 100644
Binary files a/tests/test_x_eclab/peis.issue_149.mpr.pkl and b/tests/test_x_eclab/peis.issue_149.mpr.pkl differ
diff --git a/tests/test_x_eclab/peis.mpr.pkl b/tests/test_x_eclab/peis.mpr.pkl
index c0b3da1f..ff85d616 100644
Binary files a/tests/test_x_eclab/peis.mpr.pkl and b/tests/test_x_eclab/peis.mpr.pkl differ
diff --git a/tests/test_x_eclab/vsp_ocv_with.mpr.pkl b/tests/test_x_eclab/vsp_ocv_with.mpr.pkl
index 816a1830..f5bae7ff 100644
Binary files a/tests/test_x_eclab/vsp_ocv_with.mpr.pkl and b/tests/test_x_eclab/vsp_ocv_with.mpr.pkl differ
diff --git a/tests/test_x_eclab/vsp_ocv_wo.mpr.pkl b/tests/test_x_eclab/vsp_ocv_wo.mpr.pkl
index 74055e29..b3b35ac0 100644
Binary files a/tests/test_x_eclab/vsp_ocv_wo.mpr.pkl and b/tests/test_x_eclab/vsp_ocv_wo.mpr.pkl differ
diff --git a/tests/test_x_eclab/vsp_peis_with.mpr.pkl b/tests/test_x_eclab/vsp_peis_with.mpr.pkl
index d496cc3d..bfb327d4 100644
Binary files a/tests/test_x_eclab/vsp_peis_with.mpr.pkl and b/tests/test_x_eclab/vsp_peis_with.mpr.pkl differ
diff --git a/tests/test_x_eclab/wait.mpr.pkl b/tests/test_x_eclab/wait.mpr.pkl
index a7a8b5ff..e9ae97c9 100644
Binary files a/tests/test_x_eclab/wait.mpr.pkl and b/tests/test_x_eclab/wait.mpr.pkl differ
diff --git a/tests/test_x_eclab/zir.mpr.pkl b/tests/test_x_eclab/zir.mpr.pkl
index 5d26c301..69bdba1c 100644
Binary files a/tests/test_x_eclab/zir.mpr.pkl and b/tests/test_x_eclab/zir.mpr.pkl differ
diff --git a/tests/test_yadg/cp.mpr.nc b/tests/test_yadg/cp.mpr.nc
index 93b3eb29..b2b1195d 100644
Binary files a/tests/test_yadg/cp.mpr.nc and b/tests/test_yadg/cp.mpr.nc differ