Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 -r52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a)
@@ -157,7 +157,7 @@
     // is requested new mode valid and legal at this time?
     if ( newMode >= DD_MODE_NLEG )
     {
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, (U32)newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, (U32)newMode )
         newMode = currentMode;
     }
 
@@ -234,7 +234,7 @@
 //            break;
 
         default:
-            //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, (U32)currentMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, (U32)currentMode )
             currentMode = DD_MODE_FAUL;
             currentSubMode = 0;
             break;
@@ -272,7 +272,7 @@
     }
     else
     {  // invalid mode requested
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, (U32)newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, (U32)newMode )
     }
 }
 
@@ -411,7 +411,7 @@
 //            currentSubMode = transitionToROPermeateSampleMode();
 //            break;
         default:
-            //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, (U32)newMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, (U32)newMode )
             break;
     }