Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a -r1477c8a0fe85267e77005dd34ee2ed235d55a487
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
+++ firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 1477c8a0fe85267e77005dd34ee2ed235d55a487)
@@ -225,7 +225,7 @@
             bubblesSelfTestRequested[ bubble ] = FALSE;
             bubblesSelfTestStatus[ bubble ] = SELF_TEST_STATUS_IN_PROGRESS;
 
-            if ( BUBBLE_DETECTOR_ADV == bubble )
+            if ( H18_BBLD == bubble )
             {
                 setFPGAVenousBubbleSelfTest();
             }
@@ -261,7 +261,7 @@
             if ( BUBBLE_DETECTED == getBubbleDetectedState( bubble ) ) // Faked air bubble caused
             {
                 bubblesSelfTestStatus[ bubble ] = SELF_TEST_STATUS_PASSED;
-                if ( BUBBLE_DETECTOR_ADV == bubble )
+                if ( H18_BBLD == bubble )
                 {
                     clearFPGAVenousBubbleSelfTest();
                 }
@@ -305,8 +305,8 @@
     {
         BUBBLES_DATA_T bubbleData;
 
-        bubbleData.statusADV = (U32)getBubbleDetectedState( BUBBLE_DETECTOR_ADV );
-        bubbleData.stateADV  = (U32)bubblesState[ BUBBLE_DETECTOR_ADV ];
+        bubbleData.h18Status = (U32)getBubbleDetectedState( H18_BBLD );
+        bubbleData.h18State  = (U32)bubblesState[ H18_BBLD ];
         broadcastData( MSG_ID_TD_BUBBLES_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&bubbleData, sizeof( BUBBLES_DATA_T ) );
         bubblesDataPublicationTimerCounter = 0;
     }