Index: sources/model/MModel.h
===================================================================
diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c
--- sources/model/MModel.h	(.../MModel.h)	(revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c)
@@ -96,7 +96,7 @@
 #include "MAdjustDGServiceDatesResponse.h"
 #include "MAdjustTDDateTimeResponse.h"
 #include "MAdjustDDDateTimeResponse.h"
-#include "MDuetRoWaterDG.h"
+#include "MAdjustRoWaterModeResponse.h"
 #include "MAdjustTDInstitutionalRecordResponse.h"
 #include "MTDInstitutionalRecordResponse.h"
 #include "MAdjustTDAdvancedInstitutionalRecordResponse.h"
@@ -314,9 +314,8 @@
     REGISTER_METATYPE(                                                     DuetConfirmTDiData ) \
     REGISTER_METATYPE(                                                     DuetConfirmUIrData ) \
     /*                                      RO Water Mode                                    */ \
-    REGISTER_METATYPE(                                                 DuetRoWaterStatDGqData ) \
-    REGISTER_METATYPE(                                                 DuetRoWaterModeUIiData ) \
-    REGISTER_METATYPE(                                                 DuetRoWaterModeDGrData ) \
+    REGISTER_METATYPE(                                           AdjustRoWaterModeRequestData ) \
+    REGISTER_METATYPE(                                          AdjustRoWaterModeResponseData ) \
     /*                                      POST                                             */ \
     REGISTER_METATYPE(                                                 HDPostSingleResultData ) \
     REGISTER_METATYPE(                                                  HDPostFinalResultData ) \
@@ -583,8 +582,7 @@
     /*                                      CONFIRM                                          */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DuetConfirmTDiData ) \
     /*                                      RO Water Mode                                    */ \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          DuetRoWaterStatDGqData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          DuetRoWaterModeDGrData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustRoWaterModeResponseData ) \
     /*                                      POST                                             */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          HDPostSingleResultData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           HDPostFinalResultData ) \
@@ -740,7 +738,7 @@
     /*                                     CONFIRM                                           */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                              DuetConfirmUIrData ) \
     /*                                      RO Water Mode                                    */ \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                          DuetRoWaterModeUIiData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustRoWaterModeRequestData ) \
     /*                                     POST                                              */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustUIPostFinalResultRequestData ) \
                                                                                                 \
@@ -831,8 +829,7 @@
     /*                                      CONFIRM                                          */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DuetConfirmTDiData ) \
     /*                                      RO Water Mode                                    */ \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                  DuetRoWaterStatDGqData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                  DuetRoWaterModeDGrData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustRoWaterModeResponseData ) \
     /*                                      POST                                             */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                  HDPostSingleResultData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                   HDPostFinalResultData ) \
@@ -990,7 +987,7 @@
     /*                                     CONFIRM                                           */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                      DuetConfirmUIrData ) \
     /*                                      RO Water Mode                                    */ \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                  DuetRoWaterModeUIiData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustRoWaterModeRequestData ) \
     /*                                     POST                                              */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                      AdjustUIPostFinalResultRequestData ) \
     /*                                     Post-Treatment                                    */ \
@@ -1064,7 +1061,7 @@
     /*                                     CONFIRM                                           */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                               DuetConfirmUIrData ) \
     /*                                     RO Water Mode                                     */ \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                           DuetRoWaterModeUIiData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustRoWaterModeRequestData ) \
     /*                                     POST                                              */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(               AdjustUIPostFinalResultRequestData ) \
     /*                                     Post-Treatment                                    */ \
@@ -1138,7 +1135,7 @@
     /*                                     CONFIRM                                           */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                               DuetConfirmUIrData ) \
     /*                                     RO Water Mode                                     */ \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                           DuetRoWaterModeUIiData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustRoWaterModeRequestData ) \
     /*                                     POST                                              */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustUIPostFinalResultRequestData ) \
     /*                                     Post-Treatment                                    */ \
@@ -1212,8 +1209,7 @@
     /*                                      CONFIRM                                          */ \
     ACTION_RECEIVE_SIGNAL(                                                 DuetConfirmTDiData ) \
     /*                                      RO Water Mode                                    */ \
-    ACTION_RECEIVE_SIGNAL(                                             DuetRoWaterStatDGqData ) \
-    ACTION_RECEIVE_SIGNAL(                                             DuetRoWaterModeDGrData ) \
+    ACTION_RECEIVE_SIGNAL(                                      AdjustRoWaterModeResponseData ) \
     /*                                      POST                                             */ \
     ACTION_RECEIVE_SIGNAL(                                             HDPostSingleResultData ) \
     ACTION_RECEIVE_SIGNAL(                                              HDPostFinalResultData ) \