Index: sources/model/MModel.h
===================================================================
diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319
--- sources/model/MModel.h	(.../MModel.h)	(revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7)
+++ sources/model/MModel.h	(.../MModel.h)	(revision ae1f28a34d323bd6e301450f22525ca3545c9319)
@@ -150,22 +150,22 @@
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
-    /*   Request    */
+    /*   Request    */                                                                          \
     REGISTER_METATYPE(                                        AdjustBloodDialysateRequestData ) \
     REGISTER_METATYPE(                                              AdjustDurationRequestData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationStateRequestData ) \
     REGISTER_METATYPE(                                   AdjustUltrafiltrationEditRequestData ) \
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
     REGISTER_METATYPE(                                                AdjustSalineRequestData ) \
-    REGISTER_METATYPE(                                            AdjustHDVersionsRequestData ) \
-    /*   Response   */
+    REGISTER_METATYPE(                                                AdjustHDVersionsRequest ) \
+    /*   Response   */                                                                          \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
     REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
     REGISTER_METATYPE(                                 AdjustUltrafiltrationStateResponseData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
-    REGISTER_METATYPE(                                           AdjustHDVersionsResponseData )
+    REGISTER_METATYPE(                                               AdjustHDVersionsResponse )
 //===============================================================================//
 #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                        \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   BloodFlowData ) \
@@ -182,7 +182,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentSalineData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDOperationModeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDAccelerometerData ) \
-
+                                                                                                \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    DGROPumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGPressuresData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDrainPumpData ) \
@@ -193,27 +193,27 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          DGLoadCellReadingsData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DGTemperaturesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             DGAccelerometerData ) \
-
+                                                                                                \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
-    /*   Response   */
+    /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustHDVersionsResponseData )
-    /*   Request    */
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustHDVersionsResponse )
+    /*   Request    */                                                                          \
 #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                        \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                 AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       AdjustDurationRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustHDVersionsRequestData )
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustHDVersionsRequest )
 //===============================================================================//
 #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           BloodFlowData ) \
@@ -251,7 +251,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustHDVersionsResponseData )
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustHDVersionsResponse )
 //  /*   Request    */  ---------------------------------------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
@@ -260,7 +260,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustHDVersionsRequestData )
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                   AdjustVersionsRequest )
 //  /*   Request    */  ----------------------- NoEmit --------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT                                          \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
@@ -269,7 +269,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustHDVersionsRequestData )
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                            AdjustVersionsRequest )
 //  /*   Request    */  ----------------------- public --------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC                                          \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustBloodDialysateRequestData ) \
@@ -278,7 +278,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustHDVersionsRequestData )
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                            AdjustVersionsRequest )
 //===============================================================================//
 #define ACTION_RECEIVE_SIGNALS                                                                  \
     ACTION_RECEIVE_SIGNAL(                                                      BloodFlowData ) \
@@ -316,6 +316,6 @@
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                       AdjustHDVersionsResponseData )
+    ACTION_RECEIVE_SIGNAL(                                           AdjustHDVersionsResponse )
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//