Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.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
@@ -34,7 +34,7 @@
         Treatment Device (TD) Dialin API sub-class for blood-flow related commands.
     """
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         TDBloodFlow constructor
         """
@@ -43,7 +43,7 @@
         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_BLOOD_PUMP_DATA.value,
                                                                        function = self._handler_blood_flow_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_BLOOD_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'TD Blood Flow',
             logger = self.logger,
@@ -128,7 +128,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_BLOOD_PUMP_SET_FLOW_RATE_REQUEST,
             entity_name = f'TD Blood Flow flow rate',
             override_text = f'{str(flow)} mL/min',
@@ -151,7 +151,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_BLOOD_PUMP_SET_SPEED_REQUEST,
             entity_name = f'TD Blood Flow RPM',
             override_text = f'{str(rpm)}',
@@ -176,7 +176,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_BLOOD_PUMP_MEASURED_FLOW_RATE_OVERRIDE_REQUEST,
             entity_name = f'TD Blood Flow measured flow rate',
             override_text = f'{str(flow)} mL/min',
@@ -202,7 +202,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_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST,
             entity_name = f'TD Blood Flow measured motor RPM',
             override_text = f'{str(spd)}',
@@ -228,7 +228,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_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST,
             entity_name = f'TD Blood Flow measured rotor RPM',
             override_text = f'{str(spd)}',
@@ -255,7 +255,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_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST,
             entity_name = f'TD Blood Flow rotor count',
             override_text = f'{str(rot_count)}',
@@ -274,7 +274,7 @@
         return cmd_generic_override(
             payload = None,
             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_HOME_BLOOD_PUMP_REQUEST,
             entity_name = f'TD Blood Flow homing',
             override_text = f'Active',
@@ -293,7 +293,7 @@
         return cmd_generic_override(
             payload = None,
             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_HARD_STOP_BLOOD_PUMP,
             entity_name = f'TD Blood Flow Pump hard stop',
             override_text = f'Active',
@@ -317,7 +317,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_BLOOD_FLOW_STROKE_VOLUME_OVERRIDE_REQUEST,
             entity_name='TD Blood Flow stroke volume',
             override_text=f'{volume}',
@@ -343,7 +343,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_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST,
             entity_name = f'TD Blood Flow wear A term',
             override_text = f'{str(a_term)}',
@@ -368,7 +368,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_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST,
             entity_name = f'TD Blood Flow wear B term',
             override_text = f'{str(b_term)}',