Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -23,7 +23,7 @@
 from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
@@ -36,17 +36,17 @@
     Dialysate Delivery (DD) Dialin API sub-class for dialysate pumps related commands.
     """
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    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
         self.logger = logger
 
         if self.can_interface is not None:
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value,
                                                                        function = self._handler_dialysate_pumps_sync)
 
@@ -132,7 +132,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'DD Dialysate Pump',
             logger = self.logger,
@@ -156,7 +156,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump target speed',
             override_text = str(speed),
@@ -181,7 +181,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump measured speed',
             override_text = str(speed),
@@ -206,7 +206,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_TARGET_PRESSURE_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump target pressure',
             override_text = str(pressure),
@@ -231,7 +231,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_CURRENT_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump measured current',
             override_text = str(current),
@@ -256,7 +256,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_DIRECTION_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump measured direction',
             override_text = str(direction),
@@ -282,7 +282,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump start & stop',
             override_text = str(cmd),