Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -r39405d73782b8b9cf1fc26238640e683efcebbb5
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 39405d73782b8b9cf1fc26238640e683efcebbb5)
@@ -131,7 +131,7 @@
     // Is requested new mode valid and legal at this time?
     if ( ( newMode >= FP_MODE_NLEG ) && ( isTestingActivated() != TRUE ) )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
         newMode = currentMode;
     }
 
@@ -181,7 +181,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
             currentMode = FP_MODE_FAUL;
             currentSubMode = 0;
             break;
@@ -220,7 +220,7 @@
     }
     else
     {  // Invalid mode requested
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode )
     }
 }
 
@@ -348,7 +348,7 @@
 
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
             break;
     }
 }