Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -rd089b54d2fde7f8c36acce41a47d7acee4ef5da6 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision d089b54d2fde7f8c36acce41a47d7acee4ef5da6)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -23,8 +23,9 @@
 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 DenaliMessage, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -44,7 +45,7 @@
     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, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """