Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -26,7 +26,7 @@
 from leahi_dialin.common.fp_defs import BETA_IOFP_VALVE_OFFSET
 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.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, 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
@@ -43,21 +43,21 @@
     """
 
     # Valves states publish message field positions
-    START_IO_VALVES_STATES = DenaliMessage.PAYLOAD_START_INDEX
+    START_IO_VALVES_STATES = CanMessage.PAYLOAD_START_INDEX
     END_IO_VALVES_STATES = START_IO_VALVES_STATES + 1  # IO Valves States come in as a U08 value (1 byte)
     START_FP_VALVES_STATES = END_IO_VALVES_STATES
     END_FP_VALVES_STATES = START_FP_VALVES_STATES + 1  # FP Valves States come in as a U08 value (1 byte)
 
-    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.fp_sync_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value,
                                                                        function = self._handler_valves_sync)
 
@@ -177,7 +177,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'FP Valves',
             logger = self.logger,
@@ -205,7 +205,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST,
             entity_name = f'FP {valve_name} Valve sensed state',
             override_text = str(state),
@@ -234,7 +234,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST,
             entity_name = f'FP {valve_name} Valve state',
             override_text = str(state),