Index: sources/model/MModel.h
===================================================================
diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -r9403146058e7c4cef17bd542bbd39bbf032be9f3
--- sources/model/MModel.h	(.../MModel.h)	(revision ca67f7413160dfba507856222bd9aa95c5fa6200)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 9403146058e7c4cef17bd542bbd39bbf032be9f3)
@@ -135,7 +135,7 @@
 #include "MPreTreatmentAdjustInitTreatmentResponse.h"
 #include "MPreTreatmentAdjustParametersValidationResponse.h"
 #include "MDGFilterFlushData.h" // DG message but part of the Pre-Treatment messaging flow
-#include "MPreTreatmentAdjustWaterSampleResponse.h"
+#include "MPreTreatmentAdjustWaterSampleResultResponse.h"
 #include "MPreTreatmentSelfTestNoCartridgeData.h"
 #include "MPreTreatmentSelfTestDryData.h"
 #include "MPreTreatmentAdjustDisposablesConfirmResponse.h"
@@ -443,7 +443,6 @@
     REGISTER_METATYPE(                                         AdjustInitTreatmentRequestData ) \
     REGISTER_METATYPE(                                  AdjustParametersValidationRequestData ) \
     REGISTER_METATYPE(                                     AdjustParametersConfirmRequestData ) \
-    REGISTER_METATYPE(                                           AdjustWaterSampleRequestData ) \
     REGISTER_METATYPE(                                     AdjustWaterSampleResultRequestData ) \
     REGISTER_METATYPE(                                    AdjustConsumablesConfirmRequestData ) \
     REGISTER_METATYPE(                                    AdjustDisposablesConfirmRequestData ) \
@@ -501,7 +500,7 @@
     /*                                      Pre-Treatment                                    */ \
     REGISTER_METATYPE(                                        AdjustInitTreatmentResponseData ) \
     REGISTER_METATYPE(                                 AdjustParametersValidationResponseData ) \
-    REGISTER_METATYPE(                                          AdjustWaterSampleResponseData ) \
+    REGISTER_METATYPE(                                    AdjustWaterSampleResultResponseData ) \
     REGISTER_METATYPE(                                   AdjustDisposablesConfirmResponseData ) \
     REGISTER_METATYPE(                                     AdjustDisposablesPrimeResponseData ) \
     REGISTER_METATYPE(                               AdjustPatientConnectionBeginResponseData ) \
@@ -676,7 +675,7 @@
     /*                                      Pre-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustParametersValidationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustWaterSampleResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             AdjustWaterSampleResultResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,            AdjustDisposablesConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,              AdjustDisposablesPrimeResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustPatientConnectionBeginResponseData ) \
@@ -779,7 +778,6 @@
     /*                                      Pre-Treatment                                    */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustParametersValidationRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustWaterSampleRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustWaterSampleResultRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,             AdjustConsumablesConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,             AdjustDisposablesConfirmRequestData ) \
@@ -924,7 +922,7 @@
     /*                                      Pre-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustParametersValidationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustWaterSampleResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                     AdjustWaterSampleResultResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                    AdjustDisposablesConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                      AdjustDisposablesPrimeResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustPatientConnectionBeginResponseData ) \
@@ -997,7 +995,6 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustParametersValidationRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                      AdjustParametersConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustWaterSampleRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                      AdjustWaterSampleResultRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                     AdjustConsumablesConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                     AdjustDisposablesConfirmRequestData ) \
@@ -1072,7 +1069,6 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustParametersValidationRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(               AdjustParametersConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustWaterSampleRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(               AdjustWaterSampleResultRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(              AdjustConsumablesConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(              AdjustDisposablesConfirmRequestData ) \
@@ -1147,7 +1143,6 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustParametersValidationRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustParametersConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustWaterSampleRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustWaterSampleResultRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(              AdjustConsumablesConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(              AdjustDisposablesConfirmRequestData ) \
@@ -1307,7 +1302,7 @@
     /*                                      Pre-Treatment                                    */ \
     ACTION_RECEIVE_SIGNAL(                                    AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_SIGNAL(                             AdjustParametersValidationResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                      AdjustWaterSampleResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                AdjustWaterSampleResultResponseData ) \
     ACTION_RECEIVE_SIGNAL(                               AdjustDisposablesConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                 AdjustDisposablesPrimeResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustPatientConnectionBeginResponseData ) \