Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision d862dfcd402206e33b314c458e41c13b684a4565)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4)
@@ -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_TreatmentSetPointData               : ok = notify<Model::MTreatmentSetPoint                         >(vMessage, vData, Gui::GuiActionType::ID_TreatmentSetPointData             ); 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;
@@ -597,7 +598,8 @@
     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