diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/filter.py
index 27f332e58b..324585471f 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/filter.py
@@ -86,7 +86,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "W") -> list:
         ymax = float(rapbins[bins]["high"])
         kin_value = {
             "eta": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax},
-            "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
+            "m_W2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml
index 7a166af12a..a1db665936 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml
@@ -3,7 +3,7 @@ bins:
     min: 0.0
     mid: 0.1
     max: 0.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -15,7 +15,7 @@ bins:
     min: 0.2
     mid: 3.00000000e-01
     max: 0.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -27,7 +27,7 @@ bins:
     min: 0.4
     mid: 0.5
     max: 0.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -39,7 +39,7 @@ bins:
     min: 0.6
     mid: 0.7
     max: 0.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -51,7 +51,7 @@ bins:
     min: 0.8
     mid: 0.9
     max: 1.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -63,7 +63,7 @@ bins:
     min: 1.0
     mid: 1.1
     max: 1.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -75,7 +75,7 @@ bins:
     min: 1.2
     mid: 1.30000000e+00
     max: 1.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -87,7 +87,7 @@ bins:
     min: 1.6
     mid: 1.70000000e+00
     max: 1.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -99,7 +99,7 @@ bins:
     min: 1.8
     mid: 1.9
     max: 2.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -111,7 +111,7 @@ bins:
     min: 2.0
     mid: 2.1
     max: 2.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -123,7 +123,7 @@ bins:
     min: 2.2
     mid: 2.3
     max: 2.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml
index 5d61487e5e..6023b6de1a 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml
@@ -13,30 +13,30 @@ hepdata:
   version: 1
 
 nnpdf_metadata:
-  nnpdf31_process: "DY CC"
+  nnpdf31_process: DY CC
   experiment: "CMS"
 
 implemented_observables:
 
-- observable_name: "ASY"
+- observable_name: ASY
   observable:
     description: "Measurement of the electron charge asymmetry in inclusive W production in pp collisions at sqrt(s) = 7 TeV"
     label: r"$dA_{e} / d|y|$"
     units: "[fb]"
-  process_type: "EWK_RAP_ASY"
+  process_type: DY_W_ETA
   tables: [1]
   npoints: [11]
   ndata: 11
   plotting:
-    kinematics_override: ewk_rap_sqrt_scale # TODO: To Check
+    kinematics_override: identity
     dataset_label: "CMS $W$ asymmetry 840 pb"
     plot_x: eta
     y_label: '$dA_{e}/dy$'
-  kinematic_coverage: [eta, M2, sqrts]
+  kinematic_coverage: [eta, m_W2, sqrts]
   kinematics:
     variables:
       eta: {description: "Electron pseudorapidity", label: '$\eta$', units: ""}
-      M2: {description: "W boson Mass", label: "$M^2$", units: "$GeV^2$"}
+      m_W2: {description: "W boson mass squared", label: "$M^2_W$", units: "$GeV^2$"}
       sqrts: {description: "Center of Mass Energy", label: '$\sqrt{s}$', units: "$GeV$"}
     file: kinematics.yaml
   data_central: data.yaml
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/filter.py
index b3b46618ea..ea2fed3f6d 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/filter.py
@@ -85,7 +85,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "W") -> list:
         ymax = float(rapbins[bins]["high"])
         kin_value = {
             "eta": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax},
