Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -rb5a7852d2637f7969680fbd3d2c821a6a74a8ccd
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision b5a7852d2637f7969680fbd3d2c821a6a74a8ccd)
@@ -233,6 +233,8 @@
 
     case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData                  ); break;
     case Gui::GuiActionType::ID_AdjustVersionsReq                   : INTERPRET_RECVD_MT_MESSAGE(AdjustVersionsRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustHDDateTimeReq                 : INTERPRET_RECEIVED_MESSAGE(AdjustHDDateTimeRequestData                ); break;
+    case Gui::GuiActionType::ID_AdjustDGDateTimeReq                 : INTERPRET_RECEIVED_MESSAGE(AdjustDGDateTimeRequestData                ); break;
     // in-treatment
     case Gui::GuiActionType::ID_AdjustDurationReq                   : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData                  ); break;
     case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData            ); break;
@@ -249,9 +251,9 @@
     case Gui::GuiActionType::ID_AdjustRecirculateReq                : INTERPRET_RECEIVED_MESSAGE(AdjustRecirculateRequestData               ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndReq               : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentEndRequestData              ); break;
     // pre-Treatment
-    case Gui::GuiActionType::ID_StartTreatmentReq                   : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData                  ); break;
-    case Gui::GuiActionType::ID_ConfirmTreatmentReq                 : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData                ); break;
-    case Gui::GuiActionType::ID_CreateTreatmentReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData       ); break;
+    case Gui::GuiActionType::ID_TreatmentStartReq                   : INTERPRET_RECEIVED_MESSAGE(TreatmentStartRequestData              ); break;
+    case Gui::GuiActionType::ID_TreatmentConfirmReq                 : INTERPRET_RECEIVED_MESSAGE(TreatmentConfirmRequestData            ); break;
+    case Gui::GuiActionType::ID_TreatmentCreateReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData   ); break;
     // alarms
     case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                    ); break;
     case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData                 ); break;
@@ -343,7 +345,7 @@
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                                     break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_PowerOff                        : ok = notify<Model::MPowerOff                              >(vMessage, vData, Gui::GuiActionType::ID_PowerOff                      ); break;
     case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");                       break; // TODO : implement notify<>()
-    case Gui::GuiActionType::ID_CreateTreatmentRsp              : ok = notify<Model::MTreatmentParametersResponse           >(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp            ); break;
+    case Gui::GuiActionType::ID_TreatmentCreateRsp              : ok = notify<Model::MTreatmentParametersResponse           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentCreateRsp            ); break;
 
     // Adjustment Response Messages
     case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp             ); break;
@@ -357,12 +359,13 @@
     case Gui::GuiActionType::ID_AdjustRecirculateRsp            : ok = notify<Model::MAdjustRecirculateResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp          ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndRsp           : ok = notify<Model::MAdjustTreatmentEndResponse            >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp         ); break;
     case Gui::GuiActionType::ID_AdjustHDVersionsRsp             : ok = notify<Model::MAdjustHDVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp    ); break;
+    case Gui::GuiActionType::ID_AdjustHDDateTimeRsp             : ok = notify<Model::MAdjustHDDateTimeResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp    ); break;
 
     // these need to be standard and use notify as well
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
 
-    case Gui::GuiActionType::ID_StartTreatmentRsp               : ok = notify<Model::MStartTreatmentResponse                >(vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp             ); break;
+    case Gui::GuiActionType::ID_TreatmentStartRsp               : ok = notify<Model::MTreatmentStartResponse>      (vMessage, vData, Gui::GuiActionType::ID_TreatmentStartRsp      ); break;
 
     // Alarms
     case Gui::GuiActionType::ID_AlarmStatus                     : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                   ); break;
@@ -417,7 +420,9 @@
 
     // DG Response Messages
     case Gui::GuiActionType::ID_AdjustDGVersionsRsp     : ok = notify<Model::MAdjustDGVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp    ); break;
+    case Gui::GuiActionType::ID_AdjustDGDateTimeRsp     : ok = notify<Model::MAdjustDGDateTimeResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp    ); break;
 
+
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default: