Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_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
@@ -34,17 +34,17 @@
         Dialin API sub-class for concentrate 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_DD_CONCENTRATE_PUMP_DATA.value,
                                                                        function = self._handler_concentrate_pumps_sync)
 
@@ -144,7 +144,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_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'DD Concentrate Pump',
             logger = self.logger,
@@ -167,7 +167,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_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump target speed',
             override_text = str(speed),
@@ -192,7 +192,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_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump measured speed',
             override_text = str(speed),
@@ -217,7 +217,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_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump parked status',
             override_text = str(status),
@@ -242,7 +242,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_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump parked fault state',
             override_text = str(status),
@@ -262,7 +262,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_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump to zeroing',
             override_text = 'Active',
@@ -289,7 +289,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_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST,
             entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump speed',
             override_text = str(spd),