Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -ra8bb1da29825b5d666333629fda871652d16229a -r5a36a768d11cc597a36b894c1fb3a5e5590130f1
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision a8bb1da29825b5d666333629fda871652d16229a)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 5a36a768d11cc597a36b894c1fb3a5e5590130f1)
@@ -376,15 +376,15 @@
          {
              // Set the actuators to flush drain
              setValveState( VPI, VALVE_STATE_OPEN );
-             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
 
              state = DG_FLUSH_STATE_FLUSH_DRAIN;
          }
          else
          {
              // Set the actuators to pull fresh water in to drain the circulation line
              setValveState( VPI, VALVE_STATE_OPEN );
-             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
              setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
              setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
              setROPumpTargetFlowRate( FINAL_DRAIN_RO_PUMP_FLOW_LPM, RO_PUMP_MAX_PRESSURE_PSI );
@@ -416,7 +416,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
 
         // Turn on the UV reactors
@@ -664,7 +664,7 @@
     {
         // Set the actuators to transition to flush circulation
         // The valves are set to do flush drain and flush circulation
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
         setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
@@ -699,7 +699,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_CIRCULATION_WAIT_TIME_MS ) )
     {
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -776,7 +776,7 @@
 
         // Set the actuators
         setValveState( VPI, VALVE_STATE_CLOSED );
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
 
         // Set both reservoirs to be considered as full
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;