Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -rafe332fec54d9d0432dfc0d54aef1debaa92b066 -r0b843faddee1416bfddb6f2589aedecf950c6df8
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 0b843faddee1416bfddb6f2589aedecf950c6df8)
@@ -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,31 +60,28 @@
 
         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
-        for ADV detector.
+        Handles published air bubbles data messages. Air bubble status and state are captured.
 
-        @param message:  published air bubbles data message as: ADV status, ADV state
+        @param message:  published air bubbles data message as: h18 bubble status, b18 bubble state
         @return: None
         """
 
-        adv_status = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        adv_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
+        self.h18_air_bubbles_status = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        self.h18_air_bubbles_state = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.air_bubbles_status = [adv_status[0]]
-        self.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:
+    def cmd_air_bubble_status_override(self, index: int, status: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the air bubble detector status override command
         Constraints:
@@ -106,9 +103,6 @@
                                               message_id=MsgIds.MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        if index == self.ADV:
-            self.logger.debug("Override air bubble detector ADV status value")
-
         # Send message
         received_message = self.can_interface.send(message)