Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -raf0faf02f1bd7bffcce083e9b52988a01c343d8e -r26f63d0260a3c35277e3e6dbca3573c253775318
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision af0faf02f1bd7bffcce083e9b52988a01c343d8e)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 26f63d0260a3c35277e3e6dbca3573c253775318)
@@ -821,7 +821,7 @@
     {
         rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
-        U32 drainPumpRPM = getTargetDrainPumpRPM();
+        U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
         F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
         // Reservoir 1 cannot be filled before reservoir 2 is filled and is overflowing to reservoir 1. If reservoir 1 has already
@@ -1294,7 +1294,7 @@
         signalDrainPumpHardStop();
         signalROPumpHardStop();
 
-        if ( 0 == getTargetDrainPumpRPM() )
+        if ( 0 == getDrainPumpTargetRPM() )
         {
             // De-energize all the valves that are not in the path anymore
             // and wait for the RO membrane to be cooled down.
@@ -1508,7 +1508,7 @@
     {
         rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
-        U32 drainPumpRPM = getTargetDrainPumpRPM();
+        U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
         F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
         // Reservoir 1 cannot be filled before reservoir 2 is filled and is overflowing to reservoir 1. If reservoir 1 has already
@@ -1600,7 +1600,7 @@
     {
         rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
-        U32 drainPumpRPM = getTargetDrainPumpRPM();
+        U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 2 as the same time
         F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
         // Reservoir 1 cannot be filled before reservoir 2 is filled and is overflowing to reservoir 1. If reservoir 1 has already