Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r6f1f269cd7d91f41c51797d17a85a7ea249e21f3 -r54e58f64179ea382d2e2c403c8c3b9a15a612636
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 6f1f269cd7d91f41c51797d17a85a7ea249e21f3)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
@@ -941,7 +941,7 @@
         setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMP_PRIME_SPEED_ML_PER_MIN );
 
         // The bicarb line is used to inject the acid into the fluid path during chemical disinfect
-        requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
         // Start the timer for drain timeout
         stateTimer = getMSTimerCount();
@@ -989,7 +989,7 @@
         {
             // Turn off the concentrate pump for now until there is sufficient RO flow to turn it
             // back for mixing
-            requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
 
             // Prepare for filling the reservoirs and heating the water
             setValveState( VPI, VALVE_STATE_OPEN );
@@ -1004,8 +1004,8 @@
             setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
 
             // Start heating the water while we are filling up the reservoirs
-            setPrimaryHeaterTargetTemperature( CHEM_DISINFECT_TARGET_TEMPERATURE_C );
-            startPrimaryHeater();
+            setHeaterTargetTemperature( DG_PRIMARY_HEATER, CHEM_DISINFECT_TARGET_TEMPERATURE_C );
+            startHeater( DG_PRIMARY_HEATER );
 
             rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
             rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
@@ -1048,7 +1048,7 @@
     // control it.
     if ( measuredROFlowRate < MIN_RO_FLOW_FOR_CONC_PUMP_MIXING_LPM )
     {
-        requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
     }
     else
     {
@@ -1079,7 +1079,7 @@
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
 
             // Done with mixing acid
-            requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
 
             // Set the drain pump to control mode
             setDrainPumpTargetOutletPressure( CHEM_DISINFECT_TARGET_DRAIN_PRES_PSI );
@@ -1264,7 +1264,7 @@
         case CHEM_DISINFECT_COMPLETE:
             // Turn off the heaters
             // TODO turn off CP1 and CP2
-            stopPrimaryHeater();
+            stopHeater( DG_PRIMARY_HEATER );
             stateTimer = getMSTimerCount();
             state = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
             break;