Index: leahi_dialin/dd/modules/blood_leak.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -24,7 +24,7 @@
 from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 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.enums import DialinEnum
@@ -58,7 +58,7 @@
     BLOOD_LEAK_DETECTED = 0  # Blood detected
     NO_BLOOD_LEAK_DETECTED = 1  # No blood detected
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         @param can_interface: Leahi Can Messenger object
         """
@@ -67,11 +67,11 @@
         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_BLOOD_LEAK_DATA.value,
                                                                        function = self._handler_blood_leak_sync)
 
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_to_dialin_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_to_dialin_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value,
                                                                        function = self._handler_blood_leak_emb_mode_cmd_resp)
 
@@ -199,7 +199,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_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'DD Blood Leak',
             logger = self.logger,
@@ -223,7 +223,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_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST,
             entity_name = 'DD Blood Leak Detector state',
             override_text = str(detected),
@@ -242,7 +242,7 @@
         return cmd_generic_override(
             payload = None,
             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_BLOOD_LEAK_ZERO_REQUEST,
             entity_name = 'DD Blood Leak Zeroing',
             override_text = 'Active',
@@ -261,7 +261,7 @@
         return cmd_generic_override(
             payload = None,
             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_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST,
             entity_name = 'DD Blood Leak Embedded mode',
             override_text = 'Active',
@@ -294,7 +294,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_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST,
                 entity_name = f'DD {str(EmbModeCommands(command).name)} to the blood leak sensor',
                 override_text = 'Active',
@@ -322,7 +322,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_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST,
             entity_name = f'DD Blood Leak {EmbModeCommands(cmd).name}',
             override_text = str(value_to_override),
@@ -347,7 +347,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_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST,
             entity_name = 'DD Blood Leak Intensity Moving Average',
             override_text = str(value),
@@ -375,7 +375,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_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST,
             entity_name = f'DD Blood Leak Zeroing {text} interval',
             override_text = f'{str(value_mins)} minutes',