Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r19fcbac01e5a6a6b79a3918975f5ae5abfa4c1ac -rc0dab4061e87009bbe7dd79731a3dffac8cce6ff
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 19fcbac01e5a6a6b79a3918975f5ae5abfa4c1ac)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision c0dab4061e87009bbe7dd79731a3dffac8cce6ff)
@@ -76,15 +76,15 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync)
 
         self.valve_states_all = 0x0000
-        self.m4_vwi_state= {"id": FPValveNames.M4_VWI.value, "state": DEENERGIZED}
-        self.p39_vrod_state = {"id": FPValveNames.P39_VROD.value, "state": DEENERGIZED}
-        self.p6_vff_state = {"id": FPValveNames.P6_VFF.value, "state": DEENERGIZED}
-        self.p11_vpi_state = {"id": FPValveNames.P11_VPI.value, "state": DEENERGIZED}
-        self.p33_vcr_state = {"id": FPValveNames.P33_VCR.value, "state": DEENERGIZED}
-        self.p34_vcb_state = {"id": FPValveNames.P34_VCB.value, "state": DEENERGIZED}
-        self.p37_vcd_state = {"id": FPValveNames.P37_VCD.value, "state": DEENERGIZED}
-        self.m7_vfb_state = {"id": FPValveNames.M7_VFB.value, "state": DEENERGIZED}
-        self.p20_spp_state = {"id": FPValveNames.P20_SPP.value, "state": DEENERGIZED}
+        self.m4_valv = {"id": FPValveNames.M4_VWI.value, "state": DEENERGIZED}
+        self.p39_valv = {"id": FPValveNames.P39_VROD.value, "state": DEENERGIZED}
+        self.p6_valv = {"id": FPValveNames.P6_VFF.value, "state": DEENERGIZED}
+        self.p11_valv = {"id": FPValveNames.P11_VPI.value, "state": DEENERGIZED}
+        self.p33_valv = {"id": FPValveNames.P33_VCR.value, "state": DEENERGIZED}
+        self.p34_valv = {"id": FPValveNames.P34_VCB.value, "state": DEENERGIZED}
+        self.p37_valv = {"id": FPValveNames.P37_VCD.value, "state": DEENERGIZED}
+        self.m7_valv = {"id": FPValveNames.M7_VFB.value, "state": DEENERGIZED}
+        self.p20_valv = {"id": FPValveNames.P20_SPP.value, "state": DEENERGIZED}
 
         # NOTE: The len function counts the enums with the same number only once. This is not the case in the DG valves
         # class because each valve must have a unique ID.
@@ -100,15 +100,15 @@
         @return: All valve states
         """
         return [
-            self.m4_vwi_state.get("state"),
-            self.p39_vrod_state.get("state"),
-            self.p6_vff_state.get("state"),
-            self.p11_vpi_state.get("state"),
-            self.p33_vcr_state.get("state"),
-            self.p34_vcb_state.get("state"),
-            self.p37_vcd_state.get("state"),
-            self.m7_vfb_state.get("state"),
-            self.p20_spp_state.get("state")
+            self.m4_valv.get("state"),
+            self.p39_valv.get("state"),
+            self.p6_valv.get("state"),
+            self.p11_valv.get("state"),
+            self.p33_valv.get("state"),
+            self.p34_valv.get("state"),
+            self.p37_valv.get("state"),
+            self.m7_valv.get("state"),
+            self.p20_valv.get("state")
         ]
 
     @staticmethod
@@ -144,15 +144,15 @@
     @publish([
         "fp_valves_states_timestamp",
         "valve_states_all",
-        "m4_vwi_state",
-        "p39_vrod_state",
-        "p6_vff_state",
-        "p11_vpi_state",
-        "p33_vcr_state",
-        "p34_vcb_state",
-        "p37_vcd_state",
-        "m7_vfb_state",
-        "p20_spp_state",
+        "m4_valv",
+        "p39_valv",
+        "p6_valv",
+        "p11_valv",
+        "p33_valv",
+        "p34_valv",
+        "p37_valv",
+        "m7_valv",
+        "p20_valv",
         "valve_states_enum"
     ])
     def _handler_valves_sync(self, message, timestamp=0.0):
@@ -166,15 +166,15 @@
         vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES]))
         self.valve_states_all = vst[0]
         # Extract each valve state from U16 valves states using bit-masking
-        self.m4_vwi_state["state"] = self._binary_to_valve_state(vst[0] & 1)
-        self.p39_vrod_state["state"] = self._binary_to_valve_state(vst[0] & 2)
-        self.p6_vff_state["state"] = self._binary_to_valve_state(vst[0] & 4)
-        self.p11_vpi_state["state"] = self._binary_to_valve_state(vst[0] & 8)
-        self.p33_vcr_state["state"] = self._binary_to_valve_state(vst[0] & 16)
-        self.p34_vcb_state["state"] = self._binary_to_valve_state(vst[0] & 32)
-        self.p37_vcd_state["state"] = self._binary_to_valve_state(vst[0] & 64)
-        self.m7_vfb_state["state"] = self._binary_to_valve_state(vst[0] & 128)
-        self.p20_spp_state["state"] = self._binary_to_valve_state(vst[0] & 256)
+        self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 1)
+        self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 2)
+        self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 4)
+        self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 8)
+        self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 16)
+        self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 32)
+        self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 64)
+        self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 128)
+        self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256)
 
         start = self.END_POS_VALVES_STATES
         end = start + 1