Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rb4f8e2229eb0a08cdce5fdd2e0a14ca25d792946 -r05120b7716e6c4f8cb06ddd6ec2b29d164148d99
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision b4f8e2229eb0a08cdce5fdd2e0a14ca25d792946)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 05120b7716e6c4f8cb06ddd6ec2b29d164148d99)
@@ -350,7 +350,7 @@
     DG_GEN_IDLE_MODE_BAD_FILL_STATE_T state = DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN;
 
     // Check if the alarm has been cleared by the user and if yes, continue with the fill
-    if ( FALSE == isAlarmActive( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE ) )
+    if ( FALSE == isAlarmActive( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE ) )
     {
         // Save the HD target fill volume before command 1000 mL fill volume
         targetFillVolumeML = getTargetFillVolumeML();
@@ -412,7 +412,7 @@
     DG_GEN_IDLE_MODE_BAD_FILL_STATE_T state = DG_HANDLE_BAD_FILL_STATE_START;
 
     // Clear wait for dialysate alarm condition to allow resume
-    clearAlarmCondition( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // resume option will appear
+    clearAlarmCondition( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );  // resume option will appear
     // Set flag to FALSE here so next call to idle exec will move to normal flush water state
     handleBadFillFlag = FALSE;