Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r12c4f28723f9af89ae693df771039da1bc7ffc80 -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 12c4f28723f9af89ae693df771039da1bc7ffc80)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -16,7 +16,7 @@
 ***************************************************************************/
 
 
-#include "ROPump.h"
+
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
@@ -25,6 +25,7 @@
 #include "ModeWaterPreGen.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "ROPump.h"
 #include "SystemCommRO.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
@@ -155,7 +156,7 @@
                 result = handleGenWaterCmd( cmd.start, cmd.roRate );
                 break;
             default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_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_RO_INVALID_RO_CMD, cmd.cmdID )
                 break;
         }
     }
@@ -181,14 +182,14 @@
     if ( ( RO_MODE_STAN == roMode ) && ( TRUE == start ) )
     {
         setDDPermeateFlowRate( roRate );
-        setBoostPumpPWMDutyCycle( P12_PUMP, roRate );
+        setFluidPumpPWMDutyCycle( P12_PUMP, roRate );
         result = requestPreGenStart();
     }
     else if ( RO_MODE_PGEN == roMode )
     {
         if ( FALSE == start )
         {
-            signalROPumpStop( P12_PUMP );
+            signalROPumpHardStop();
             result = requestPreGenStop();
         }
         else
@@ -220,14 +221,14 @@
     if ( ( RO_MODE_PGEN == roMode ) && ( TRUE == start ) )
     {
         setDDPermeateFlowRate( roRate );
-        setBoostPumpPWMDutyCycle( P12_PUMP,roRate );
+        setFluidPumpPWMDutyCycle( P12_PUMP,roRate );
         result = requestGenWaterStart();
     }
     else if ( RO_MODE_GENW == roMode )
     {
         if ( FALSE == start )
         {
-            signalROPumpStop( P12_PUMP );
+            signalROPumpHardStop();
             result = requestGenWaterStop();
         }
         else