Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61 -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,20 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- *
- *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
- *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
- *  @file Timers.c
- *
- *  @date 07-Nov-2019
- *  @author S. Nash
- *
- *  @brief Alarm Management service module.  Provides general alarm management \n
- *  functionality including support functions for triggering and clearing \n
- *  specific alarms.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file AlarmMgmt.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 22-Jul-2020
+*
+* @author (original) Sean
+* @date (original) 04-Feb-2020
+*
+***************************************************************************/
 
 #include "AlarmMgmt.h"
 #include "OperationModes.h"
@@ -103,7 +102,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
     }
 }
 
@@ -238,7 +237,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
     }
 }
 
@@ -338,6 +337,3 @@
 
     return result;
 }
-
-
-