Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r936acbb405970a406c8b1f557ea727e7cbf74c94 -rbb114842e73659f097bb8b8ec0d670bfa4f8cb73
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 936acbb405970a406c8b1f557ea727e7cbf74c94)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bb114842e73659f097bb8b8ec0d670bfa4f8cb73)
@@ -1185,8 +1185,8 @@
             handleTreatmentParametersFromUI( message );
             break;
 
-        case MSG_ID_UI_START_TREATMENT:
-            handleUIStartTreatmentMsg( message );
+        case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
+            handleInitiateTreatmentRequest( message );
             break;
 
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
@@ -1221,14 +1221,18 @@
             handleStartPrimeCmd( message );
             break;
 
-        case MSG_ID_UI_CONTINUE_TO_TREATMENT_REQUEST:
+        case MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST:
             handleContinueToTreatmentCmd( message );
             break;
 
         case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM:
             handlePatientConnectionConfirmCmd( message );
             break;
 
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;