Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -1184,10 +1184,14 @@
             handleTreatmentParametersFromUI( message );
             break;
 
-        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
-            handleUIStartTreatmentMsg( message );
+        case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
+            handleInitiateTreatmentRequest( message );
             break;
 
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
             handleUIUserConfirmTreatmentParameters( message );
             break;