Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r62640bb1dfcb4279d31719ca933c3ce69bfb46be -reb312be9dab95907142103419bc1804713789e8d
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 62640bb1dfcb4279d31719ca933c3ce69bfb46be)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision eb312be9dab95907142103419bc1804713789e8d)
@@ -90,11 +90,11 @@
         self.d26_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED}
         self.d22_valv = {"id": dd_enum_repository.DDValveNames.D22_VALV.value, "state": DEENERGIZED}
 
-        self.d79_pmp_valv = {"id": dd_enum_repository.DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED}
+        self.d88_d79_valv = {"id": dd_enum_repository.DDValveNames.D88_D79_VALV.value, "state": DEENERGIZED}
         self.d83_valv = {"id": dd_enum_repository.DDValveNames.D83_VALV.value, "state": DEENERGIZED}
         self.d91_valv = {"id": dd_enum_repository.DDValveNames.D91_VALV.value, "state": DEENERGIZED}
-        self.spare3_valv = {"id": dd_enum_repository.DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED}
-        self.spare4_valv = {"id": dd_enum_repository.DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED}
+        self.d104_valv = {"id": dd_enum_repository.DDValveNames.D104_VALV.value, "state": DEENERGIZED}
+        self.d95_valv = {"id": dd_enum_repository.DDValveNames.D95_VALV.value, "state": DEENERGIZED}
         self.spare5_valv = {"id": dd_enum_repository.DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED}
         self.d100_valv = {"id": dd_enum_repository.DDValveNames.D100_VALV.value, "state": DEENERGIZED}
         self.spare7_valv = {"id": dd_enum_repository.DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED}
@@ -140,11 +140,11 @@
             self.d26_valv.get("state", None),
             self.d22_valv.get("state", None),
 
-            self.d79_pmp_valv.get("state", None),
+            self.d88_d79_valv.get("state", None),
             self.d83_valv.get("state", None),
             self.d91_valv.get("state", None),
-            self.spare3_valv.get("state", None),
-            self.spare4_valv.get("state", None),
+            self.d104_valv.get("state", None),
+            self.d95_valv.get("state", None),
             self.spare5_valv.get("state", None),
             self.d100_valv.get("state", None),
             self.spare7_valv.get("state", None)
@@ -207,13 +207,13 @@
         "d20_valv",
         "d26_valv",
         "d22_valv",
-        "d79_pmp_valv",
-        "D83_valv",
-        "D91_valv",
-        "spare3_valv",
-        "spare4_valv",
+        "d88_d79_valv",
+        "d83_valv",
+        "d91_valv",
+        "d104_valv",
+        "d95_valv",
         "spare5_valv",
-        "D100_valv",
+        "d100_valv",
         "spare7_valv",
         "valve_states_enum",
         "valves_sensed_states",
@@ -259,11 +259,11 @@
         self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128)
 
         spv = struct.unpack('B', bytearray(message['message'][self.START_POS_SPARE_VALVES_STATES:self.END_POS_SPARE_VALVES_STATES]))
-        self.d79_pmp_valv["state"] = self._binary_to_valve_state(spv[0] & 1)
+        self.d88_d79_valv["state"] = self._binary_to_valve_state(spv[0] & 1)
         self.d83_valv["state"] = self._binary_to_valve_state(spv[0] & 2)
         self.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 4)
-        self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 8)
-        self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 16)
+        self.d104_valv["state"] = self._binary_to_valve_state(spv[0] & 8)
+        self.d95_valv["state"] = self._binary_to_valve_state(spv[0] & 16)
         self.spare5_valv["state"] = self._binary_to_valve_state(spv[0] & 32)
         self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64)
         self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128)