Index: firmware/App/Services/ROInterface.c
===================================================================
diff -u -rff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371 -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision ff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371)
+++ firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -38,7 +38,7 @@
 
 // ********** private data **********
 
-static RO_OP_MODE_T roCurrentOpMode;                                        ///< Current TD operation mode.
+static FP_OP_MODE_T roCurrentOpMode;                                        ///< Current TD operation mode.
 static U32  roSubMode;                                                      ///< Current state (sub-mode) of current TD operation mode.
 static F32  roFlowRate;                                                     ///< RO flow rate
 
@@ -58,7 +58,7 @@
 void initROInterface( void )
 {
    // Initialize unit variables
-    roCurrentOpMode         = RO_MODE_INIT;
+    roCurrentOpMode         = FP_MODE_INIT;
     roSubMode               = 0;
     roFlowRate              = MAX_RO_FLOW_RATE;
 }
@@ -120,7 +120,7 @@
  *************************************************************************/
 BOOL cmdROStartStop( BOOL startStop, RO_CMD_ID cmdMode)
 {
-    RO_WATER_REQ_PAYLOAD_T roStartRequest;
+    FP_WATER_REQ_PAYLOAD_T roStartRequest;
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
@@ -133,9 +133,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DD_FP_START_STOP_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( RO_WATER_REQ_PAYLOAD_T );
+    msg.hdr.payloadLen = sizeof( FP_WATER_REQ_PAYLOAD_T );
 
-    memcpy( payloadPtr, &roStartRequest, sizeof( RO_WATER_REQ_PAYLOAD_T ) );
+    memcpy( payloadPtr, &roStartRequest, sizeof( FP_WATER_REQ_PAYLOAD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DD_2_RO, ACK_REQUIRED );
@@ -175,7 +175,7 @@
  * @details \b Outputs: none
  * @return Latest reported RO operating mode.
  *************************************************************************/
-RO_OP_MODE_T getROOpMode( void )
+FP_OP_MODE_T getROOpMode( void )
 {
     return roCurrentOpMode;
 }
@@ -205,10 +205,10 @@
  *************************************************************************/
 void setROOpMode( U32 opMode, U32 subMode )
 {
-    if ( opMode < NUM_OF_RO_MODES )
+    if ( opMode < NUM_OF_FP_MODES )
     {
         // update RO op mode and sub-mode
-        roCurrentOpMode = (RO_OP_MODE_T)opMode;
+        roCurrentOpMode = (FP_OP_MODE_T)opMode;
         roSubMode = subMode;
     }
     else