Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r1e2b6058e98720e8e13d452f031af2833fcf44a5
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 1e2b6058e98720e8e13d452f031af2833fcf44a5)
@@ -102,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 )
     }
 }
 
@@ -237,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 )
     }
 }
 
@@ -337,6 +337,3 @@
 
     return result;
 }
-
-
-