Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -ra711f7995e555b503ed8c295f98fbe7bb9e5abf5 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a711f7995e555b503ed8c295f98fbe7bb9e5abf5)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241)
@@ -206,7 +206,7 @@
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
+            setValveState( M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
@@ -238,7 +238,7 @@
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
             setValveState( D64_VALV, VALVE_STATE_CLOSED );
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
+            setValveState( M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
 
@@ -264,7 +264,7 @@
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
 
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
+            setValveState( M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
@@ -300,7 +300,7 @@
 
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
+            setValveState( M4_VALV, VALVE_STATE_OPEN );
             setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
             bicarbFillStartTimeMS = getMSTimerCount();
 
@@ -437,7 +437,7 @@
     LEVEL_STATE_T floaterLevel  = getLevelStatus( D6_LEVL );
 
     //Make sure Water Inlet Valve is open
-    setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
+    setValveState( M4_VALV, VALVE_STATE_OPEN );
 
     // High level is met
     if ( LEVEL_STATE_HIGH == floaterLevel )