-            "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
+            "m_W2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)
@@ -160,7 +160,7 @@ def read_corrmatrix(nb_datapoints: int) -> np.ndarray:
 
     """
     corrmat = pd.read_csv(
-        "./rawdata/covmat.corr", names=[f'{i}' for i in range(nb_datapoints)], delim_whitespace=True
+        "./rawdata/covmat.corr", names=[f'{i}' for i in range(nb_datapoints)], sep=r'\s+'
     )
     return corrmat.iloc[:, :].values
 
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml
index 4010f47569..ed7d73fda6 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml
@@ -3,7 +3,7 @@ bins:
     min: 0.0
     mid: 0.1
     max: 0.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -15,7 +15,7 @@ bins:
     min: 0.2
     mid: 3.00000000e-01
     max: 0.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -27,7 +27,7 @@ bins:
     min: 0.4
     mid: 0.5
     max: 0.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -39,7 +39,7 @@ bins:
     min: 0.6
     mid: 0.7
     max: 0.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -51,7 +51,7 @@ bins:
     min: 0.8
     mid: 0.9
     max: 1.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -63,7 +63,7 @@ bins:
     min: 1.0
     mid: 1.1
     max: 1.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -75,7 +75,7 @@ bins:
     min: 1.2
     mid: 1.30000000e+00
     max: 1.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -87,7 +87,7 @@ bins:
     min: 1.4
     mid: 1.5
     max: 1.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -99,7 +99,7 @@ bins:
     min: 1.6
     mid: 1.725
     max: 1.85
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -111,7 +111,7 @@ bins:
     min: 1.85
     mid: 1.975
     max: 2.1
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -123,7 +123,7 @@ bins:
     min: 2.1
     mid: 2.25
     max: 2.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/metadata.yaml
index 8f1659d48c..6975a4ab82 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/metadata.yaml
@@ -9,7 +9,7 @@ hepdata:
   url: https://www.hepdata.net/record/ins1273570
   version: 1
 nnpdf_metadata:
-  nnpdf31_process: DY CC
+  nnpdf31_process: "DY CC"
   experiment: CMS
 implemented_observables:
 - observable_name: ASY
@@ -18,20 +18,20 @@ implemented_observables:
       in pp collisions at sqrt(s) = 7 TeV
     label: r"$dA_{\mu} / d|y|$"
     units: '[fb]'
-  process_type: EWK_RAP_ASY
+  process_type: DY_W_ETA
   tables:
   - 1
   npoints:
   - 11
   ndata: 11
   plotting:
-    kinematics_override: ewk_rap_sqrt_scale
+    kinematics_override: identity
     dataset_label: CMS $W$ asymmetry 4.7 fb
     plot_x: eta
     y_label: $dA_{\mu}/dy$
   kinematic_coverage:
   - eta
-  - M2
+  - m_W2
   - sqrts
   kinematics:
     variables:
@@ -39,9 +39,9 @@ implemented_observables:
         description: Muon pseudorapidity
         label: $\eta$
         units: ''
-      M2:
-        description: W boson Mass
-        label: $M^2$
+      m_W2:
+        description: W boson mass squared
+        label: $M^2_W$
         units: $GeV^2$
       sqrts:
         description: Center of Mass Energy
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/filter.py
index e03cdeac2c..d8c9b2553c 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/filter.py
@@ -88,7 +88,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "W") -> list:
         ymax = float(rapbins[bins]["high"])
         kin_value = {
             "y": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax},
-            "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
+            "m_W2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/kinematics.yaml
index de6290415b..daf45bb550 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/kinematics.yaml
@@ -3,7 +3,7 @@ bins:
     min: 0.0
     mid: 0.1
     max: 0.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -15,7 +15,7 @@ bins:
     min: 0.2
     mid: 3.00000000e-01
     max: 0.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -27,7 +27,7 @@ bins:
     min: 0.4
     mid: 0.5
     max: 0.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -39,7 +39,7 @@ bins:
     min: 0.6
     mid: 0.7
     max: 0.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -51,7 +51,7 @@ bins:
     min: 0.8
     mid: 0.9
     max: 1.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -63,7 +63,7 @@ bins:
     min: 1.0
     mid: 1.1
     max: 1.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -75,7 +75,7 @@ bins:
     min: 1.2
     mid: 1.30000000e+00
     max: 1.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -87,7 +87,7 @@ bins:
     min: 1.4
     mid: 1.5
     max: 1.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -99,7 +99,7 @@ bins:
     min: 1.6
     mid: 1.725
     max: 1.85
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -111,7 +111,7 @@ bins:
     min: 1.85
     mid: 1.975
     max: 2.1
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -123,7 +123,7 @@ bins:
     min: 2.1
     mid: 2.25
     max: 2.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -135,7 +135,7 @@ bins:
     min: 0.0
     mid: 0.1
     max: 0.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -147,7 +147,7 @@ bins:
     min: 0.2
     mid: 3.00000000e-01
     max: 0.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -159,7 +159,7 @@ bins:
     min: 0.4
     mid: 0.5
     max: 0.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -171,7 +171,7 @@ bins:
     min: 0.6
     mid: 0.7
     max: 0.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -183,7 +183,7 @@ bins:
     min: 0.8
     mid: 0.9
     max: 1.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -195,7 +195,7 @@ bins:
     min: 1.0
     mid: 1.1
     max: 1.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -207,7 +207,7 @@ bins:
     min: 1.2
     mid: 1.30000000e+00
     max: 1.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -219,7 +219,7 @@ bins:
     min: 1.4
     mid: 1.5
     max: 1.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -231,7 +231,7 @@ bins:
     min: 1.6
     mid: 1.725
     max: 1.85
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -243,7 +243,7 @@ bins:
     min: 1.85
     mid: 1.975
     max: 2.1
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -255,7 +255,7 @@ bins:
     min: 2.1
     mid: 2.25
     max: 2.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/metadata.yaml
index ceeb50eaf1..8b4e33b76b 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/metadata.yaml
@@ -18,7 +18,7 @@ implemented_observables:
       \ for inclusive pp\u2192W\xB1+X production at 8TeV"
     label: r"$d\sigma(W\to l\nu)/dy_l$"
     units: '[fb]'
-  process_type: EWK_RAP
+  process_type: DY_W_ETA
   tables:
   - 1
   - 2
@@ -26,13 +26,13 @@ implemented_observables:
   - 22
   ndata: 22
   plotting:
-    kinematics_override: ewk_rap_sqrt_scale
+    kinematics_override: identity
     dataset_label: CMS $W$ rapidity 8 TeV
     plot_x: y
     y_label: $d\sigma(W\to l\nu)/dy_l$
   kinematic_coverage:
   - y
-  - M2
+  - m_W2
   - sqrts
   kinematics:
     variables:
@@ -40,8 +40,8 @@ implemented_observables:
         description: Lepton rapidity
         label: $\eta$
         units: ''
-      M2:
-        description: W boson Mass
+      m_W2:
+        description: W boson Mass squared
         label: $M^2$
         units: $GeV^2$
       sqrts:
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/filter.py
index 57dc822fee..178a62bf00 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/filter.py
@@ -31,9 +31,7 @@ def load_rawdata() -> pd.DataFrame:
 
 
     """
