Index: NVDataMgmt.c
===================================================================
diff -u -rcfd81ad59f6a5ccece4a3e0dc24c9601f7a13259 -r1e1578eeb5f1c1dd837283aab216ec50108f0754
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision cfd81ad59f6a5ccece4a3e0dc24c9601f7a13259)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1e1578eeb5f1c1dd837283aab216ec50108f0754)
@@ -672,7 +672,7 @@
             SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
                                        NVDataMgmtSelfTestState );
 #else
-            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
                                        NVDataMgmtSelfTestState );
 #endif
             NVDataMgmtSelfTestState = NVDATAMGMT_SELF_TEST_STATE_COMPLETE;
@@ -774,7 +774,7 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
                                        NVDataMgmtExecState );
 #else
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
                                        NVDataMgmtExecState );
 #endif
             NVDataMgmtExecState = NVDATAMGMT_EXEC_STATE_IDLE;