Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r5beeab40fa50e1363f012d9b9d4c0e35d75edaa4 -rfbfcdaf15d99c9cfd088a9073c1c8b670fe08fce
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 5beeab40fa50e1363f012d9b9d4c0e35d75edaa4)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision fbfcdaf15d99c9cfd088a9073c1c8b670fe08fce)
@@ -40,13 +40,13 @@
 @unique
 class FPValveNames(DialinEnum):
     M4_VALV = 0                             # Valve (M4 VWi)
-    M7_VALV = 1                             # Valve (M7)
+    P39_VALV = 1                            # Valve (P39 VROd)
     P6_VALV = 2                             # Valve (P6 VFF)
     P11_VALV = 3                            # Valve (P11 VPi)
     P33_VALV = 4                            # Valve (P33 VCr)
     P34_VALV = 5                            # Valve (P34 VCb)
     P37_VALV = 6                            # Valve (P37 VCd)
-    P39_VALV = 7                            # Valve (P39 VROd)
+    M7_VALV = 7                             # Valve (M7)
     P20_VALV = 8                            # Valve (P20)
     P43_VALV = 9                            # Valve (P43)
     NUM_OF_VALVES = 10                      # Number of valves
@@ -103,13 +103,13 @@
         """
         return [
             self.m4_valv.get("state"),
-            self.m7_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.p39_valv.get("state"),
+            self.m7_valv.get("state"),
             self.p20_valv.get("state"),
             self.p43_valv.get("state")
         ]
@@ -171,13 +171,13 @@
         self.valve_states_all = vst[0]
         # Extract each valve state from U16 valves states using bit-masking
         self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 1)
-        self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 2)
+        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.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 128)
+        self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 128)
         self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256)
         self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 512)