Index: firmware/App/Services/AlarmMgmtDD.c
===================================================================
diff -u -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 -r52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a
--- firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4)
+++ firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision 52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a)
@@ -134,7 +134,7 @@
     }
     else
     {
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
     }
 }
 
@@ -183,7 +183,7 @@
  *************************************************************************/
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2, BOOL outside )
 {
-    //HD_MODE_SUB_MODE_T hdModes;
+//    HD_MODE_SUB_MODE_T hdModes;
     ALARM_T props     = getAlarmProperties( alarm );
 
     //getHDOperationMode( &hdModes );
@@ -230,7 +230,7 @@
     }
     else
     {
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
     }
 }
 
@@ -260,7 +260,7 @@
     }
     else
     {
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
     }
 }