Index: leahi_dialin/dd/modules/substitution_pump.py
===================================================================
diff -u -r7867a1799d96a5803a80c1914b30e34d6a9ee8b7 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 7867a1799d96a5803a80c1914b30e34d6a9ee8b7)
+++ leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -39,7 +39,7 @@
 
     def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
-        @param can_interface: Denali Can Messenger object
+        @param can_interface: Can Messenger object
         """
         super().__init__()
 
Index: leahi_dialin/dd/proxies/td_proxy.py
===================================================================
diff -u -re48e2e9af260dc96a407bf4a26f4a18713318ae6 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision e48e2e9af260dc96a407bf4a26f4a18713318ae6)
+++ leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -174,7 +174,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.dialin_to_dd_ch_id,
+                             channel_id = CanChannels.dialin_to_dd_ch_id,
                              msg_id = MsgIds.MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST,
                              entity_name = f'DD treatment parameter override: id={paramID}, value={value}, reset={reset}',
                              override_text = 'N/A',
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -261,7 +261,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = 0,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST,
             entity_name = f'FP Recovery Valve set',
             override_text = str(recovery_state),
Index: leahi_dialin/td/modules/syringe_pump.py
===================================================================
diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
+++ leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -36,7 +36,7 @@
     def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
 
-        @param can_interface: Denali Can Messenger object
+        @param can_interface: Can Messenger object
         """
         super().__init__()
         self.can_interface = can_interface
Index: leahi_dialin/ui/fp_messaging.py
===================================================================
diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
+++ leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -322,8 +322,8 @@
         payload += conversions.float_to_bytearray(avgRORejectionRatioTankFill  )
         payload += conversions.unsigned_integer_to_bytearray(genPermeateState             )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_DATA.value,
                                             payload=payload)
 
Index: leahi_dialin/ui/td_messaging.py
===================================================================
diff -u -r7e864b8d034f7a5cb961402d4f6672b180a57bb5 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision 7e864b8d034f7a5cb961402d4f6672b180a57bb5)
+++ leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -580,8 +580,8 @@
         payload =  conversions.unsigned_integer_to_bytearray    (valve      )
         payload += conversions.unsigned_integer_to_bytearray    (timeout    )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_DATA.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -600,8 +600,8 @@
         payload += conversions.integer_to_bytearray (vRejectionReason)
         payload += conversions.float_to_bytearray   (vValue          )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1587,8 +1587,8 @@
         payload += conversions.integer_to_bytearray(vVenousAsymmetricRejectReason   )
         payload += conversions.integer_to_bytearray(vTmpWindowRejectReason          )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1623,8 +1623,8 @@
         payload += conversions.integer_to_bytearray(vSodiumRejectReason                 )
         payload += conversions.integer_to_bytearray(vBicarbonateRejectReason            )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1640,8 +1640,8 @@
         payload  = conversions.integer_to_bytearray(vAccepted)
         payload += conversions.integer_to_bytearray(vRejectionReason)
     
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1803,8 +1803,8 @@
         payload  += conversions.float_to_bytearray( vIsoUfRateTarget                                 )
         payload  += conversions.float_to_bytearray( vWaterSampleTestResult                           )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_to_ui_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)