Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r404b16f95153db3c8f83fccd18abc98164bb31fd -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 404b16f95153db3c8f83fccd18abc98164bb31fd)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @date    (last)      07-Apr-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -687,7 +687,7 @@
         else
         {
             // Bicarb test failed, go to fault
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, averageBicarbConductivity );
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_BICARB_CONDUCTIVITY_OUT_OF_RANGE, averageBicarbConductivity );
         }
     }
 
@@ -744,7 +744,7 @@
             }
             else
             {
-                SET_ALARM_WITH_1_F32_DATA( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, averageAcidConductivity )
+                SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE, averageAcidConductivity )
             }
 
             if ( pctDiffInConductivity < FIVE_PERCENT_FACTOR )
@@ -941,7 +941,7 @@
                 if ( ( avgRR > MAX_RO_REJECTION_RATIO_ALLOW ) && ( isROOnlyModeEnabled() != TRUE ) )
                 {
                     // Fault alarm per PRS 483
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, avgRR, MAX_RO_REJECTION_RATIO_ALLOW );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE, avgRR, MAX_RO_REJECTION_RATIO_ALLOW );
                 }
             }
         }
@@ -967,18 +967,18 @@
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, bicarbNormalConductivity );  // trigger replace bottles alarm #1
-                clearAlarm( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
-                activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, bicarbNormalConductivity );  // trigger replace bottles alarm #1
+                clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
+                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
 
             if ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, acidNormalConductivity );  // trigger replace bottles alarm #1 then
-                clearAlarm( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
-                activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, acidNormalConductivity );  // trigger replace bottles alarm #1 then
+                clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
+                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
         }
 
@@ -1046,14 +1046,14 @@
     checkInletWaterPressure();
 
     // Check if any of the alarms are active
-    if ( ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )        ||
-         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )       ||
-         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )        ||
-         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )         ||
+    if ( ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )        ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )       ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )        ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )         ||
          ( TRUE == isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ) )  ||
-         ( TRUE == isAlarmActive( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
-         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )           ||
-         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
+         ( TRUE == isAlarmActive( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )           ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
     {
         status = TRUE;
     }
@@ -1073,8 +1073,8 @@
 {
     BOOL status = FALSE;
 
-    if ( ( TRUE == isAlarmActive( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) ) ||
-         ( TRUE == isAlarmActive( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE ) ) )
+    if ( ( TRUE == isAlarmActive( ALARM_ID_DG_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) ) ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE ) ) )
     {
         status = TRUE;
     }