Index: leahi_dialin/dd/modules/drybicart.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -22,7 +22,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
@@ -35,18 +35,18 @@
     Dialysate Delivery (DD) Dialin API sub-class for Dry Bicart 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_DRY_BICART_DATA.value,
                                                                        function = self._handler_dry_bicart_sync)
 
@@ -111,7 +111,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_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name='DD Dry Bicart',
             logger=self.logger,
@@ -135,7 +135,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_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,
             entity_name='max fill cycle count',
             override_text=str(count),
@@ -159,7 +159,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_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,
             entity_name='Bicart Fill Request',
             override_text=str(start_stop),
@@ -183,7 +183,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_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST,
             entity_name='Bicarb Fill Request',
             override_text=str(start_stop),
@@ -207,7 +207,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_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,
             entity_name='Bicart Drain Request',
             override_text=str(start_stop),
@@ -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_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,
             entity_name='Bicart Cartridge Size',
             override_text=str(small_large),