Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -r3518e8a088c32e75c0c8960d5e629a7401095feb
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 73d8423edc56daed591bc0b3f7baee5540aea423)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 3518e8a088c32e75c0c8960d5e629a7401095feb)
@@ -18,11 +18,11 @@
 #ifndef __COMM_BUFFERS_H__
 #define __COMM_BUFFERS_H__
 
-#include "../TDCommon.h"
+#include "TDCommon.h"
 
 /**
  *  @defgroup CommBuffers CommBuffers
- *  @brief The communication buffers module provides buffering services for
+ *  @brief The communication buffers unit provides buffering services for
  *  incoming and outgoing CAN data. A separate buffer is provided for each
  *  CAN ID (channel) so that frame order is maintained for a given channel.
  *
@@ -36,20 +36,20 @@
 typedef enum Comm_Buffers
 {
     COMM_BUFFER_NOT_USED = 0,                               ///< CAN message boxes start at 1 so we will not use this buffer
-    COMM_BUFFER_OUT_CAN_TD_ALARM,                           ///< Buffer for outgoing HD alarm 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 HD to DD 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 HD to UI messages
-    COMM_BUFFER_IN_CAN_UI_2_TD,                             ///< Buffer for incoming UI to HD messages
-    COMM_BUFFER_OUT_CAN_TD_BROADCAST,                       ///< Buffer for outgoing HD broadcast 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_IN_CAN_RO_BROADCAST,                        ///< Buffer for incoming RO broadcast messages
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                        ///< Buffer for incoming UI broadcast messages
-    COMM_BUFFER_IN_CAN_PC,                                  ///< Buffer for incoming PC to HD messages
-    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for outgoing HD to PC messages
+    COMM_BUFFER_IN_CAN_PC,                                  ///< Buffer for incoming PC to TD messages
+    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for outgoing TD to PC messages
     NUM_OF_COMM_BUFFERS                                     ///< Number of CAN communication buffers
 } COMM_BUFFER_T;