Index: sources/model/MModel.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/MModel.h	(.../MModel.h)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -160,7 +160,7 @@
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
 #include "MTreatmentAdjustIsolatedUFDurationEditResponse.h"
-#include "MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h"
+#include "MTreatmentAdjustIsolatedUFVolumeEditResponse.h"
 #include "MTreatmentAdjustIsolatedUFConfirmResponse.h"
 #include "MTreatmentAdjustSalineResponse.h"
 #include "MTreatmentAdjustVitalsResponse.h"
@@ -471,7 +471,7 @@
     REGISTER_METATYPE(                                   AdjustUltrafiltrationEditRequestData ) \
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
     REGISTER_METATYPE(                                AdjustIsolatedUFDurationEditRequestData ) \
-    REGISTER_METATYPE(                              AdjustIsolatedUFVolumeGoalEditRequestData ) \
+    REGISTER_METATYPE(                                  AdjustIsolatedUFVolumeEditRequestData ) \
     REGISTER_METATYPE(                                     AdjustIsolatedUFConfirmRequestData ) \
     REGISTER_METATYPE(                                                AdjustSalineRequestData ) \
     REGISTER_METATYPE(                                                AdjustVitalsRequestData ) \
@@ -520,7 +520,7 @@
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                               AdjustIsolatedUFDurationEditResponseData ) \
-    REGISTER_METATYPE(                             AdjustIsolatedUFVolumeGoalEditResponseData ) \
+    REGISTER_METATYPE(                                 AdjustIsolatedUFVolumeEditResponseData ) \
     REGISTER_METATYPE(                                    AdjustIsolatedUFConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
     REGISTER_METATYPE(                                               AdjustVitalsResponseData ) \
@@ -692,7 +692,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustIsolatedUFDurationEditResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      AdjustIsolatedUFVolumeGoalEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustIsolatedUFVolumeEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             AdjustIsolatedUFConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustVitalsResponseData ) \
@@ -742,7 +742,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustIsolatedUFDurationEditRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustIsolatedUFVolumeGoalEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustIsolatedUFVolumeEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustIsolatedUFConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustParametersConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
@@ -935,7 +935,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustIsolatedUFDurationEditResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(              AdjustIsolatedUFVolumeGoalEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustIsolatedUFVolumeEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                     AdjustIsolatedUFConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustVitalsResponseData ) \
@@ -1009,7 +1009,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustIsolatedUFDurationEditRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustIsolatedUFVolumeGoalEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustIsolatedUFVolumeEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                      AdjustIsolatedUFConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustVitalsRequestData ) \
@@ -1082,7 +1082,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustIsolatedUFDurationEditRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustIsolatedUFVolumeGoalEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustIsolatedUFVolumeEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(               AdjustIsolatedUFConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustVitalsRequestData ) \
@@ -1155,7 +1155,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustIsolatedUFDurationEditRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustIsolatedUFVolumeGoalEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustIsolatedUFVolumeEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustIsolatedUFConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
@@ -1309,7 +1309,7 @@
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustIsolatedUFDurationEditResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                         AdjustIsolatedUFVolumeGoalEditResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                             AdjustIsolatedUFVolumeEditResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                AdjustIsolatedUFConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustVitalsResponseData ) \