Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -rf3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision f3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa)
+++ firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -225,7 +225,7 @@
             bubblesSelfTestRequested[ bubble ] = FALSE;
             bubblesSelfTestStatus[ bubble ] = SELF_TEST_STATUS_IN_PROGRESS;
 
-            if ( H18 == 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 ( H18 == bubble )
+                if ( H18_BBLD == bubble )
                 {
                     clearFPGAVenousBubbleSelfTest();
                 }
@@ -305,8 +305,8 @@
     {
         BUBBLES_DATA_T bubbleData;
 
-        bubbleData.statusH18 = (U32)getBubbleDetectedState( H18 );
-        bubbleData.stateH18  = (U32)bubblesState[ H18 ];
+        bubbleData.statusH18 = (U32)getBubbleDetectedState( H18_BBLD );
+        bubbleData.stateH18  = (U32)bubblesState[ H18_BBLD ];
         broadcastData( MSG_ID_TD_BUBBLES_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&bubbleData, sizeof( BUBBLES_DATA_T ) );
         bubblesDataPublicationTimerCounter = 0;
     }