Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r653d8e860cd6038af533e2fe222a9a938f585a52 -rff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 653d8e860cd6038af533e2fe222a9a938f585a52)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision ff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371)
@@ -143,7 +143,7 @@
     { MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST,                                &testHeaterStartStopOverride },
     { MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,                           &testValveOpenCloseStateOverride },
     { MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA,                                         &handleDialysateDeliveryRequestMsg },
-    { MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testROCommunicationStatusOverride },
+    { MSD_ID_DD_FP_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testROCommunicationStatusOverride },
     { MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDBalChamberDataPublishIntervalOverride },
     { MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST,                           &testBalChamberSwFreqOverride },
     { MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST,                         &testDialDeliveryInProgressOverride },
Index: firmware/App/Services/ROInterface.c
===================================================================
diff -u -rd1527b612b7af4bd3103743b5a61ecad3a133ac0 -rff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371
--- firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision d1527b612b7af4bd3103743b5a61ecad3a133ac0)
+++ firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision ff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371)
@@ -132,7 +132,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DD_RO_START_STOP_CMD_REQUEST;
+    msg.hdr.msgID = MSG_ID_DD_FP_START_STOP_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( RO_WATER_REQ_PAYLOAD_T );
 
     memcpy( payloadPtr, &roStartRequest, sizeof( RO_WATER_REQ_PAYLOAD_T ) );