Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
@@ -76,9 +76,9 @@
     MSG_ID_TESTER_LOGIN_REQUEST,
     MSG_ID_TD_SOFTWARE_RESET_REQUEST,
     MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,
+    MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST,
-    MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST,
     MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST,
     MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
@@ -96,11 +96,11 @@
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
     &handleTesterLogInRequest,
-    &handleTDSoftwareResetRequest,
+    &testTDSoftwareResetRequest,
     &testBubbleDetectOverride,
+    &testBubblesDataPublishIntervalOverride,
     &testVoltageDataPublishIntervalOverride,
     &testVoltageOverride,
-    &testBubblesDataPublishIntervalOverride,
     &testPressureSensorOverride,
     &testSetAirPump,
     &testAirPumpDataPublishIntervalOverride,
@@ -539,15 +539,15 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTDSoftwareResetRequest function handles a request to reset the
+ * The testTDSoftwareResetRequest function handles a request to reset the
  * TD firmware processor.
  * @note If reset is successful, this function will not return.
  * @details \b Inputs: none
  * @details \b Outputs: TD processor soft reset if request is valid
  * @param message Pointer to the reset request message
  * @return FALSE if reset command rejected
  *************************************************************************/
-BOOL handleTDSoftwareResetRequest( MESSAGE_T *message )
+BOOL testTDSoftwareResetRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;