Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r158c9ecf7ed2404a53b387bfc3f9202a25d7c0ee -r757fb5decc17b09e50869877d1bb111ba01d67e3
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 158c9ecf7ed2404a53b387bfc3f9202a25d7c0ee)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 757fb5decc17b09e50869877d1bb111ba01d67e3)
@@ -431,7 +431,7 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetBubblesStatusOverride function overrides the status
+ * The testSetBubbleStatusOverride function overrides the status
  * of a given air bubble detector.
  * @details Inputs: none
  * @details Outputs: bubblesStatus
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6a690d6e8c05de2de703d9f2f07176821e5eb6b0 -r757fb5decc17b09e50869877d1bb111ba01d67e3
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6a690d6e8c05de2de703d9f2f07176821e5eb6b0)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 757fb5decc17b09e50869877d1bb111ba01d67e3)
@@ -1543,11 +1543,11 @@
                 handleSetBubblesDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BUBBLES_STATUS_OVERRIDE:
+            case MSG_ID_HD_BUBBLE_STATUS_OVERRIDE:
                 handleSetBubblesStatusOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST:
+            case MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST:
                 handleBubbleSelfTestRequest( message );
                 break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6a690d6e8c05de2de703d9f2f07176821e5eb6b0 -r757fb5decc17b09e50869877d1bb111ba01d67e3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6a690d6e8c05de2de703d9f2f07176821e5eb6b0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 757fb5decc17b09e50869877d1bb111ba01d67e3)
@@ -4987,14 +4987,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetBubblesStatusOverrideRequest function handles a request to
- * override the air bubble detectors status.
+ * The handleSetBubbleStatusOverrideRequest function handles a request to
+ * override a given air bubble detector status.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetBubblesStatusOverrideRequest( MESSAGE_T *message )
+void handleSetBubbleStatusOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6a690d6e8c05de2de703d9f2f07176821e5eb6b0 -r757fb5decc17b09e50869877d1bb111ba01d67e3
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6a690d6e8c05de2de703d9f2f07176821e5eb6b0)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 757fb5decc17b09e50869877d1bb111ba01d67e3)
@@ -570,10 +570,10 @@
 // MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE
 void handleSetBubblesDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_BUBBLES_STATUS_OVERRIDE
-void handleSetBubblesStatusOverrideRequest( MESSAGE_T *message );
+// MSG_ID_HD_BUBBLE_STATUS_OVERRIDE
+void handleSetBubbleStatusOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST
+// MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST
 void handleBubbleSelfTestRequest( MESSAGE_T *message );
 
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD