Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0126254993a6cc5023632330f59cb05daf485ebe -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0126254993a6cc5023632330f59cb05daf485ebe)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -65,37 +65,37 @@
 
 /// Message handling function lookup table
 static const MSG_HANDLER_LOOKUP_T MSG_FUNCTION_HANDLER_LOOKUP[] = {
-{  MSG_ID_RO_TESTER_LOGIN_REQUEST,                                 &handleTesterLogInRequest },
-{  MSG_ID_RO_SOFTWARE_RESET_REQUEST,                               &handleROSoftwareResetRequest },
-{  MSG_ID_RO_SEND_TEST_CONFIGURATION,                              &handleROTestConfiguration },
-{  MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testValvesStatesPublishIntervalOverride },
-{  MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST,                     &testValveStateOverride },
-{  MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                  &testValveSensedStateOverride },
-{  MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST,                           &testSetFluidPumpPWM },
-{  MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST,                 &testFluidPumpPWMOverride },
-{  MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST,                    &testFluidPumpRPMOverride },
-{  MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,        &testROPumpDataPublishIntervalOverride },
-{  MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST,                            &testPressureSensorReadingsOverride },
-{  MSG_ID_RO_PRESSURE_TEMP_OVERRIDE_REQUEST,                       &testPressureSensorTemperatureReadingsOverride },
-{  MSG_ID_RO_PRESSURE_READ_COUNT_OVERRIDE_REQUEST,                 &testPressureSensorReadCounterOverride },
-{  MSG_ID_RO_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST,                &testPressureSensorErrorCounterOverride },
-{  MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,           &testPressureSensorDataPublishIntervalOverride },
-{  MSG_ID_RO_DEBUG_EVENT,                                          &handleUnhandledMsg },
-{  MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testLevelsDataPublishIntervalOverride },
-{  MSG_ID_RO_LEVEL_OVERRIDE_REQUEST,                               &testLevelStateOverride },
-{  MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testFlowSensorDataPublishIntervalOverride },
-{  MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST,                           &testFlowSensorReadingsOverride },
-{  MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST,                           &testFlowSensorTemperatureReadingsOverride },
-{  MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST,                  &testFlowSensorFilteredReadingsOverride },
-{  MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST,                  &testFlowSensorFilteredTemperatureReadingsOverride },
-{  MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,       &testConductivitySensorDataPublishIntervalOverride },
-{  MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST,                        &testConductivitySensorReadingsOverride },
-{  MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureReadingsOverride },
-{  MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,             &testConductivitySensorReadCounterOverride },
-{  MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,            &testConductivitySensorErrorCounterOverride },
-{  MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST,                         &testMeasuredTemperatureOverride },
-{  MSG_ID_DD_RO_START_STOP_CMD_REQUEST,                            &handleGenerateWaterRequestMsg },
-{  MSG_ID_RO_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,            &testPreGenWaterDataPublishIntervalOverride },
+{  MSG_ID_FP_TESTER_LOGIN_REQUEST,                                 &handleTesterLogInRequest },
+{  MSG_ID_FP_SOFTWARE_RESET_REQUEST,                               &handleROSoftwareResetRequest },
+{  MSG_ID_FP_SEND_TEST_CONFIGURATION,                              &handleROTestConfiguration },
+{  MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testValvesStatesPublishIntervalOverride },
+{  MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST,                     &testValveStateOverride },
+{  MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                  &testValveSensedStateOverride },
+{  MSG_ID_FP_BOOST_PUMP_SET_PWM_REQUEST,                           &testSetFluidPumpPWM },
+{  MSG_ID_FP_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST,                 &testFluidPumpPWMOverride },
+{  MSG_ID_FP_BOOST_PUMP_SPEED_OVERRIDE_REQUEST,                    &testFluidPumpRPMOverride },
+{  MSG_ID_FP_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,        &testROPumpDataPublishIntervalOverride },
+{  MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST,                            &testPressureSensorReadingsOverride },
+{  MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST,                       &testPressureSensorTemperatureReadingsOverride },
+{  MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST,                 &testPressureSensorReadCounterOverride },
+{  MSG_ID_FP_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST,                &testPressureSensorErrorCounterOverride },
+{  MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,           &testPressureSensorDataPublishIntervalOverride },
+{  MSG_ID_FP_DEBUG_EVENT,                                          &handleUnhandledMsg },
+{  MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testLevelsDataPublishIntervalOverride },
+{  MSG_ID_FP_LEVEL_OVERRIDE_REQUEST,                               &testLevelStateOverride },
+{  MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testFlowSensorDataPublishIntervalOverride },
+{  MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST,                           &testFlowSensorReadingsOverride },
+{  MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST,                           &testFlowSensorTemperatureReadingsOverride },
+{  MSG_ID_FP_FILTERED_FLOW_RATE_OVERRIDE_REQUEST,                  &testFlowSensorFilteredReadingsOverride },
+{  MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST,                  &testFlowSensorFilteredTemperatureReadingsOverride },
+{  MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,       &testConductivitySensorDataPublishIntervalOverride },
+{  MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                        &testConductivitySensorReadingsOverride },
+{  MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureReadingsOverride },
+{  MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,             &testConductivitySensorReadCounterOverride },
+{  MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,            &testConductivitySensorErrorCounterOverride },
+{  MSG_ID_FP_TEMPERATURE_OVERRIDE_REQUEST,                         &testMeasuredTemperatureOverride },
+{  MSG_ID_DD_FP_START_STOP_CMD_REQUEST,                            &handleGenerateWaterRequestMsg },
+{  MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,            &testPreGenWaterDataPublishIntervalOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
@@ -296,7 +296,7 @@
 
     // if Dialin message, ensure Dialin is logged in before processing it
     if ( ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE ) ||
-         ( MSG_ID_RO_TESTER_LOGIN_REQUEST == message->hdr.msgID ) ||
+         ( MSG_ID_FP_TESTER_LOGIN_REQUEST == message->hdr.msgID ) ||
          ( TRUE == isTestingActivated() ) )
     {
         MsgFuncPtr msgFuncPtr;
@@ -468,7 +468,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID      = MSG_ID_RO_EVENT;
+    msg.hdr.msgID      = MSG_ID_FP_EVENT;
     msg.hdr.payloadLen = sizeof( EVENT_PAYLOAD_T );
 
     memcpy( &msg.payload, &eventStruct, sizeof( EVENT_PAYLOAD_T ) );