Index: AlarmMgmt.c
===================================================================
diff -u -r4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -89,7 +89,7 @@
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
     }
 
@@ -122,7 +122,7 @@
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index );
 #endif
 #ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index );
 #endif
     }
 
@@ -168,7 +168,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm )
 #endif
     }
 }
@@ -217,7 +217,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm )
 #endif
     }
 }
@@ -271,7 +271,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm )
 #endif
     }
 }
@@ -333,7 +333,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm )
 #endif
     }
 
@@ -370,7 +370,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm )
 #endif
     }
 
@@ -404,7 +404,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm )
 #endif
    }
 
Index: AlarmMgmt.h
===================================================================
diff -u -reb4447e3494f96cc8a88546f453f5ebf600c99a4 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- AlarmMgmt.h	(.../AlarmMgmt.h)	(revision eb4447e3494f96cc8a88546f453f5ebf600c99a4)
+++ AlarmMgmt.h	(.../AlarmMgmt.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 #include "AlarmDefs.h"
 #include "AlarmMgmtSWFaults.h"
Index: Comm.h
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- Comm.h	(.../Comm.h)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ Comm.h	(.../Comm.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
Index: CommBuffers.c
===================================================================
diff -u -r91cff0134623a852aeb37b497b2263cf4a9ba6cb -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- CommBuffers.c	(.../CommBuffers.c)	(revision 91cff0134623a852aeb37b497b2263cf4a9ba6cb)
+++ CommBuffers.c	(.../CommBuffers.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -195,7 +195,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
 #endif
     }
 
@@ -264,7 +264,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
 #endif
     }
 
@@ -331,7 +331,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
 #endif
     }
 
@@ -370,7 +370,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
 #endif
     }
 
Index: CommBuffers.h
===================================================================
diff -u -rfb1be94d30e7017deb9bb465ce676ee37f2d73f3 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- CommBuffers.h	(.../CommBuffers.h)	(revision fb1be94d30e7017deb9bb465ce676ee37f2d73f3)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -88,7 +88,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "../App/FPCommon.h"
 #endif
 
 /**
Index: FPGA.c
===================================================================
diff -u -r734b87e27cf122dfec2955afd11c59d26d38e23f -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- FPGA.c	(.../FPGA.c)	(revision 734b87e27cf122dfec2955afd11c59d26d38e23f)
+++ FPGA.c	(.../FPGA.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -384,7 +384,7 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState )
 #endif
 #ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState )
 #endif
             break;
     }
@@ -684,7 +684,7 @@
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit );
 #endif
 #ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit );
 #endif
     }
 }
@@ -730,7 +730,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
 #endif
     }
 }
@@ -776,7 +776,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
 #endif
     }
 }
@@ -822,7 +822,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
 #endif
     }
 }
Index: FPGA.h
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- FPGA.h	(.../FPGA.h)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ FPGA.h	(.../FPGA.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 #include "Interrupts.h"
Index: MessagePayloads.h
===================================================================
diff -u -r22da40d9c34d259afdc36e01de40bc6947b32277 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision 22da40d9c34d259afdc36e01de40bc6947b32277)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
Index: PersistentAlarm.c
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -107,7 +107,7 @@
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
 #endif
 #ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
 #endif
    }
 }
@@ -193,7 +193,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
 #endif
     }
 
@@ -241,7 +241,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
 #endif
     }
 
@@ -323,7 +323,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
 #endif
     }
 }
@@ -361,7 +361,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
 #endif
     }
 }
@@ -401,7 +401,7 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
 #endif
 #ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
 #endif
             break;
     }
Index: PressureCommon.h
===================================================================
diff -u -r34e9d24b76d786a5d3bba641f06e7764439c161e -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- PressureCommon.h	(.../PressureCommon.h)	(revision 34e9d24b76d786a5d3bba641f06e7764439c161e)
+++ PressureCommon.h	(.../PressureCommon.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
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
Index: SystemComm.h
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- SystemComm.h	(.../SystemComm.h)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ SystemComm.h	(.../SystemComm.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 #include "CommBuffers.h"
Index: Utilities.h
===================================================================
diff -u -rf352febbad947e7ae4afbd9a5eaa87e434648f37 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- Utilities.h	(.../Utilities.h)	(revision f352febbad947e7ae4afbd9a5eaa87e434648f37)
+++ Utilities.h	(.../Utilities.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
Index: WatchdogMgmt.h
===================================================================
diff -u -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- WatchdogMgmt.h	(.../WatchdogMgmt.h)	(revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088)
+++ WatchdogMgmt.h	(.../WatchdogMgmt.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 #include "MessageSupport.h"