Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 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.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, 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
 
 
@@ -43,7 +44,7 @@
     AIR_BUBBLE_NORMAL_STATE = 0      # Normal state
     AIR_BUBBLE_SELF_TEST_STATE = 1   # Self-test state
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """