Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -r88c34063ceea7200e0dbd1aae7f4dcf28f5a8755
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 88c34063ceea7200e0dbd1aae7f4dcf28f5a8755)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @author  (last)      Bill Bracken
+* @date    (last)      14-Apr-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -551,7 +551,7 @@
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
         prevHeatDisinfectState = state;
-        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
     }
 
     return state;
@@ -604,7 +604,7 @@
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
         prevHeatDisinfectState = state;
-        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
     }
 
     return state;
@@ -877,7 +877,7 @@
             turnOffUVReactor( OUTLET_UV_REACTOR );
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
-            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_OPEN );