Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r875c5a18945bbac5ef1392fe508abb898e17ee67 -r402b16472dfa1ba3eff2b027a008305d2c5a6903
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 875c5a18945bbac5ef1392fe508abb898e17ee67)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 402b16472dfa1ba3eff2b027a008305d2c5a6903)
@@ -67,15 +67,15 @@
     COMM_BUFFER_OUT_CAN_TD_ALARM,                           ///< Buffer for responding to incoming RO alarm messages
     COMM_BUFFER_OUT_CAN_TD_ALARM,                           ///< Buffer for responding to incoming UI alarm messages
     COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing TD to DD messages so no response buffer
-    COMM_BUFFER_OUT_CAN_TD_2_DD,                            ///< Buffer for responding to incoming DD to HD messages
+    COMM_BUFFER_OUT_CAN_TD_2_DD,                            ///< Buffer for responding to incoming DD to TD messages
     COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing TD to UI messages so no response buffer
-    COMM_BUFFER_OUT_CAN_TD_2_UI,                            ///< Buffer for responding to incoming UI to HD messages
+    COMM_BUFFER_OUT_CAN_TD_2_UI,                            ///< Buffer for responding to incoming UI to TD messages
     COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing TD broadcast messages so no response buffer
     COMM_BUFFER_OUT_CAN_TD_BROADCAST,                       ///< Buffer for responding to incoming DD broadcast messages
     COMM_BUFFER_OUT_CAN_TD_BROADCAST,                       ///< Buffer for responding to incoming RO broadcast messages
     COMM_BUFFER_OUT_CAN_TD_BROADCAST,                       ///< Buffer for responding to incoming UI broadcast messages
-    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for responding to incoming PC to TD messages
-    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing HD to PC messages so no response buffer
+    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for responding to incoming PC to RO messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing TD to PC messages so no response buffer
 };
 
 typedef BOOL (*MsgFuncPtr)( MESSAGE_T* );