Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rd4f6af7415f1fa6c149386121c6836fc6ef276e9 -r311cbf33e621a6a46033c448adc576a2b75c7023
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision d4f6af7415f1fa6c149386121c6836fc6ef276e9)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 311cbf33e621a6a46033c448adc576a2b75c7023)
@@ -7,8 +7,8 @@
 *
 * @file    DGInterface.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      28-Mar-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      07-Apr-2023
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -185,10 +185,10 @@
     initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS );
 
 
-    initPersistentAlarm( ALARM_ID_HD_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
 }
 
 /**********************************************************************//**
@@ -236,16 +236,16 @@
     if ( isACPowerLost() != TRUE )
     {
         // Trigger alarm if not receiving new load cell data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
+        checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
 
         // Trigger alarm if not receiving new dialysate temperature data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
+        checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
 
         // Trigger alarm if not receiving new reservoirs data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag );
+        checkDGDataFreshness( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag );
 
         // Trigger alarm if not receiving new DG op mode message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
+        checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
 
         // Check to see if DG has restarted
         checkDGRestart();
@@ -1131,7 +1131,7 @@
         switch ( dgCmdRespPtr->rejectCode )
         {
             case DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER:
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT, dgCmdRespPtr->commandID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DG_COMMAND_INVALID_PARAMETER_FAULT, dgCmdRespPtr->commandID );
                 break;
 
             case DG_CMD_REQUEST_REJECT_REASON_NONE:
@@ -1234,7 +1234,7 @@
         if ( ( DG_MODE_FAUL != dgCurrentOpMode ) && ( DG_MODE_GENE != dgCurrentOpMode ) &&
              ( DG_MODE_FILL != dgCurrentOpMode ) && ( DG_MODE_DRAI != dgCurrentOpMode ) )
         {
-            activateAlarmNoData( ALARM_ID_DG_RESTARTED_FAULT );
+            activateAlarmNoData( ALARM_ID_HD_DG_RESTARTED_FAULT );
         }
     }
 }