Index: firmware/App/Services/SystemCommTD.c
===================================================================
diff -u -r3518e8a088c32e75c0c8960d5e629a7401095feb -r512065f0a0c9ba2c335e8856b790e8448852fc52
--- firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 3518e8a088c32e75c0c8960d5e629a7401095feb)
+++ firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 512065f0a0c9ba2c335e8856b790e8448852fc52)
@@ -36,15 +36,15 @@
 
 // ********** private definitions **********
 
-#define UI_COMM_TIMEOUT_IN_MS           7500                ///< Maximum time (in ms) that UI is allowed to wait before checking in with HD.
-#define UI_COMM_SERVICE_MODE_TIMEOUT_IN_MS (2 * SEC_PER_MIN * MS_PER_SECOND)   ///< Maximum time (in ms) that UI is allowed to wait before checking in with HD when in service mode.
-#define DG_COMM_TIMEOUT_IN_MS           1000                ///< DG has not checked in for this much time
+#define UI_COMM_TIMEOUT_IN_MS           7500                                        ///< Maximum time (in ms) that UI is allowed to wait before checking in with HD.
+#define UI_COMM_SERVICE_MODE_TIMEOUT_IN_MS (2 * SEC_PER_MIN * MS_PER_SECOND)        ///< Maximum time (in ms) that UI is allowed to wait before checking in with HD when in service mode.
+#define DG_COMM_TIMEOUT_IN_MS           1000                                        ///< DG has not checked in for this much time
 
-#define MAX_COMM_CRC_FAILURES           5                   ///< Maximum number of CRC errors within window period before alarm
-#define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
+#define MAX_COMM_CRC_FAILURES           5                                           ///< Maximum number of CRC errors within window period before alarm
+#define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)          ///< CRC error window
 
-#define MAX_FPGA_CLOCK_SPEED_ERRORS     3                   ///< maximum number of FPGA clock speed errors within window period before alarm
-#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (10 * SEC_PER_MIN * MS_PER_SECOND)    ///< FPGA clock speed error window
+#define MAX_FPGA_CLOCK_SPEED_ERRORS     3                                           ///< maximum number of FPGA clock speed errors within window period before alarm
+#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< FPGA clock speed error window
 
 /// Array of out-going CAN buffers.
 const COMM_BUFFER_T CAN_OUT_BUFFERS[ NUM_OF_CAN_OUT_BUFFERS ] =
@@ -104,13 +104,13 @@
 
 /*********************************************************************//**
  * @brief
- * The checkInFromDG function checks in the DD with the TD - indicating that
+ * The checkInFromDD function checks in the DD with the TD - indicating that
  * the DD is communicating.
  * @details \b Inputs: none
  * @details \b Outputs: ddIsCommunicating, timeOfLastDDCheckIn
  * @return none
  *************************************************************************/
-void checkInFromDG( void )
+void checkInFromDD( void )
 {
     ddIsCommunicating = TRUE;
     timeOfLastDDCheckIn = getMSTimerCount();