Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r9e6e86f604c8cce7c1704ae55d1e026de3422782 -r67731d57db9a620418b3b848d8f75ff204902c36
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 67731d57db9a620418b3b848d8f75ff204902c36)
@@ -189,7 +189,7 @@
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
             //Previous state
-            setValveState( M4_VALV, VALVE_STATE_OPEN );
+            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             // Get the target temperature from TD
             targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature();
             // Turn on the primary heater
@@ -215,7 +215,7 @@
 
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
             //Previous state
-            setValveState( M4_VALV, VALVE_STATE_OPEN );
+            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             // Get the target temperature from TD
             targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature();
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
@@ -292,14 +292,6 @@
         pendingStopDDGenDialRequest = FALSE;
         requestNewOperationMode( DD_MODE_STAN );
     }
-    // Continuous water inlet pressure check
-    else if ( ( genDialysateState != DD_GEND_DIALYSATE_DELIVERY_PAUSE ) &&
-              ( TRUE == areInletWaterConditionsAlarmsActive() ) )
-    {
-        //Check RO alarms as required
-        setModeGenDStateTransition( DD_GEND_DIALYSATE_DELIVERY_PAUSE );
-        genDialysateState = DD_GEND_DIALYSATE_DELIVERY_PAUSE;
-    }
     else
     {
         // execute current gen dialysate state
@@ -354,7 +346,7 @@
     LEVEL_STATE_T floaterLevel  = getLevelStatus( D6_LEVL );
 
     //Make sure Water Inlet Valve is open
-    setValveState( M4_VALV, VALVE_STATE_OPEN );
+    setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
 
     // High level is met
     if ( LEVEL_STATE_HIGH == floaterLevel )