Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r2bef7b8a25a76a4597aa833955c57fd1c4884de7
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ccba568494c6b7214116f818a0ac89d0fa3ba81b)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7)
@@ -69,14 +69,14 @@
             ID_Acknow                                   = 0xFFFF,
             ID_AcknowGeneric                            = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
 
-            ID_HDDebugText                              = 0xF1FF,
-            ID_DGDebugText                              = 0xF2FF,
+            ID_TDDebugText                              = 0xF1FF,
+            ID_DDDebugText                              = 0xF2FF,
 
             ID_HDGeneralEvent                           = 0xA400,
             ID_DGGeneralEvent                           = 0xA500,
 
             ID_DGCheckIn                                = 0x0600,
-            ID_KeepAlive                                = 0x0700,
+            ID_TDCheckIn                                = 0x0700,
 
             // Generic Confirmation
             ID_DuetConfirmHDi                           = 0xBA00, // 186
@@ -321,14 +321,14 @@
         #include "MsgDefs.h"
         Q_ENUM(Request_Reject_Reasons)
 
-        #include "HDDefs.h"
+        #include "TDDefs.h"
         // Confirm
         Q_ENUM(Generic_Confirm_Id)
         Q_ENUM(Generic_Confirm_Command)
         //
-        Q_ENUM(HD_POST_States)
-        Q_ENUM(HD_Op_Modes)
-        Q_ENUM(HD_Standby_States)
+        Q_ENUM(TD_POST_States)
+        Q_ENUM(TD_Op_Modes)
+        Q_ENUM(TD_Standby_States)
         // Treatment
         Q_ENUM(Treatment_States)
         // Dialysis
@@ -357,32 +357,29 @@
         // Treatment Stop
         Q_ENUM(Treatment_Stop_States)
         // Pre-Treatment SubMode
-        Q_ENUM(HD_Pre_Treatment_Mode_States)
+        Q_ENUM(TD_Pre_Treatment_Mode_States)
         // Pre-Treatment Water Sample
-        Q_ENUM(HD_Pre_Treatment_Sample_Water_States)
+        Q_ENUM(TD_Pre_Treatment_Sample_Water_States)
         Q_ENUM(Requested_Sample_Water_User_Actions)
         // Pre-Treatment Self Test Consumable
-        Q_ENUM(HD_Pre_Treatment_Consumable_Self_Test_States)
+        Q_ENUM(TD_Pre_Treatment_Consumable_Self_Test_States)
         // Pre-Treatment Self Test No Cartridge
-        Q_ENUM(HD_Pre_Treatment_No_Cart_Self_Tests_States)
+        Q_ENUM(TD_Pre_Treatment_No_Cart_Self_Tests_States)
         // Pre-Treatment Self Test Dry
-        Q_ENUM(HD_Pre_Treatment_Dry_Self_Tests_States)
+        Q_ENUM(TD_Pre_Treatment_Dry_Self_Tests_States)
         // Pre-Treatment Prime
-        Q_ENUM(HD_Pre_Treatment_Prime_States)
+        Q_ENUM(TD_Pre_Treatment_Prime_States)
         // Pre-Treatment Recirculate
-        Q_ENUM(HD_Pre_Treatment_Recirc_States)
+        Q_ENUM(TD_Pre_Treatment_Recirc_States)
         // Post-Treatment SubMode
-        Q_ENUM(HD_Post_Treatment_Mode_States)
+        Q_ENUM(TD_Post_Treatment_Mode_States)
 
         // Disinfection
 
-        #include "DGDefs.h"
-        Q_ENUM(DG_POST_States)
-        Q_ENUM(DG_Op_Modes)
-        Q_ENUM(DG_Disinfect_States)
-        Q_ENUM(DG_Flush_UI_States)
-        Q_ENUM(DG_Heat_UI_States)
-        Q_ENUM(DG_Chem_UI_States)
+        #include "DDDefs.h"
+        Q_ENUM(DD_Op_Modes)
+        Q_ENUM(DD_Disinfect_States)
+        Q_ENUM(DD_Heat_UI_States)
     };
 
     // to be able to use the enum as signal/slot parameter
@@ -400,12 +397,12 @@
     typedef GuiActions::Generic_Confirm_Id                              GuiConfirmId;
     typedef GuiActions::Generic_Confirm_Command                         GuiConfirmCommand;
     // POST
