Index: leahi_dialin/ro/modules/valves.py
===================================================================
diff -u -r549707cc285704a3300b0eb06af2c3397fddad4c -r3d49d3e02574445bfab69eea3b8c0ffa7d21f8e8
--- leahi_dialin/ro/modules/valves.py	(.../valves.py)	(revision 549707cc285704a3300b0eb06af2c3397fddad4c)
+++ leahi_dialin/ro/modules/valves.py	(.../valves.py)	(revision 3d49d3e02574445bfab69eea3b8c0ffa7d21f8e8)
@@ -40,13 +40,13 @@
 @unique
 class ROValveNames(DialinEnum):
     VWI = 0                                      # Valve (M4)
-    VFB = 1                                      # Valve (M7)
+    VROD = 1                                     # Valve (P39)
     VFF = 2                                      # Valve (P6)
     VPI  = 3                                     # Valve (P11)
-    VROD = 4                                     # Valve (P39)
+    VCR = 4                                      # Valve (P33)
     VCB = 5                                      # Valve (P34)
     VCD = 6                                      # Valve (P37)
-    VCR = 7                                      # Valve (P33)
+    VFB = 7                                      # Valve (M7)
 
 class ROValves(AbstractSubSystem):
     """
@@ -101,13 +101,13 @@
         """
         return [
             self.valve_state_VWI.get("state", None),
-            self.valve_state_VFB.get("state", None),
+            self.valve_state_VROD.get("state", None),
             self.valve_state_VFF.get("state", None),
             self.valve_state_VPI.get("state", None),
-            self.valve_state_VROD.get("state", None),
+            self.valve_state_VCR.get("state", None),
             self.valve_state_VCB.get("state", None),
             self.valve_state_VCD.get("state", None),
-            self.valve_state_VCR.get("state", None),
+            self.valve_state_VFB.get("state", None),
         ]
 
     @staticmethod
@@ -144,13 +144,13 @@
         "ro_valves_states_timestamp",
         "valve_states_all",
         "valve_state_VWI",
-        "valve_state_VFB",
+        "valve_state_VROD",
         "valve_state_VFF",
         "valve_state_VPI",
-        "valve_state_VROD",
+        "valve_state_VCR",
         "valve_state_VCB",
         "valve_state_VCD",
-        "valve_state_VCR",
+        "valve_state_VFB",
         "valve_states_enum"
     ])
     def _handler_valves_sync(self, message, timestamp=0.0):
@@ -164,13 +164,13 @@
         vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES]))
         # Extract each valve state from U16 valves states using bit-masking
         self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 1)
-        self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 2)
+        self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 2)
         self.valve_state_VFF["state"] = self._binary_to_valve_state(vst[0] & 8)
         self.valve_state_VPI["state"] = self._binary_to_valve_state(vst[0] & 16)
-        self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 32)
+        self.valve_state_VCR["state"] = self._binary_to_valve_state(vst[0] & 32)
         self.valve_state_VCB["state"] = self._binary_to_valve_state(vst[0] & 64)
         self.valve_state_VCD["state"] = self._binary_to_valve_state(vst[0] & 128)
-        self.valve_state_VCR["state"] = self._binary_to_valve_state(vst[0] & 256)
+        self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 256)
 
         start = self.END_POS_VALVES_STATES
         end = start + 1