Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rd1377c677d8a9fc576f941f413ae3b6af6f50776
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision d1377c677d8a9fc576f941f413ae3b6af6f50776)
@@ -16,7 +16,7 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
@@ -25,15 +25,15 @@
 
 class TDBubbleDectector(AbstractSubSystem):
     """
-    TDAirBubbles
+    TDBubbleDectector
 
     Treatment Delivery (TD) Dialin API sub-class for air bubbles related commands.
     ADA: Air bubble Detector Arterial
     ADV: Air bubble Detector Venous
     """
 
     # Air bubble detectors
-    ADV = 0  # Air bubble Detector Venous
+    H18_ADV = 0  # Air bubble Detector Venous
 
     # Air bubble detectors status
     BUBBLE_DETECTED_STATUS = 0   # Air bubble detected
@@ -60,12 +60,12 @@
 
         self.td_air_bubbles_timestamp = 0.0
         # Initialize status of ADV air bubble detectors to fluid (no air bubble) detected
-        self.air_bubbles_status = [self.FLUID_DETECTED_STATUS]
+        self.h18_air_bubbles_status = [self.FLUID_DETECTED_STATUS]
 
         # Initialize state of ADV air bubble detectors state machine to normal
-        self.air_bubbles_state = [self.AIR_BUBBLE_NORMAL_STATE]
+        self.h18_air_bubbles_state = [self.AIR_BUBBLE_NORMAL_STATE]
 
-    @publish(["td_air_bubbles_timestamp", "air_bubbles_status", "air_bubbles_state"])
+    @publish(["td_air_bubbles_timestamp", "h18_air_bubbles_status", "h18_air_bubbles_state"])
     def _handler_air_bubbles_data_sync(self, message, timestamp=0.0):
         """
         Handles published air bubbles data messages. Air bubble status and state are captured
@@ -80,8 +80,8 @@
         adv_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
 
-        self.air_bubbles_status = [adv_status[0]]
-        self.air_bubbles_state = [adv_state[0]]
+        self.h18_air_bubbles_status = [adv_status[0]]
+        self.h18_air_bubbles_state = [adv_state[0]]
         self.td_air_bubbles_timestamp = timestamp
 
     def cmd_air_bubble_status_override(self, status: int, index: int, reset: int = NO_RESET) -> int: