Index: CommBuffers.h
===================================================================
diff -u -rb16fb44ffe64e6ceb3e182d11485c3bb75dbad8f -r722e82fef4304c492a37a0330cd80cb5946e57ca
--- CommBuffers.h	(.../CommBuffers.h)	(revision b16fb44ffe64e6ceb3e182d11485c3bb75dbad8f)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision 722e82fef4304c492a37a0330cd80cb5946e57ca)
@@ -35,31 +35,31 @@
 {
     COMM_BUFFER_NOT_USED = 0,                              ///< CAN message boxes start at 1 so we will not use this buffer
 #ifdef _TD_
-    COMM_BUFFER_OUT_CAN_TD_ALARM,                          ///< Buffer for outgoing TD alarm messages
-    COMM_BUFFER_IN_CAN_DD_ALARM,                           ///< Buffer for incoming DD alarm messages
-    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
-    COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages
-    COMM_BUFFER_OUT_CAN_TD_2_DD,                           ///< Buffer for outgoing TD to DD messages
-    COMM_BUFFER_IN_CAN_DD_2_TD,                            ///< Buffer for incoming DD to HD messages
-    COMM_BUFFER_OUT_CAN_TD_2_UI,                           ///< Buffer for outgoing TD to UI messages
+    COMM_BUFFER_OUT_CAN_TD_ALARM,                          ///< Buffer for outgoing TD alarm messages
+    COMM_BUFFER_IN_CAN_DD_ALARM,                           ///< Buffer for incoming DD alarm messages
+    COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
+    COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages
+    COMM_BUFFER_OUT_CAN_TD_2_DD,                           ///< Buffer for outgoing TD to DD messages
+    COMM_BUFFER_IN_CAN_DD_2_TD,                            ///< Buffer for incoming DD to HD messages
+    COMM_BUFFER_OUT_CAN_TD_2_UI,                           ///< Buffer for outgoing TD to UI messages
     COMM_BUFFER_IN_CAN_UI_2_TD,                            ///< Buffer for incoming UI to TD messages
-    COMM_BUFFER_OUT_CAN_TD_BROADCAST,                      ///< Buffer for outgoing TD broadcast messages
-    COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages
-    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
+    COMM_BUFFER_OUT_CAN_TD_BROADCAST,                      ///< Buffer for outgoing TD broadcast messages
+    COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages
+    COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages
 #endif
 #ifdef _DD_
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages
-    COMM_BUFFER_IN_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages
-    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
+    COMM_BUFFER_OUT_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages
+    COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
     COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages
     COMM_BUFFER_IN_CAN_TD_2_DD,                            ///< Buffer for incoming TD to DD messages
     COMM_BUFFER_OUT_CAN_DD_2_TD,                           ///< Buffer for outgoing DD to TD messages
-    COMM_BUFFER_IN_CAN_DD_2_RO,                           ///< Buffer for outgoing DD to RO messages
-    COMM_BUFFER_OUT_CAN_RO_2_DD,                            ///< Buffer for incoming RO to DD messages
+    COMM_BUFFER_OUT_CAN_DD_2_RO,                           ///< Buffer for outgoing DD to RO messages
+    COMM_BUFFER_IN_CAN_RO_2_DD,                            ///< Buffer for incoming RO to DD messages
     COMM_BUFFER_IN_CAN_TD_BROADCAST,                       ///< Buffer for incoming TD broadcast messages
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                      ///< Buffer for outgoing DD broadcast messages
-    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
+    COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages
 #endif
 #ifdef _RO_