Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -23,7 +23,7 @@
 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.common import td_enum_repository
-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
@@ -46,16 +46,16 @@
     AIR_BUBBLE_NORMAL_STATE = 0      # Normal state
     AIR_BUBBLE_SELF_TEST_STATE = 1   # Self-test state
 
-    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.td_sync_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_TD_BUBBLES_DATA.value,
                                                                        function = self._handler_air_bubbles_data_sync)
 
@@ -104,7 +104,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'TD Air Bubble Detector',
             logger = self.logger,
@@ -132,7 +132,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,
             entity_name = f'TD {sensor_name} Bubble Detector status',
             override_text = f'{str(status)}',
@@ -154,7 +154,7 @@
         return cmd_generic_override(
             payload=payload,
             reset=NO_RESET,
-            channel_id=DenaliChannels.dialin_to_td_ch_id,
+            channel_id=CanChannels.dialin_to_td_ch_id,
             msg_id=MsgIds.MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,
             entity_name='TD Enable Venous Bubble Alarm',
             override_text=f'{ena}',