Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re26af49fdfca8aa748d463cdcb610f9a835e943a -r7e4b720b0f1067fb1d0714626ef6c058e7c68fef
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e26af49fdfca8aa748d463cdcb610f9a835e943a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7e4b720b0f1067fb1d0714626ef6c058e7c68fef)
@@ -3662,7 +3662,7 @@
 
 /*********************************************************************//**
 * @brief
-* The handleUIServiceModeRequest function handles a request to enter service
+* The handleServiceModeRequest function handles a request to enter service
 * mode.
 * @details Inputs: none
 * @details Outputs: message handled
@@ -3700,7 +3700,7 @@
 
 /*********************************************************************//**
  * @brief
- * The sendUIServiceModeResponse function sends out the DG response to a
+ * The sendServiceModeResponse function sends out the DG response to a
  * UI request to go to service mode.
  * @details Inputs: none
  * @details Outputs: Service mode request response msg constructed and queued
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r956c03c1aa417ce7d42f5cdac09918237b087e6c -r7e4b720b0f1067fb1d0714626ef6c058e7c68fef
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 956c03c1aa417ce7d42f5cdac09918237b087e6c)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7e4b720b0f1067fb1d0714626ef6c058e7c68fef)
@@ -153,10 +153,10 @@
 void handleDGScheduledRunsRequest( MESSAGE_T *message );
 
 // MSG_ID_UI_REQUEST_SERVICE_MODE
-void handleUIServiceModeRequest( MESSAGE_T *message );
+void handleServiceModeRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
-void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
+void sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
 // *********** public test support message functions **********