Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/td/modules/valves.py	(.../valves.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
@@ -34,19 +34,19 @@
         Treatment Delivery (TD) Dialin API sub-class for valves related commands.
     """
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         TDValves constructor
 
-        @param can_interface: (DenaliCanMessenger) - Denali CAN messenger object.
+        @param can_interface: (CanMessenger) - Can Messenger object.
         @param logger: (Logger) - Dialin logger
         """
         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_VALVES_DATA.value,
                                                                        function = self._handler_valves_sync)
 
@@ -106,7 +106,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_VALVES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'TD Valves',
             logger = self.logger,
@@ -130,7 +130,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_PINCH_VALVE_SET_POSITION_REQUEST,
             entity_name = f'TD {valve_name} Valve position',
             override_text = str(position),
@@ -156,7 +156,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_PINCH_VALVE_HOME_REQUEST,
             entity_name = f'TD {valve_name} Valve homing',
             override_text = 'Forcefully' if force_home == 1 else 'Normally',
@@ -182,7 +182,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_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,
             entity_name = f'TD {valve_name} Valve position',
             override_text = f'move by {str(position_count)}',
@@ -208,7 +208,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_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,
             entity_name = f'TD {valve_name} Valve status',
             override_text = str(status),
@@ -233,7 +233,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_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,
             entity_name = f'TD {valve_name} Valve encoder position offset',
             override_text = str(counts),