-    return pd.read_csv(
-        "./rawdata/CMS-DY2D11-ABS.data", delim_whitespace=True, names=['y', 'M', 'sigma']
-    )
+    return pd.read_csv("./rawdata/CMS-DY2D11-ABS.data", sep=r'\s+', names=['y', 'M', 'sigma'])
 
 
 def read_metadata() -> tuple[int, int, list]:
@@ -79,7 +77,7 @@ def get_kinematics(hepdata: pd.DataFrame, bin_index: list, boson: str = "Z") ->
     for bins in bin_index:
         kin_value = {
             "y": {"min": None, "mid": float(y[bins]), "max": None},
-            "M2": {"min": None, "mid": float(M[bins]) ** 2, "max": None},
+            "m_Z2": {"min": None, "mid": float(M[bins]) ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)
@@ -125,7 +123,7 @@ def read_corrmatrix(nb_datapoints: int) -> np.ndarray:
         entries of the corr/cov-mat as an array
 
     """
-    df_corrmat = pd.read_csv("./rawdata/covmat.corr", delim_whitespace=True, header=None)
+    df_corrmat = pd.read_csv("./rawdata/covmat.corr", sep=r'\s+', header=None)
     corrmat = df_corrmat.iloc[:, 2].values
     return corrmat.reshape(nb_datapoints, nb_datapoints)
 
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/kinematics.yaml
index ad1deed7b7..14a343e34d 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/kinematics.yaml
@@ -3,7 +3,7 @@ bins:
     min: null
     mid: 0.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -15,7 +15,7 @@ bins:
     min: null
     mid: 0.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -27,7 +27,7 @@ bins:
     min: null
     mid: 0.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -39,7 +39,7 @@ bins:
     min: null
     mid: 0.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -51,7 +51,7 @@ bins:
     min: null
     mid: 0.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -63,7 +63,7 @@ bins:
     min: null
     mid: 0.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -75,7 +75,7 @@ bins:
     min: null
     mid: 0.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -87,7 +87,7 @@ bins:
     min: null
     mid: 0.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -99,7 +99,7 @@ bins:
     min: null
     mid: 0.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -111,7 +111,7 @@ bins:
     min: null
     mid: 0.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -123,7 +123,7 @@ bins:
     min: null
     mid: 1.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -135,7 +135,7 @@ bins:
     min: null
     mid: 1.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -147,7 +147,7 @@ bins:
     min: null
     mid: 1.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -159,7 +159,7 @@ bins:
     min: null
     mid: 1.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -171,7 +171,7 @@ bins:
     min: null
     mid: 1.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -183,7 +183,7 @@ bins:
     min: null
     mid: 1.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -195,7 +195,7 @@ bins:
     min: null
     mid: 1.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -207,7 +207,7 @@ bins:
     min: null
     mid: 1.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -219,7 +219,7 @@ bins:
     min: null
     mid: 1.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -231,7 +231,7 @@ bins:
     min: null
     mid: 1.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -243,7 +243,7 @@ bins:
     min: null
     mid: 2.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -255,7 +255,7 @@ bins:
     min: null
     mid: 2.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -267,7 +267,7 @@ bins:
     min: null
     mid: 2.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -279,7 +279,7 @@ bins:
     min: null
     mid: 2.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 625.0
     max: null
@@ -291,7 +291,7 @@ bins:
     min: null
     mid: 0.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -303,7 +303,7 @@ bins:
     min: null
     mid: 0.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -315,7 +315,7 @@ bins:
     min: null
     mid: 0.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -327,7 +327,7 @@ bins:
     min: null
     mid: 0.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -339,7 +339,7 @@ bins:
     min: null
     mid: 0.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -351,7 +351,7 @@ bins:
     min: null
     mid: 0.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -363,7 +363,7 @@ bins:
     min: null
     mid: 0.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -375,7 +375,7 @@ bins:
     min: null
     mid: 0.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -387,7 +387,7 @@ bins:
     min: null
     mid: 0.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -399,7 +399,7 @@ bins:
     min: null
     mid: 0.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -411,7 +411,7 @@ bins:
     min: null
     mid: 1.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -423,7 +423,7 @@ bins:
     min: null
     mid: 1.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -435,7 +435,7 @@ bins:
     min: null
     mid: 1.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -447,7 +447,7 @@ bins:
     min: null
     mid: 1.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -459,7 +459,7 @@ bins:
     min: null
     mid: 1.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -471,7 +471,7 @@ bins:
     min: null
     mid: 1.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -483,7 +483,7 @@ bins:
     min: null
     mid: 1.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -495,7 +495,7 @@ bins:
     min: null
     mid: 1.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -507,7 +507,7 @@ bins:
     min: null
     mid: 1.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -519,7 +519,7 @@ bins:
     min: null
     mid: 1.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -531,7 +531,7 @@ bins:
     min: null
     mid: 2.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -543,7 +543,7 @@ bins:
     min: null
     mid: 2.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -555,7 +555,7 @@ bins:
     min: null
     mid: 2.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -567,7 +567,7 @@ bins:
     min: null
     mid: 2.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 1406.25
     max: null
@@ -579,7 +579,7 @@ bins:
     min: null
     mid: 0.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -591,7 +591,7 @@ bins:
     min: null
     mid: 0.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -603,7 +603,7 @@ bins:
     min: null
     mid: 0.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -615,7 +615,7 @@ bins:
     min: null
     mid: 0.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -627,7 +627,7 @@ bins:
     min: null
     mid: 0.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -639,7 +639,7 @@ bins:
     min: null
     mid: 0.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -651,7 +651,7 @@ bins:
     min: null
     mid: 0.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -663,7 +663,7 @@ bins:
     min: null
     mid: 0.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -675,7 +675,7 @@ bins:
     min: null
     mid: 0.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -687,7 +687,7 @@ bins:
     min: null
     mid: 0.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -699,7 +699,7 @@ bins:
     min: null
     mid: 1.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -711,7 +711,7 @@ bins:
     min: null
     mid: 1.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -723,7 +723,7 @@ bins:
     min: null
     mid: 1.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -735,7 +735,7 @@ bins:
     min: null
     mid: 1.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -747,7 +747,7 @@ bins:
     min: null
     mid: 1.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -759,7 +759,7 @@ bins:
     min: null
     mid: 1.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -771,7 +771,7 @@ bins:
     min: null
     mid: 1.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -783,7 +783,7 @@ bins:
     min: null
     mid: 1.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -795,7 +795,7 @@ bins:
     min: null
     mid: 1.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -807,7 +807,7 @@ bins:
     min: null
     mid: 1.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -819,7 +819,7 @@ bins:
     min: null
     mid: 2.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -831,7 +831,7 @@ bins:
     min: null
     mid: 2.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -843,7 +843,7 @@ bins:
     min: null
     mid: 2.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -855,7 +855,7 @@ bins:
     min: null
     mid: 2.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 2756.25
     max: null
@@ -867,7 +867,7 @@ bins:
     min: null
     mid: 0.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -879,7 +879,7 @@ bins:
     min: null
     mid: 0.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -891,7 +891,7 @@ bins:
     min: null
     mid: 0.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -903,7 +903,7 @@ bins:
     min: null
     mid: 0.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -915,7 +915,7 @@ bins:
     min: null
     mid: 0.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -927,7 +927,7 @@ bins:
     min: null
     mid: 0.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -939,7 +939,7 @@ bins:
     min: null
     mid: 0.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -951,7 +951,7 @@ bins:
     min: null
     mid: 0.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -963,7 +963,7 @@ bins:
     min: null
     mid: 0.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -975,7 +975,7 @@ bins:
     min: null
     mid: 0.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -987,7 +987,7 @@ bins:
     min: null
     mid: 1.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -999,7 +999,7 @@ bins:
     min: null
     mid: 1.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1011,7 +1011,7 @@ bins:
     min: null
     mid: 1.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1023,7 +1023,7 @@ bins:
     min: null
     mid: 1.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1035,7 +1035,7 @@ bins:
     min: null
     mid: 1.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1047,7 +1047,7 @@ bins:
     min: null
     mid: 1.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1059,7 +1059,7 @@ bins:
     min: null
     mid: 1.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1071,7 +1071,7 @@ bins:
     min: null
     mid: 1.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1083,7 +1083,7 @@ bins:
     min: null
     mid: 1.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1095,7 +1095,7 @@ bins:
     min: null
     mid: 1.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1107,7 +1107,7 @@ bins:
     min: null
     mid: 2.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1119,7 +1119,7 @@ bins:
     min: null
     mid: 2.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1131,7 +1131,7 @@ bins:
     min: null
     mid: 2.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1143,7 +1143,7 @@ bins:
     min: null
     mid: 2.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 8100.0
     max: null
@@ -1155,7 +1155,7 @@ bins:
     min: null
     mid: 0.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1167,7 +1167,7 @@ bins:
     min: null
     mid: 0.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1179,7 +1179,7 @@ bins:
     min: null
     mid: 0.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1191,7 +1191,7 @@ bins:
     min: null
     mid: 0.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1203,7 +1203,7 @@ bins:
     min: null
     mid: 0.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1215,7 +1215,7 @@ bins:
     min: null
     mid: 0.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1227,7 +1227,7 @@ bins:
     min: null
     mid: 0.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1239,7 +1239,7 @@ bins:
     min: null
     mid: 0.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1251,7 +1251,7 @@ bins:
     min: null
     mid: 0.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1263,7 +1263,7 @@ bins:
     min: null
     mid: 0.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1275,7 +1275,7 @@ bins:
     min: null
     mid: 1.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1287,7 +1287,7 @@ bins:
     min: null
     mid: 1.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1299,7 +1299,7 @@ bins:
     min: null
     mid: 1.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1311,7 +1311,7 @@ bins:
     min: null
     mid: 1.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1323,7 +1323,7 @@ bins:
     min: null
     mid: 1.45
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1335,7 +1335,7 @@ bins:
     min: null
     mid: 1.55
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1347,7 +1347,7 @@ bins:
     min: null
     mid: 1.65
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1359,7 +1359,7 @@ bins:
     min: null
     mid: 1.75
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1371,7 +1371,7 @@ bins:
     min: null
     mid: 1.85
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1383,7 +1383,7 @@ bins:
     min: null
     mid: 1.95
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1395,7 +1395,7 @@ bins:
     min: null
     mid: 2.05
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1407,7 +1407,7 @@ bins:
     min: null
     mid: 2.15
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1419,7 +1419,7 @@ bins:
     min: null
     mid: 2.25
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1431,7 +1431,7 @@ bins:
     min: null
     mid: 2.35
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 25600.0
     max: null
@@ -1443,7 +1443,7 @@ bins:
     min: null
     mid: 0.1
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1455,7 +1455,7 @@ bins:
     min: null
     mid: 0.3
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1467,7 +1467,7 @@ bins:
     min: null
     mid: 0.5
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1479,7 +1479,7 @@ bins:
     min: null
     mid: 0.7
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1491,7 +1491,7 @@ bins:
     min: null
     mid: 0.9
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1503,7 +1503,7 @@ bins:
     min: null
     mid: 1.1
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1515,7 +1515,7 @@ bins:
     min: null
     mid: 1.3
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1527,7 +1527,7 @@ bins:
     min: null
     mid: 1.5
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1539,7 +1539,7 @@ bins:
     min: null
     mid: 1.7
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1551,7 +1551,7 @@ bins:
     min: null
     mid: 1.9
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1563,7 +1563,7 @@ bins:
     min: null
     mid: 2.1
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
@@ -1575,7 +1575,7 @@ bins:
     min: null
     mid: 2.3
     max: null
-  M2:
+  m_Z2:
     min: null
     mid: 722500.0
     max: null
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/metadata.yaml
index 96111076c8..b60997f57b 100644
--- a/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0_7TEV_DIMUON/metadata.yaml
@@ -22,22 +22,22 @@ implemented_observables:
     description: "Double differential cross-section in pp collisions at 7 TeV"
     label: r"$d\sigma_{Z/\gamma^{*}}/dy$"
     units: "[fb]"
-  process_type: "EWK_RAP"
+  process_type: DY_Z_Y
   tables: [1]
   npoints: [132]
   ndata: 132
   plotting:
-    kinematics_override: ewk_rap_sqrt_scale
+    kinematics_override: identity
     dataset_label: "CMS Drell-Yan 2D 7 TeV 2011"
     plot_x: y
     figure_by:
-      - M2
+      - m_Z2
     y_label: '$d\sigma_{Z/\gamma^{*}}/dy$ (fb)'
-  kinematic_coverage: [y, M2, sqrts]
+  kinematic_coverage: [y, m_Z2, sqrts]
   kinematics:
     variables:
       y: {description: "Dimuon rapidity", label: '$y$', units: ""}
-      M2: {description: "Z boson Mass squared", label: "$M^2$", units: "$GeV^2$"}
+      m_Z2: {description: "Z boson Mass squared", label: "$M^2$", units: "$GeV^2$"}
       sqrts: {description: "Center of Mass Energy", label: '$\sqrt{s}$', units: "$GeV$"}
     file: kinematics.yaml
   data_central: data.yaml
diff --git a/validphys2/src/validphys/cuts/filters.yaml b/validphys2/src/validphys/cuts/filters.yaml
index eb685532fd..d5860acdf4 100644
--- a/validphys2/src/validphys/cuts/filters.yaml
+++ b/validphys2/src/validphys/cuts/filters.yaml
@@ -271,7 +271,7 @@
     thus the NLO calculation is unreliable.
   PTO: NNLO-
   local_variables:
-    M: sqrt(M2)
+    M: sqrt(m_Z2)
     max_M: 200.0
   rule: M <= max_M
 
@@ -279,7 +279,7 @@
   reason: Remove data points for which electroweak corrections are large.
   PTO: NNLO-
   local_variables:
-    M: sqrt(M2)
+    M: sqrt(m_Z2)
     min_M: 30.0
     max_rapidity: 2.2
   rule: M >= min_M and y <= max_rapidity
@@ -288,7 +288,7 @@
   reason: Remove data points for which electroweak corrections are large.
   PTO: NNLO+
   local_variables:
-    M: sqrt(M2)
+    M: sqrt(m_Z2)
     max_rapidity: 2.2
     max_M: 200.0
   rule: M <= max_M and y <= max_rapidity