Index: DDDefs.h
===================================================================
diff -u -r8f3b6abb1cb63614aa6ba0de73e108d4d8aaf580 -r90a88be33ec7a2bb9d251562348fe85df884c5a0
--- DDDefs.h	(.../DDDefs.h)	(revision 8f3b6abb1cb63614aa6ba0de73e108d4d8aaf580)
+++ DDDefs.h	(.../DDDefs.h)	(revision 90a88be33ec7a2bb9d251562348fe85df884c5a0)
@@ -21,31 +21,25 @@
 // ********** public definitions **********
 
 /**
- *  @addtogroup DGOperationModes
+ *  @addtogroup DDOperationModes
  *  @{
  */
 
-/// Enumeration of operation modes.  These are in order of priority (highest to lowest).
-enum DG_Op_Modes
+/// Enumeration of DD operation modes.  These are in order of priority (highest to lowest).
+enum DD_Op_Modes
 {
-    DG_MODE_FAUL = 0,                   ///< Fault mode
-    DG_MODE_SERV,                       ///< Service mode
-    DG_MODE_INIT,                       ///< Initialization & POST mode
-    DG_MODE_STAN,                       ///< Standby mode - connected to HD
-    DG_MODE_SOLO,                       ///< Standby Solo mode - no HD connected
-    DG_MODE_GENE,                       ///< Generation idle mode
-    DG_MODE_FILL,                       ///< Fill mode
-    DG_MODE_DRAI,                       ///< Drain mode
-    DG_MODE_FLUS,                       ///< Flush mode
-    DG_MODE_HEAT,                       ///< Heat Disinfect mode
-    DG_MODE_CHEM,                       ///< Chemical Disinfect mode
-    DG_MODE_CHFL,                       ///< Chemical Disinfect Flush mode
-    DG_MODE_HCOL,                       ///< Heat disinfect cooling mode
-    DG_MODE_ROPS,                       ///< RO permeate sample mode
-    DG_MODE_NLEG,                       ///< Not legal - an illegal mode transition occurred
-    NUM_OF_DG_MODES                     ///< Number of DG operation modes
+    DD_MODE_FAUL = 0,                   ///< Fault mode
+    DD_MODE_SERV,                       ///< Service mode
+    DD_MODE_INIT,                       ///< Initialization & POST mode
+    DD_MODE_STAN,                       ///< Standby mode
+    DD_MODE_GEND,                       ///< Generate Dialysate mode
+    DD_MODE_HEAT,                       ///< Heat Disinfect mode
+    DD_MODE_HCOL,                       ///< Heat Disinfect cooling mode
+    DD_MODE_ROPS,                       ///< RO permeate sample mode
+    DD_MODE_NLEG,                       ///< Not legal - an illegal mode transition occurred
+    NUM_OF_DD_MODES                     ///< Number of DG operation modes
 };
-typedef enum DG_Op_Modes DG_OP_MODE_T;  ///< Type for DG operation modes enumeration
+typedef enum DD_Op_Modes DD_OP_MODE_T;  ///< Type for DD operation modes enumeration
 
 /**@}*/
 
@@ -540,35 +534,13 @@
  *  @{
  */
 
-/// Enumeration of available DG commands.
-enum DG_Command
+/// Enumeration of available DD commands.
+enum DD_Command
 {
-    DG_CMD_NONE = 0,                           ///< Not a command
-    DG_CMD_SWITCH_RESERVOIR = 1,               ///< Command to request DG switch reservoirs
-    DG_CMD_START_DRAIN = 2,                    ///< Command to request DG to start drain
-    DG_CMD_STOP_DRAIN = 3,                     ///< Command to request DG to stop drain
-    DG_CMD_START_FILL = 4,                     ///< Command to request DG to start fill
-    DG_CMD_STOP_FILL = 5,                      ///< Command to request DG to stop fill
-    DG_CMD_START_TRIMMER_HEATER = 6,           ///< Command to request DG to start trimmer heater
-    DG_CMD_STOP_TRIMMER_HEATER = 7,            ///< Command to request DG to stop trimmer heater
-    DG_CMD_VALVE_SETTING = 8,                  ///< Command to request DG to change valve settings
-    DG_CMD_SAMPLE_WATER = 9,                   ///< Command to request DG to sample water
-    DG_CMD_START_FLUSH = 10,                   ///< Command to request DG to start flush
-    DG_CMD_STOP_FLUSH = 11,                    ///< Command to request DG to stop flush
-    DG_CMD_START_HEAT_DISINFECT = 12,          ///< Command to request DG to start heat disinfect
-    DG_CMD_STOP_HEAT_DISINFECT = 13,           ///< Command to request DG to stop heat disinfect
-    DG_CMD_START_CHEM_DISINFECT = 14,          ///< Command to request DG to start chemical disinfect
-    DG_CMD_STOP_CHEM_DISINFECT = 15,           ///< Command to request DG to stop chemical disinfect
-    DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16,    ///< Command to request DG to send the concentrate pumps mixing ratios
-    DG_CMD_START_CHEM_DISINFECT_FLUSH = 17,    ///< Command to request DG to start chemical disinfect
-    DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18,     ///< Command to request DG to stop chemical disinfect
-    DG_CMD_START_RO_PERMEATE_SAMPLE = 19,      ///< Command to request DG to start RO permeate sample mode
-    DG_CMD_STOP_RO_PERMEATE_SAMPLE = 20,       ///< Command to request DG to stop RO permeate sample mode
-    DG_CMD_STOP_ACTIVE_COOL = 21,              ///< Command to request DG to stop active cool mode
-    DG_CMD_PARK_CONCENTRATE_PUMPS = 22,        ///< Command to request DG to park concentrate pumps
-    NUM_OF_DG_COMMANDS                         ///< Number of DG commands
+    DD_CMD_NONE = 0,                           ///< Not a command
+    NUM_OF_DD_COMMANDS                         ///< Number of DD commands
 };
-typedef enum DG_Command DG_COMMAND_T;   ///< Type for DG commands enumeration
+typedef enum DD_Command DD_COMMAND_T;          ///< Type for DD commands enumeration
 
 /// Enumeration of sample water command parameters.
 enum Sample_Water_Commands