Index: firmware/App/Services/StateServices/TubeSetInstall.c
===================================================================
diff -u -r593393009f0796d971fd90ce072bee561109debc -rce9145f506c3b7b970285bf2ab2e464b66f83bab
--- firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 593393009f0796d971fd90ce072bee561109debc)
+++ firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision ce9145f506c3b7b970285bf2ab2e464b66f83bab)
@@ -378,15 +378,16 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetupConnectionConfirmRequest function handles a UI request
+ * The handleSetupTubingSetConnectionConfirmRequest function handles a UI request
  * to confirm setup connections are complete.
+ * @details \b Message \b Sent: MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE
  * @details \b Inputs: none
  * @details \b Outputs: setupConnectionsConfirmed
  * @param message UI message which includes the user confirmation of
  * setup connections completion.
  * @return TRUE if confirmation accepted, FALSE otherwise.
  *************************************************************************/
-BOOL handleSetupConnectionConfirmRequest( MESSAGE_T *message )
+BOOL handleSetupTubingSetConnectionConfirmRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
     UI_RESPONSE_PAYLOAD_T response;
@@ -395,7 +396,7 @@
 
     if ( 0 == message->hdr.payloadLen )
     {
-        if ( TUBE_SET_INSTALL_STATE_AWAIT_SETUP_CONNECTION_CONFIRMATION == currentInstallState )
+        if ( TUBE_SET_INSTALL_STATE_COMPLETE != currentInstallState )
         {
             setupConnectionsConfirmed = TRUE;
             result = TRUE;
@@ -412,7 +413,7 @@
 
     response.accepted = result;
 
-    sendMessage( MSG_ID_TD_SETUP_CONNECTION_CONFIRM_RESPONSE, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)&response, sizeof( UI_RESPONSE_PAYLOAD_T ) );
+    sendMessage( MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)&response, sizeof( UI_RESPONSE_PAYLOAD_T ) );
 
     return result;
 }