Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r484b185f0cf4b2ea0ba9de331573952b1b5124b4 -r98eaa905f2487013d5e9af76bf064f872332c2fe
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 98eaa905f2487013d5e9af76bf064f872332c2fe)
@@ -203,7 +203,7 @@
     handleDialysateMixing();
     checkConcentrateConductivity();
 
-    BOOL isDialysateProductionGood = ( !isAlarmActive( ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE ) && !isAlarmActive( ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) );
+    BOOL isDialysateProductionGood = ( !isAlarmActive( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE ) && !isAlarmActive( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) );
 
 #ifdef DISABLE_DIALYSATE_CHECK
     isDialysateProductionGood = TRUE;
@@ -237,7 +237,7 @@
 
     totalROFlowRate += getMeasuredROFlowRate();
 
-    BOOL isDialysateConductivityBad = ( isAlarmActive( ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE ) || isAlarmActive( ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) );
+    BOOL isDialysateConductivityBad = ( isAlarmActive( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE ) || isAlarmActive( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) );
 
 #ifdef DISABLE_DIALYSATE_CHECK
     isDialysateConductivityBad = FALSE;