Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -r9434135f30fdd9d073685bf5088bb5c58542c624
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9466b5c6b5867f392104a42608aa9542a7ff0358)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9434135f30fdd9d073685bf5088bb5c58542c624)
@@ -39,20 +39,20 @@
 
 @unique
 class DDValveNames(DialinEnum):
-    D14_VALV = 0                                  # Valve Hydraulics Outlet (D14)
-    D52_VALV = 1                                  # Valve Thermal Disinfect (D52)
-    D8_VALV = 2                                   # Valve Hydraulics Bypass (D8)
-    D54_VALV  = 3                                 # Valve Rinse Port (D54)
-    D53_VALV = 4                                  # Valve Drain (D53)
-    D65_VALV = 5                                 # Valve DryBcarb Inlet (D65)
-    D64_VALV = 6                                  # Valve Purge 1 (D64)
-    D31_VALV = 7                                  # Valve Pressure Test (D31)
-    D34_VALV = 8                                 # Valve Dialyzer Bypass (D34)
-    D35_VALV = 9                                  # Valve Dialyzer Inlet (D35)
-    D40_VALV = 10                                 # Valve Dialyzer Outlet (D40)
-    D47_VALV = 11                                 # Valve Dialysate Out Purge 2 (D47)
-    D3_VALV = 12                                  # Valve Hydraulics Inlet (D3)
-    M4_VALV = 13                                  # Valve Water Inlet (M4)
+    D14_VALV = 0                                 # Valve Hydraulics Outlet (D14)
+    D52_VALV = 1                                 # Valve Thermal Disinfect (D52)
+    D8_VALV = 2                                  # Valve Hydraulics Bypass (D8)
+    D54_VALV  = 3                                # Valve Rinse Port (D54)
+    D53_VALV = 4                                 # Valve Drain (D53)
+    D34_VALV = 5                                 # Valve Dialyzer Bypass (D34)
+    D64_VALV = 6                                 # Valve Purge 1 (D64)
+    D31_VALV = 7                                 # Valve Pressure Test (D31)
+    D65_VALV = 8                                 # Valve DryBcarb Inlet (D65)
+    D35_VALV = 9                                 # Valve Dialyzer Inlet (D35)
+    D40_VALV = 10                                # Valve Dialyzer Outlet (D40)
+    D47_VALV = 11                                # Valve Dialysate Out Purge 2 (D47)
+    D3_VALV = 12                                 # Valve Hydraulics Inlet (D3)
+    M4_VALV = 13                                 # Valve Water Inlet (M4)
     RSRVD_SPACE1 = 14                            # This space has been reserved
     RSRVD_SPACE2 = 15                            # This space has been reserved
     D23_VALV = 16                                # Balancing chamber Valve 1 (D23)
@@ -93,7 +93,7 @@
         self.can_interface = can_interface
         self.logger = logger
         self.valves_sensed_states = OrderedDict()
-        self.dg_valves_states_timestamp = 0.0
+        self.dd_valves_states_timestamp = 0.0
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
@@ -128,9 +128,9 @@
         self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED}
 
         self.d69_valv = {"id": DDValveNames.D69_VALV.value, "state": DEENERGIZED}
-        self.d69_valv = {"id": DDValveNames.D71_VALV.value, "state": DEENERGIZED}
-        self.d70_valv = {"id": DDValveNames.D70_UFO1.value, "state": DEENERGIZED}
-        self.d72_valv = {"id": DDValveNames.D70_VALV.value, "state": DEENERGIZED}
+        self.d71_valv = {"id": DDValveNames.D71_VALV.value, "state": DEENERGIZED}
+        self.d70_valv = {"id": DDValveNames.D70_VALV.value, "state": DEENERGIZED}
+        self.d72_valv = {"id": DDValveNames.D72_VALV.value, "state": DEENERGIZED}
 
 
         # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves
@@ -258,10 +258,10 @@
         self.d8_valv["state"] = self._binary_to_valve_state(vst[0] & 4)
         self.d54_valv["state"] = self._binary_to_valve_state(vst[0] & 8)
         self.d53_valv["state"] = self._binary_to_valve_state(vst[0] & 16)
-        self.d65_valv["state"] = self._binary_to_valve_state(vst[0] & 32)
+        self.d34_valv["state"] = self._binary_to_valve_state(vst[0] & 32)
         self.d64_valv["state"] = self._binary_to_valve_state(vst[0] & 64)
         self.d31_valv["state"] = self._binary_to_valve_state(vst[0] & 128)
-        self.d34_valv["state"] = self._binary_to_valve_state(vst[0] & 256)
+        self.d65_valv["state"] = self._binary_to_valve_state(vst[0] & 256)
         self.d35_valv["state"] = self._binary_to_valve_state(vst[0] & 512)
         self.d40_valv["state"] = self._binary_to_valve_state(vst[0] & 1024)
         self.d47_valv["state"] = self._binary_to_valve_state(vst[0] & 2048)
@@ -294,7 +294,7 @@
             start = end
             end += 1
 
-        self.dg_valves_states_timestamp = timestamp
+        self.dd_valves_states_timestamp = timestamp
 
     def cmd_valve_sensed_state_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int:
         """
@@ -376,10 +376,10 @@
         @param bcv1:  bool - valve state for D23_VALV (true=open, false=closed)
         @param bcv2:  bool - valve state for D19_VALV (true=open, false=closed)
         @param bcv3:  bool - valve state for D25_VALV (true=open, false=closed)
-        @param bcv4:  bool - valve state for D26_VALV (true=open, false=closed)
+        @param bcv4:  bool - valve state for D21_VALV (true=open, false=closed)
         @param bcv5:  bool - valve state for D24_VALV (true=open, false=closed)
         @param bcv6:  bool - valve state for D20_VALV (true=open, false=closed)
-        @param bcv7:  bool - valve state for D21_VALV (true=open, false=closed)
+        @param bcv7:  bool - valve state for D26_VALV (true=open, false=closed)
         @param bcv8:  bool - valve state for D22_VALV (true=open, false=closed)
         @return: 1 if successful, zero otherwise
         """