Index: sources/model/MModel.h
===================================================================
diff -u -r9048646630717f980a852df54349805ba63773e0 -r08ffb068817ab0bb1c7f2fe2705986142ac68601
--- sources/model/MModel.h	(.../MModel.h)	(revision 9048646630717f980a852df54349805ba63773e0)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 08ffb068817ab0bb1c7f2fe2705986142ac68601)
@@ -94,8 +94,8 @@
 #include "MAdjustHDServiceModeResponse.h"
 #include "MAdjustHDServiceDatesResponse.h"
 #include "MAdjustDGServiceDatesResponse.h"
-#include "MAdjustHDDateTimeResponse.h"
-#include "MAdjustDGDateTimeResponse.h"
+#include "MAdjustTDDateTimeResponse.h"
+#include "MAdjustDDDateTimeResponse.h"
 #include "MDuetRoWaterDG.h"
 #include "MAdjustHDInstitutionalRecordResponse.h"
 
@@ -461,8 +461,8 @@
     REGISTER_METATYPE(                                              AdjustVersionsRequestData ) \
     REGISTER_METATYPE(                                           AdjustServiceModeRequestData ) \
     REGISTER_METATYPE(                                          AdjustServiceDatesRequestData ) \
-    REGISTER_METATYPE(                                            AdjustHDDateTimeRequestData ) \
-    REGISTER_METATYPE(                                            AdjustDGDateTimeRequestData ) \
+    REGISTER_METATYPE(                                            AdjustTDDateTimeRequestData ) \
+    REGISTER_METATYPE(                                            AdjustDDDateTimeRequestData ) \
     REGISTER_METATYPE(                                         AdjustHDAlarmVolumeRequestData ) \
                                                                                                 \
     /* Response     */                                                                          \
@@ -506,8 +506,8 @@
     REGISTER_METATYPE(                                          AdjustServiceModeResponseData ) \
     REGISTER_METATYPE(                                       AdjustServiceDatesHDResponseData ) \
     REGISTER_METATYPE(                                       AdjustServiceDatesDGResponseData ) \
-    REGISTER_METATYPE(                                           AdjustHDDateTimeResponseData ) \
-    REGISTER_METATYPE(                                           AdjustDGDateTimeResponseData ) \
+    REGISTER_METATYPE(                                           AdjustTDDateTimeResponseData ) \
+    REGISTER_METATYPE(                                           AdjustDDDateTimeResponseData ) \
     /*                                      Alarms - Active List Response                    */ \
     REGISTER_METATYPE(                                            AlarmActiveListResponseData ) \
     REGISTER_METATYPE(                                        AdjustHDAlarmVolumeResponseData ) \
@@ -663,8 +663,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustServiceModeResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustServiceDatesHDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustServiceDatesDGResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustHDDateTimeResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustDGDateTimeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustTDDateTimeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustDDDateTimeResponseData ) \
     /*                                      Alarms - Active List Response                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AlarmActiveListResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 AdjustHDAlarmVolumeResponseData ) \
@@ -698,8 +698,8 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       AdjustVersionsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustServiceModeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                   AdjustServiceDatesRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustHDDateTimeRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustDGDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustTDDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustDDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustHDAlarmVolumeRequestData ) \
     /*                                     Post-Treatment                                    */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,     AdjustPatientDisconnectionNotifyRequestData ) \
@@ -883,8 +883,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustServiceModeResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustServiceDatesHDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustServiceDatesDGResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustHDDateTimeResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustDGDateTimeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustTDDateTimeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustDDDateTimeResponseData ) \
     /*                                      Alarms - Active List Response                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             AlarmActiveListResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         AdjustHDAlarmVolumeResponseData ) \
@@ -941,8 +941,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustVersionsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustServiceModeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                           AdjustServiceDatesRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustHDDateTimeRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustDGDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustTDDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustDDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustHDAlarmVolumeRequestData ) \
     /*                                      Alarms                                           */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AlarmSilenceRequestData ) \
@@ -1002,8 +1002,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustVersionsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustServiceModeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                    AdjustServiceDatesRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustHDDateTimeRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustDGDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustTDDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustDDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustHDAlarmVolumeRequestData ) \
     /*                                      Alarms                                           */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AlarmSilenceRequestData ) \
@@ -1063,8 +1063,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustVersionsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustServiceModeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                    AdjustServiceDatesRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustHDDateTimeRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustDGDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustTDDateTimeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustDDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustHDAlarmVolumeRequestData ) \
     /*                                      Alarms                                           */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AlarmSilenceRequestData ) \
@@ -1210,8 +1210,8 @@
     ACTION_RECEIVE_SIGNAL(                                      AdjustServiceModeResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustServiceDatesHDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustServiceDatesDGResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                       AdjustHDDateTimeResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                       AdjustDGDateTimeResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                       AdjustTDDateTimeResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                       AdjustDDDateTimeResponseData ) \
     /*                                      Alarms                                           */ \
     ACTION_RECEIVE_SIGNAL(                                        AlarmActiveListResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                    AdjustHDAlarmVolumeResponseData ) \