Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rbb23492d17539eb0d1ec14c4f2eb25e2756a6ae1 -r41cdd893f686bb53dbebe20068d0cc0f6478ed66
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bb23492d17539eb0d1ec14c4f2eb25e2756a6ae1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 41cdd893f686bb53dbebe20068d0cc0f6478ed66)
@@ -3697,7 +3697,7 @@
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleUIServiceModeRequest( MESSAGE_T *message )
+void handleServiceModeRequest( MESSAGE_T *message )
 {
     BOOL status = FALSE;
     DG_OP_MODE_T currentMode = getCurrentOperationMode();
@@ -3723,7 +3723,7 @@
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
-    sendUIServiceModeResponse( status, (U32)reject );
+    sendServiceModeResponse( status, (U32)reject );
 }
 
 /*********************************************************************//**
@@ -3736,7 +3736,7 @@
  * @param rejCode Reject reason code explaining why request was rejected
  * @return none
  *************************************************************************/
-void sendUIServiceModeResponse( BOOL accepted, U32 rejCode )
+void sendServiceModeResponse( BOOL accepted, U32 rejCode )
 {
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
@@ -3751,7 +3751,7 @@
     memcpy( payloadPtr, &rejCode, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
 }
 
 /*********************************************************************//**