Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9d5edd5658227136b3242bec69e9417107deab10 -r25770b4b27e75e730d89ac046f7db405b1bfe39f
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9d5edd5658227136b3242bec69e9417107deab10)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 25770b4b27e75e730d89ac046f7db405b1bfe39f)
@@ -751,8 +751,8 @@
 
             // Get the current volumes of R1 & R2. These values will be used to make sure the reservoirs'
             // volume does not change more than a certain amount during the actual heat disinfect cycle
-            R1HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_A1 );
-            R2HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_A2 );
+            R1HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            R2HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
 
             stateTimer = getMSTimerCount();
             rsrvrsVolMonitorTimer = getMSTimerCount();
@@ -806,13 +806,13 @@
 
     // In this state, R2 is fully filled up and R1 is partially filled up with hot water
     // So waiting for R1 to get to the level of defined partially full
-    BOOL isR1PartiallyFull = fabs( getLoadCellFilteredWeight( LOAD_CELL_A1 ) - RSRVRS_PARTIAL_FILL_VOL_ML ) < RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
+    BOOL isR1PartiallyFull = fabs( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - RSRVRS_PARTIAL_FILL_VOL_ML ) < RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
 
     if ( isRsrvrFull( R2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, state ) && isR1PartiallyFull )
     {
         // Get the current volumes to be monitored during R2 to R1 heat disinfect state
-        R1HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_A1 );
-        R2HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_A2 );
+        R1HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+        R2HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
 
         //TODO turn on CP1 and CP2
 
@@ -1127,11 +1127,11 @@
 
     if ( r == R1 )
     {
-        volume = getLoadCellFilteredWeight( LOAD_CELL_A1 );
+        volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     }
     else if ( r == R2 )
     {
-        volume = getLoadCellFilteredWeight( LOAD_CELL_B1 );
+        volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
 
     // Check the volume of the reservoir against the target volume
@@ -1168,11 +1168,11 @@
 
     if ( r == R1 )
     {
-        volume = getLoadCellFilteredWeight( LOAD_CELL_A1 );
+        volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     }
     else if ( r == R2 )
     {
-        volume = getLoadCellFilteredWeight( LOAD_CELL_B1 );
+        volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
 
     if ( volume < RSRVRS_EMPTY_VOL_ML )
@@ -1205,8 +1205,8 @@
     F32 TPoTemp = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
     F32 TPmTemp = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE ); //TODO change this to actual TPm sensor later
 
-    BOOL isR1OutOfRange = fabs( getLoadCellFilteredWeight( LOAD_CELL_A1 ) - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
-    BOOL isR2OutOfRange = fabs( getLoadCellFilteredWeight( LOAD_CELL_A2 ) - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
+    BOOL isR1OutOfRange = fabs( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
+    BOOL isR2OutOfRange = fabs( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
 
     // Check if either reservoir 1 or reservoir 2 are losing volume more than allowed volume
     if ( isR1OutOfRange || isR2OutOfRange )