Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3ca05094a51e41dfafa2dbc6bbb40df1971a8679 -rc946dc2b288b45541d1ee583560aa2af5f49c1c7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3ca05094a51e41dfafa2dbc6bbb40df1971a8679)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c946dc2b288b45541d1ee583560aa2af5f49c1c7)
@@ -70,10 +70,10 @@
 /// List of message IDs that are requested not to be transmitted.
 static BLOCKED_MSGS_DATA_T blockedMessagesForXmit = { 0, 0, 0, 0, 0, 0, 0, 0 };
 static CONFIRMATION_REQUEST_T confirmRequests[NUM_CONFIRM_REQUESTS] =
-                                                   { 0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
-                                                     0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
-                                                     0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
-                                                     0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED, };
+                                                   { 0, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
+                                                     0, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
+                                                     0, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
+                                                     0, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED, };
 
 // ********** private function prototypes **********
 
@@ -7383,7 +7383,7 @@
  * @param request ID
  * @return CONFIRMATION_REQUEST_STATUS_T
  *************************************************************************/
-CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( U32 request_id )
+CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id )
 {
     U08 i;
     CONFIRMATION_REQUEST_STATUS_T status = CONFIRMATION_REQUEST_STATUS_PENDING;
@@ -7404,7 +7404,7 @@
             {
                 // Clear the confirmation request
                 confirmRequests[ i ].requestID = 0;
-                confirmRequests[ i ].requestType = CONFIRMATION_REQUEST_TYPE_OPEN;
+                confirmRequests[ i ].requestType = GENERIC_CONFIRM_CMD_REQUEST_OPEN;
                 confirmRequests[ i ].timeStamp = 0;
                 confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_UNUSED;
             }
@@ -7422,19 +7422,17 @@
  * @param
  * @return request ID - will be non-zero if sent
  *************************************************************************/
-U32 sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_T request_type, U32 reject_reason )
+GENERIC_CONFIRM_ID_T sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason )
 {
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
     U08 i;
-    static U32 request_id = 0;
-    U32 new_id = 0;
+    GENERIC_CONFIRM_ID_T new_id = GENERIC_CONFIRM_ID_NONE;
 
     for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
     {
         if ( confirmRequests[ i ].status == CONFIRMATION_REQUEST_STATUS_UNUSED )
         {
-            request_id++;
             // Save the confirmation request info
             confirmRequests[ i ].requestID = request_id;
             confirmRequests[ i ].requestType = request_type;