Index: sources/model/MModel.h
===================================================================
diff -u -r1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3 -rdf74454a7a75eb63ac577739c1fd0f179e479f44
--- sources/model/MModel.h	(.../MModel.h)	(revision 1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3)
+++ sources/model/MModel.h	(.../MModel.h)	(revision df74454a7a75eb63ac577739c1fd0f179e479f44)
@@ -214,10 +214,9 @@
     REGISTER_METATYPE(                                                            PrimingData ) \
                                                                                                 \
     /*   Request    */                                                                          \
-    REGISTER_METATYPE(                                              StartTreatmentRequestData ) \
-    REGISTER_METATYPE(                                            ConfirmTreatmentRequestData ) \
-    REGISTER_METATYPE(                                                EndTreatmentRequestData ) \
-                                                                                                \
+    REGISTER_METATYPE(                                              TreatmentStartRequestData ) \
+    REGISTER_METATYPE(                                            TreatmentConfirmRequestData ) \
+    REGISTER_METATYPE(                                                TreatmentEndRequestData ) \
     REGISTER_METATYPE(                                                AlarmSilenceRequestData ) \
     REGISTER_METATYPE(                                             AlarmUserActionRequestData ) \
     REGISTER_METATYPE(                                       AlarmClearedConditionRequestData ) \
@@ -232,9 +231,10 @@
     REGISTER_METATYPE(                                               AdjustHeparinRequestData ) \
     REGISTER_METATYPE(                                       AdjustPressuresLimitsRequestData ) \
     REGISTER_METATYPE(                                   AdjustTreatmentParametersRequestData ) \
+    REGISTER_METATYPE(                                                    GuiAlertRequestData ) \
     /* Response     */                                                                          \
-    REGISTER_METATYPE(                                             StartTreatmentResponseData ) \
-    REGISTER_METATYPE(                                               EndTreatmentResponseData ) \
+    REGISTER_METATYPE(                                             TreatmentStartResponseData ) \
+    REGISTER_METATYPE(                                               TreatmentEndResponseData ) \
                                                                                                 \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
     REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
@@ -243,9 +243,10 @@
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
+    REGISTER_METATYPE(                                                   GuiAlertResponseData ) \
     REGISTER_METATYPE(                                              AdjustHeparinResponseData ) \
     REGISTER_METATYPE(                                      AdjustPressuresLimitsResponseData ) \
-    REGISTER_METATYPE(                                  AdjustTreatmentParametersResponseData ) \
+    REGISTER_METATYPE(                                  AdjustTreatmentParametersResponseData )
 
 //===============================================================================//
 /*!
@@ -300,8 +301,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      StartTreatmentResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        EndTreatmentResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      TreatmentStartResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        TreatmentEndResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AdjustHeparinResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustPressuresLimitsResponseData ) \
@@ -316,9 +317,9 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       StartTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     ConfirmTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         EndTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       TreatmentStartRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     TreatmentConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         TreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
@@ -384,8 +385,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                              StartTreatmentResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                EndTreatmentResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                              TreatmentStartResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                TreatmentEndResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                               AdjustHeparinResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustPressuresLimitsResponseData ) \
@@ -399,9 +400,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                               StartTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             ConfirmTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 EndTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                               TreatmentStartRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             TreatmentConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 TreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustPressuresLimitsRequestData ) \
@@ -419,9 +420,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        StartTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      ConfirmTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          EndTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        TreatmentStartRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      TreatmentConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          TreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustPressuresLimitsRequestData ) \
@@ -442,9 +443,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                         AdjustHeparinRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        StartTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      ConfirmTreatmentRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          EndTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        TreatmentStartRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      TreatmentConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          TreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustTreatmentParametersRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AlarmSilenceRequestData ) \
@@ -486,8 +487,8 @@
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                        PrimingData ) \
     /*   Response */                                                                            \
-    ACTION_RECEIVE_SIGNAL(                                         StartTreatmentResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                           EndTreatmentResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                         TreatmentStartResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                           TreatmentEndResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \