Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -rd5574e12aa9638c933d11b9bee8d5cf024864440 -r410afd26b3ae5e372310c696c82f58c59235e10d
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision d5574e12aa9638c933d11b9bee8d5cf024864440)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 410afd26b3ae5e372310c696c82f58c59235e10d)
@@ -15,16 +15,16 @@
 *
 ***************************************************************************/
 
+#include <ModePreGenPermeate.h>
+#include <SystemCommFP.h>
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
+#include "ModeGenPermeate.h"
 #include "ModeStandby.h"
-#include "ModeWaterGen.h"
-#include "ModeWaterPreGen.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "ROPump.h"
-#include "SystemCommRO.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
 
@@ -154,7 +154,7 @@
                 result = handleGenWaterCmd( cmd.start, cmd.roRate );
                 break;
             default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_RO_CMD, cmd.cmdID )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_FP_CMD, cmd.cmdID )
                 break;
         }
     }
@@ -175,15 +175,15 @@
 static BOOL handlePreGenCmd( BOOL start, F32 roRate )
 {
     BOOL result = FALSE;
-    RO_OP_MODE_T roMode = getCurrentOperationMode();
+    FP_OP_MODE_T roMode = getCurrentOperationMode();
 
-    if ( ( RO_MODE_STAN == roMode ) && ( TRUE == start ) )
+    if ( ( FP_MODE_STAN == roMode ) && ( TRUE == start ) )
     {
         setDDPermeateFlowRate( roRate );
         setFluidPumpPWMDutyCycle( P12_PUMP, roRate );
         result = requestPreGenStart();
     }
-    else if ( RO_MODE_PGEN == roMode )
+    else if ( FP_MODE_PGEN == roMode )
     {
         if ( FALSE == start )
         {
@@ -214,15 +214,15 @@
 static BOOL handleGenWaterCmd( BOOL start, F32 roRate )
 {
     BOOL result = FALSE;
-    RO_OP_MODE_T roMode = getCurrentOperationMode();
+    FP_OP_MODE_T roMode = getCurrentOperationMode();
 
-    if ( ( RO_MODE_PGEN == roMode ) && ( TRUE == start ) )
+    if ( ( FP_MODE_PGEN == roMode ) && ( TRUE == start ) )
     {
         setDDPermeateFlowRate( roRate );
         setFluidPumpPWMDutyCycle( P12_PUMP,roRate );
         result = requestGenWaterStart();
     }
-    else if ( RO_MODE_GENW == roMode )
+    else if ( FP_MODE_GENP == roMode )
     {
         if ( FALSE == start )
         {