Index: CommBuffers.h
===================================================================
diff -u -rccb5b8e8c8f1517e91b7093ad3de0543c0a34e7f -r809103b805b84e80dda7e3dd1e77a52330610666
--- CommBuffers.h	(.../CommBuffers.h)	(revision ccb5b8e8c8f1517e91b7093ad3de0543c0a34e7f)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision 809103b805b84e80dda7e3dd1e77a52330610666)
@@ -65,13 +65,13 @@
 #ifdef _RO_
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages (channel 1)
     COMM_BUFFER_IN_CAN_DD_ALARM,                           ///< Buffer for incoming DD alarm messages (channel 2)
-    COMM_BUFFER_OUT_CAN_RO_ALARM,                          ///< Buffer for outgoing RO alarm messages (channel 4)
+    COMM_BUFFER_OUT_CAN_FP_ALARM,                          ///< Buffer for outgoing RO alarm messages (channel 4)
     COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages (channel 8)
-    COMM_BUFFER_IN_CAN_DD_2_RO,                            ///< Buffer for incoming DD to RO messages (channel 20)
-    COMM_BUFFER_OUT_CAN_RO_2_DD,                           ///< Buffer for outgoing RO to DD messages (channel 21)
+    COMM_BUFFER_IN_CAN_DD_2_FP,                            ///< Buffer for incoming DD to RO messages (channel 20)
+    COMM_BUFFER_OUT_CAN_FP_2_DD,                           ///< Buffer for outgoing RO to DD messages (channel 21)
     COMM_BUFFER_IN_CAN_TD_BROADCAST,                       ///< Buffer for incoming TD broadcast messages (channel 100)
     COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages (channel 101)
-    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                      ///< Buffer for incoming RO broadcast messages (channel 102)
+    COMM_BUFFER_OUT_CAN_FP_BROADCAST,                      ///< Buffer for incoming RO broadcast messages (channel 102)
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
 #endif
     COMM_BUFFER_IN_CAN_PC,                                 ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)