-    typedef GuiActions::HD_POST_States                                  GuiHDPOSTStates;
-    typedef GuiActions::DG_POST_States                                  GuiDGPOSTStates;
+    typedef GuiActions::TD_POST_States                                  GuiHDPOSTStates;
+    typedef GuiActions::DD_POST_States                                  GuiDGPOSTStates;
     // operation mode
-    typedef GuiActions::HD_Op_Modes                                     GuiHDOpModes;
-    typedef GuiActions::DG_Op_Modes                                     GuiDGOpModes;
-    typedef GuiActions::HD_Standby_States                               GuiHDStandbyStates;
+    typedef GuiActions::TD_Op_Modes                                     GuiHDOpModes;
+    typedef GuiActions::DD_Op_Modes                                     GuiDGOpModes;
+    typedef GuiActions::TD_Standby_States                               GuiHDStandbyStates;
     // Treatment States
     typedef GuiActions::Treatment_States                                GuiTreatmentStates;
     // Dialysis
@@ -437,29 +434,27 @@
 //  typedef GuiActions::Requested_Treatment_Stop_User_Actions           GuiTreatmentStopCommands; // No user Action defined
 
     // Pre-Treatment SubMode
-    typedef GuiActions::HD_Pre_Treatment_Mode_States                    GuiPreTreatmentStates;
+    typedef GuiActions::TD_Pre_Treatment_Mode_States                    GuiPreTreatmentStates;
     // Pre-Treatment Water Sample
-    typedef GuiActions::HD_Pre_Treatment_Sample_Water_States            GuiPreTreatmentWaterSampleStates;
+    typedef GuiActions::TD_Pre_Treatment_Sample_Water_States            GuiPreTreatmentWaterSampleStates;
     typedef GuiActions::Requested_Sample_Water_User_Actions             GuiPreTreatmentWaterSampleCommands;
     // Pre-Treatment Self Test Consumable
-    typedef GuiActions::HD_Pre_Treatment_Consumable_Self_Test_States    GuiPreTreatmentSelfTestConsumablesStates;
+    typedef GuiActions::TD_Pre_Treatment_Consumable_Self_Test_States    GuiPreTreatmentSelfTestConsumablesStates;
     // Pre-Treatment Self Test No Cartridge
-    typedef GuiActions::HD_Pre_Treatment_No_Cart_Self_Tests_States      GuiPreTreatmentSelfTestNoCartridgeStates;
+    typedef GuiActions::TD_Pre_Treatment_No_Cart_Self_Tests_States      GuiPreTreatmentSelfTestNoCartridgeStates;
     // Pre-Treatment Self Test Dry
-    typedef GuiActions::HD_Pre_Treatment_Dry_Self_Tests_States          GuiPreTreatmentSelfTestDryStates;
+    typedef GuiActions::TD_Pre_Treatment_Dry_Self_Tests_States          GuiPreTreatmentSelfTestDryStates;
     // Pre-Treatment Prime
-    typedef GuiActions::HD_Pre_Treatment_Prime_States                   GuiPreTreatmentPrimeStates;
+    typedef GuiActions::TD_Pre_Treatment_Prime_States                   GuiPreTreatmentPrimeStates;
     // Pre-Treatment Recirculate
-    typedef GuiActions::HD_Pre_Treatment_Recirc_States                  GuiPreTreatmentRecirculateStates;
+    typedef GuiActions::TD_Pre_Treatment_Recirc_States                  GuiPreTreatmentRecirculateStates;
 
     // Post-Treatment SubMode
-    typedef GuiActions::HD_Post_Treatment_Mode_States                   GuiPostTreatmentStates;
+    typedef GuiActions::TD_Post_Treatment_Mode_States                   GuiPostTreatmentStates;
 
     // Disinfection Heat States
-    typedef GuiActions::DG_Disinfect_States                             GuiDisinfectDGStates;
-    typedef GuiActions::DG_Flush_UI_States                              GuiDisinfectDGFlushStates;
-    typedef GuiActions::DG_Heat_UI_States                               GuiDisinfectDGHeatStates;
-    typedef GuiActions::DG_Chem_UI_States                               GuiDisinfectDGChemicalStates;
+    typedef GuiActions::DD_Disinfect_States                             GuiDisinfectDGStates;
+    typedef GuiActions::DD_Heat_UI_States                               GuiDisinfectDGHeatStates;
 
     typedef QMap        <quint32, QString>                              GuiStringIndexMap;
     typedef QPair       <quint32, QString>                              GuiStringIndexMapItem;