Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r9301b9ec99beedbb49076dc03526622d313bd8cf
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 9301b9ec99beedbb49076dc03526622d313bd8cf)
@@ -41,12 +41,13 @@
     COMM_BUFFER_IN_CAN_HD_2_DG,                                 ///< Receiving buffer for HD to DG communication via CAN
     COMM_BUFFER_OUT_CAN_DG_2_HD,                                ///< Transmitting buffer for DG to HD communication via CAN
     COMM_BUFFER_IN_CAN_HD_BROADCAST,                            ///< Receiving buffer for HD broadcast communication via CAN
+    COMM_BUFFER_OUT_CAN_DG_2_UI,                                ///< Transmitting buffer for DG to UI communication via CAN
     COMM_BUFFER_OUT_CAN_DG_BROADCAST,                           ///< Transmitting buffer for DG broadcast communication via CAN
-    COMM_BUFFER_IN_CAN_UI_BROADCAST,                            ///< Receiving buffer for UI broadcast communication via CAN
-    COMM_BUFFER_IN_CAN_PC,                                      ///< Receiving buffer for PC communication via CAN
+    COMM_BUFFER_IN_CAN_UI_2_DG,                                 ///< Receiving buffer for UI to DG communication via CAN
+    COMM_BUFFER_IN_CAN_UI_BROADCAST,                            ///< Receiving buffer for UI broadcast communication via CAN
+    COMM_BUFFER_IN_CAN_PC,                                      ///< Receiving buffer for PC communication via CAN
     COMM_BUFFER_OUT_CAN_PC,                                     ///< Transmitting buffer for PC communication via CAN
-    COMM_BUFFER_OUT_CAN_DG_2_UI,                                ///< Transmitting buffer for DG to UI communication via CAN
-    COMM_BUFFER_LAST_CAN_BUFFER = COMM_BUFFER_OUT_CAN_DG_2_UI,  ///< Last CAN communication buffer
+    COMM_BUFFER_LAST_CAN_BUFFER = COMM_BUFFER_OUT_CAN_PC,       ///< Last CAN communication buffer
 #ifdef DEBUG_ENABLED
     COMM_BUFFER_IN_UART_PC,                                     ///< Receiving buffer for PC communication via UART
     COMM_BUFFER_OUT_UART_PC,                                    ///< Transmitting buffer for PC communication via UART