Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r956757fac807b52aec078e84127089db5dff069f -r6ffa85d20aa8cd0d8c21e89283eb07035df46bc2
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 956757fac807b52aec078e84127089db5dff069f)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 6ffa85d20aa8cd0d8c21e89283eb07035df46bc2)
@@ -60,7 +60,7 @@
                                                                        self._handler_air_bubbles_data_sync)
 
         self.td_air_bubbles_timestamp = 0.0
-        self.h18_pump = {
+        self.h18_bubble_detector = {
             TDAirBubbleDetectorNames.H18_ADV.name: {
                 # Initialize status of ADV air bubble detectors to fluid (no air bubble) detected
                 TDAirBubbleDetectorAttributes.STATUS.name: self.FLUID_DETECTED_STATUS,
@@ -69,7 +69,7 @@
             }
         }
 
-    @publish(["td_air_bubbles_timestamp", "h18_pump"])
+    @publish(["td_air_bubbles_timestamp", "h18_bubble_detector"])
     def _handler_air_bubbles_data_sync(self, message, timestamp=0.0):
         """
         Handles published air bubbles data messages. Air bubble status and state are captured.
@@ -78,10 +78,10 @@
         @return: None
         """
 
-        self.h18_pump[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATUS.name] = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.h18_pump[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATE.name] = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
+        self.h18_bubble_detector[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATUS.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
+        self.h18_bubble_detector[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATE.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
 
         self.td_air_bubbles_timestamp = timestamp