Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -r0c8ae7b952186d912c77d8c2cfb7dad809fa5225 -r1477c8a0fe85267e77005dd34ee2ed235d55a487
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 0c8ae7b952186d912c77d8c2cfb7dad809fa5225)
+++ 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;
     }
@@ -330,33 +330,8 @@
  *************************************************************************/
 BOOL testBubblesDataPublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL                    result = FALSE;
-    TEST_OVERRIDE_PAYLOAD_T override;
-    OVERRIDE_TYPE_T         ovType = getOverridePayloadFromMessage( message, &override );
+    BOOL result = u32BroadcastIntervalOverride( message, &bubblesDataPublishInterval, TASK_PRIORITY_INTERVAL );
 
-    // Verify tester has logged in with TD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        if ( OVERRIDE_OVERRIDE == ovType )
-        {
-            U32 value = override.state.u32;
-            U32 intvl = value / TASK_PRIORITY_INTERVAL;
-
-            if ( intvl > 0 )
-            {
-                result = TRUE;
-                bubblesDataPublishInterval.ovData = intvl;
-                bubblesDataPublishInterval.override = OVERRIDE_KEY;
-            }
-        }
-        else
-        {
-            result = TRUE;
-            bubblesDataPublishInterval.override = OVERRIDE_RESET;
-            bubblesDataPublishInterval.ovData = bubblesDataPublishInterval.ovInitData;
-        }
-    }
-
     return result;
 }