Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rfd7a047d5520d16d4621aaddcb008467ad6ee5b5 -rf1e0e3ab13b12c450d52668608c92b33aa1d2c91
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision fd7a047d5520d16d4621aaddcb008467ad6ee5b5)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision f1e0e3ab13b12c450d52668608c92b33aa1d2c91)
@@ -480,7 +480,6 @@
     case Gui::GuiActionType::ID_HDAirBubbleData                     : ok = notify<Model::MHDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData                   ); break;
     case Gui::GuiActionType::ID_TDVoltageData                       : ok = notify<Model::MTDVoltageData                             >(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData                     ); break;
     case Gui::GuiActionType::ID_TDAirTrapData                       : ok = notify<Model::MTDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_TDAirTrapData                     ); break;
-    case Gui::GuiActionType::ID_TDBloodPumpData                     : ok = notify<Model::MTDBloodPumpData                           >(vMessage, vData, Gui::GuiActionType::ID_TDBloodPumpData                   ); break;
     case Gui::GuiActionType::ID_TDValvesData                        : ok = notify<Model::MTDValvesData                              >(vMessage, vData, Gui::GuiActionType::ID_TDValvesData                      ); break;
     case Gui::GuiActionType::ID_TDBatteryData                       : ok = notify<Model::MTDBatteryData                             >(vMessage, vData, Gui::GuiActionType::ID_TDBatteryData                     ); break;
     case Gui::GuiActionType::ID_TDSwitchesData                      : ok = notify<Model::MTDSwitchesData                            >(vMessage, vData, Gui::GuiActionType::ID_TDSwitchesData                    ); break;
@@ -518,6 +517,8 @@
     case Gui::GuiActionType::ID_Recirculate                         : ok = notify<Model::MTreatmentRecirculate                      >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                       ); break;
     case Gui::GuiActionType::ID_BloodPrime                          : ok = notify<Model::MTreatmentBloodPrime                       >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                        ); break;
     case Gui::GuiActionType::ID_TreatmentStop                       : ok = notify<Model::MTreatmentStop                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop                     ); break;
+    case Gui::GuiActionType::ID_Ultrafiltration                     : ok = notify<Model::MTreatmentUltrafiltration                  >(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration                   ); break;
+    case Gui::GuiActionType::ID_TreatmentParametersSetPointData     : ok = notify<Model::MTreatmentParametersSetPoint               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData   ); break;
     // ----- In-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustDurationRsp                   : ok = notify<Model::MAdjustDurationResponse                    >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustBloodDialysateRsp             : ok = notify<Model::MAdjustBloodDialysateResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp           ); break;
@@ -586,18 +587,19 @@
 
     // DG data messages
     case Gui::GuiActionType::ID_DGROPumpData                : ok = notify<Model::MDGROPump                      >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData                  ); break;
-    case Gui::GuiActionType::ID_DGPressuresData             : ok = notify<Model::MDGPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData               ); break;
+    case Gui::GuiActionType::ID_DDPressuresData             : ok = notify<Model::MDGPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData               ); break;
     case Gui::GuiActionType::ID_DGDrainPumpData             : ok = notify<Model::MDGDrainPump                   >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData               ); break;
     case Gui::GuiActionType::ID_DGOperationModeData         : ok = notify<Model::MDGOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData           ); break;
     case Gui::GuiActionType::ID_DGReservoirData             : ok = notify<Model::MDGReservoir                   >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData               ); break;
     case Gui::GuiActionType::ID_DGValvesStatesData          : ok = notify<Model::MDGValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData            ); break;
-    case Gui::GuiActionType::ID_DGHeatersData               : ok = notify<Model::MDGHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData                 ); break;
+    case Gui::GuiActionType::ID_DDHeatersData               : ok = notify<Model::MDGHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
     case Gui::GuiActionType::ID_DGLoadCellReadingsData      : ok = notify<Model::MDGLoadCellReadings            >(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData        ); break;
-    case Gui::GuiActionType::ID_DGTemperaturesData          : ok = notify<Model::MDGTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData            ); break;
+    case Gui::GuiActionType::ID_DDTemperaturesData          : ok = notify<Model::MDGTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData            ); break;
     case Gui::GuiActionType::ID_DDDebugText                 : ok = notify<Model::MDGDebugText                   >(vMessage, vData, Gui::GuiActionType::ID_DDDebugText                   ); break;
     case Gui::GuiActionType::ID_DGGeneralEvent              : ok = notify<Model::MDGGeneralEvent                >(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent                ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData         : ok = notify<Model::MDGAccelerometer               >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData           ); break;
-    case Gui::GuiActionType::ID_DGConductivityData          : ok = notify<Model::MDGConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData            ); break;
+    case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
+    case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
     // ----- Datum - Pre-Treatment progress
     case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
     // DG Response Messages