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