Index: SystemComm.c
===================================================================
diff -u -rbcc1ad9652142c462704a092ab3ac861ad161477 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- SystemComm.c	(.../SystemComm.c)	(revision bcc1ad9652142c462704a092ab3ac861ad161477)
+++ SystemComm.c	(.../SystemComm.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -252,7 +252,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
 #endif
     }
 }
@@ -388,7 +388,7 @@
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
 #endif
 #ifdef _RO_
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
 #endif
             }
         }
@@ -401,7 +401,7 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
 #endif
 #ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
 #endif
         }
     }
@@ -798,7 +798,7 @@
 #ifdef _RO_
                 if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_RO_2_DD )
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
                 }
 #endif
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list