Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r1cf11f4c1f6a1f1fd40270889723fbec040fc7ec
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 1cf11f4c1f6a1f1fd40270889723fbec040fc7ec)
@@ -144,10 +144,10 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( RO_WATER_REQ_PAYLOAD_T ) )
+    if ( message->hdr.payloadLen == sizeof( FP_WATER_REQ_PAYLOAD_T ) )
     {
-        RO_WATER_REQ_PAYLOAD_T cmd;
-        memcpy( &cmd, message->payload, sizeof( RO_WATER_REQ_PAYLOAD_T ) );
+        FP_WATER_REQ_PAYLOAD_T cmd;
+        memcpy( &cmd, message->payload, sizeof( FP_WATER_REQ_PAYLOAD_T ) );
 
         switch ( cmd.cmdID )
         {
@@ -234,7 +234,7 @@
     BOOL result = FALSE;
     FP_OP_MODE_T roMode = getCurrentOperationMode();
 
-    if ( ( FP_MODE_PGEN == roMode ) && ( TRUE == start ) )
+    if ( TRUE == start )
     {
         setDDPermeateFlowRate( roRate );
         if ( TRUE == isDefeatured() )
@@ -248,26 +248,13 @@
         }
     }
 
-    else if ( FP_MODE_GENP == roMode )
+    else
     {
-        if ( FALSE == start )
-        {
-            result = requestGenWaterStop();
-        }
-
-        else
-        {
-            // Set flow rate and delivery.
-            setDDPermeateFlowRate( roRate );
-            result = TRUE;
-        }
+        // Set flow rate and delivery.
+        result = requestGenWaterStop();
+        result = TRUE;
     }
 
-    else if ( FP_MODE_DEGW == roMode )
-    {
-        result = requestGenWaterDefStop();
-    }
-
     return result;
 }