Index: sources/model/MModel.h
===================================================================
diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -re125bd5cf13750eaf241d518b9c846139afaa81c
--- sources/model/MModel.h	(.../MModel.h)	(revision 65558208e4968de9a5470ff5fda1ee2a9d00c793)
+++ sources/model/MModel.h	(.../MModel.h)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
@@ -105,11 +105,10 @@
 // Disinfection
 #include "MDisinfectAdjustRequests.h"
 #include "MDisinfectAdjustResponse.h"
-#include "MDisinfectDGFlushData.h"
+#include "MDisinfectAdjustChemicalConfirmResponse.h"
+#include "MDisinfectDGFlushTimeData.h"
 #include "MDisinfectDGHeatTimeData.h"
-#include "MDisinfectDGHeatTemperatureData.h"
 #include "MDisinfectDGChemicalTimeData.h"
-#include "MDisinfectDGChemicalTBDData.h"
 
 /*!
  * \page MessageFlow Message interpretation Flow
@@ -276,11 +275,9 @@
     REGISTER_METATYPE(                                            PreTreatmentSelfTestDryData ) \
     REGISTER_METATYPE(                                       PreTreatmentDisposablesPrimeData ) \
     /*                                      Disinfection                                     */ \
-    REGISTER_METATYPE(                                                   DisinfectDGFlushData ) \
+    REGISTER_METATYPE(                                               DisinfectDGFlushTimeData ) \
     REGISTER_METATYPE(                                                DisinfectDGHeatTimeData ) \
-    REGISTER_METATYPE(                                         DisinfectDGHeatTemperatureData ) \
     REGISTER_METATYPE(                                            DisinfectDGChemicalTimeData ) \
-    REGISTER_METATYPE(                                             DisinfectDGChemicalTBDData ) \
                                                                                                 \
     /*   Request    */                                                                          \
     /*                                      Post-Treatment                                   */ \
@@ -302,7 +299,7 @@
     REGISTER_METATYPE(                                        AdjustStartTreatmentRequestData ) \
     /*                                      Disinfection                                     */ \
     REGISTER_METATYPE(                                             AdjustDisinfectRequestData ) \
-    REGISTER_METATYPE(                              AdjustDisinfectChemicalConfirmRequestData ) \
+    REGISTER_METATYPE(                                       AdjustChemicalConfirmRequestData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                AlarmSilenceRequestData ) \
     REGISTER_METATYPE(                                             AlarmUserActionRequestData ) \
@@ -339,6 +336,7 @@
     REGISTER_METATYPE(                                       AdjustStartTreatmentResponseData ) \
     /*                                      Disinfect                                        */ \
     REGISTER_METATYPE(                                            AdjustDisinfectResponseData ) \
+    REGISTER_METATYPE(                                      AdjustChemicalConfirmResponseData ) \
                                                                                                 \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
     REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
@@ -418,11 +416,9 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                PreTreatmentDisposablesPrimeData ) \
     /*                                      Disinfection                                     */ \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            DisinfectDGFlushData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        DisinfectDGFlushTimeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         DisinfectDGHeatTimeData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  DisinfectDGHeatTemperatureData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     DisinfectDGChemicalTimeData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      DisinfectDGChemicalTBDData ) \
     /*   Response   */                                                                          \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,     AdjustDisposablesRemovalConfirmResponseData ) \
@@ -438,6 +434,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustStartTreatmentResponseData ) \
     /*                                      Disinfect                                        */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustDisinfectResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustChemicalConfirmResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
@@ -491,7 +488,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                 AdjustStartTreatmentRequestData ) \
     /*                                      Disinfection                                     */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustDisinfectRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustDisinfectChemicalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustChemicalConfirmRequestData ) \
     /*                                         Alarms                                        */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmUserActionRequestData ) \
@@ -563,11 +560,9 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        PreTreatmentDisposablesPrimeData ) \
     /*                                      Disinfection                                     */ \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                    DisinfectDGFlushData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                DisinfectDGFlushTimeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                 DisinfectDGHeatTimeData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                          DisinfectDGHeatTemperatureData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             DisinfectDGChemicalTimeData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                              DisinfectDGChemicalTBDData ) \
     /*   Response   */                                                                          \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(             AdjustDisposablesRemovalConfirmResponseData ) \
@@ -583,6 +578,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustStartTreatmentResponseData ) \
     /*                                      Disinfect                                        */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustDisinfectResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustChemicalConfirmResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
@@ -621,7 +617,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustStartTreatmentRequestData ) \
     /*                                      Disinfection                                     */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustDisinfectRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustDisinfectChemicalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustDurationRequestData ) \
@@ -665,7 +661,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustStartTreatmentRequestData ) \
     /*                                      Disinfection                                     */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustDisinfectRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustDisinfectChemicalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustDurationRequestData ) \
@@ -709,7 +705,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustStartTreatmentRequestData ) \
     /*                                      Disinfection                                     */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustDisinfectRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustDisinfectChemicalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustDurationRequestData ) \
@@ -779,11 +775,9 @@
     ACTION_RECEIVE_SIGNAL(                                        PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_SIGNAL(                                   PreTreatmentDisposablesPrimeData ) \
     /*                                      Disinfection                                     */ \
-    ACTION_RECEIVE_SIGNAL(                                               DisinfectDGFlushData ) \
+    ACTION_RECEIVE_SIGNAL(                                           DisinfectDGFlushTimeData ) \
     ACTION_RECEIVE_SIGNAL(                                            DisinfectDGHeatTimeData ) \
-    ACTION_RECEIVE_SIGNAL(                                     DisinfectDGHeatTemperatureData ) \
     ACTION_RECEIVE_SIGNAL(                                        DisinfectDGChemicalTimeData ) \
-    ACTION_RECEIVE_SIGNAL(                                         DisinfectDGChemicalTBDData ) \
     /*   Response */                                                                            \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_SIGNAL(                        AdjustDisposablesRemovalConfirmResponseData ) \
@@ -799,6 +793,7 @@
     ACTION_RECEIVE_SIGNAL(                                   AdjustStartTreatmentResponseData ) \
     /*                                      Disinfect                                        */ \
     ACTION_RECEIVE_SIGNAL(                                        AdjustDisinfectResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                  AdjustChemicalConfirmResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \