Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.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, float_to_bytearray
@@ -40,16 +40,16 @@
     AIR_DETECTED_AT_LEVEL = 0
     FLUID_DETECTED_AT_LEVEL = 1
 
-    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_AIR_TRAP_DATA.value,
                                                                        function = self._handler_air_trap_sync)
 
@@ -134,7 +134,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_AIR_TRAP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'TD Air Trap',
             logger = self.logger,
@@ -161,7 +161,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_AIR_TRAP_LEVEL_OVERRIDE_REQUEST,
             entity_name = f'TD {sensor_name} Air Trap level sensor',
             override_text = f'{str(detected)}',
@@ -189,7 +189,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_AIR_TRAP_LEVEL_RAW_OVERRIDE_REQUEST,
             entity_name = f'TD {sensor_name} Air Trap level sensor raw',
             override_text = f'{str(detected)}',
@@ -214,7 +214,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_2_WAY_VALVE_SET_STATE_REQUEST,
             entity_name = f'TD Air Trap {valve_name} Valve state',
             override_text = f'{str(valve_state)}',
@@ -235,7 +235,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_SET_AIR_TRAP_CONTROL,
             entity_name = f'TD Air Trap control',
             override_text = f'{str(control)}',
@@ -261,7 +261,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_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST,
             entity_name = f'TD Air Pump Raise power',
             override_text = f'{str(power)}',
@@ -287,7 +287,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_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST,
             entity_name = f'TD Air Pump Lower power',
             override_text = f'{str(power)}',