Index: DGDefs.h
===================================================================
diff -u -rb47892b0bd4a7b1e4805c05ed08b9c6e01b57fb9 -r83013a57b0b7a91f650a889fb096b4141cd26f00
--- DGDefs.h	(.../DGDefs.h)	(revision b47892b0bd4a7b1e4805c05ed08b9c6e01b57fb9)
+++ DGDefs.h	(.../DGDefs.h)	(revision 83013a57b0b7a91f650a889fb096b4141cd26f00)
@@ -237,22 +237,43 @@
     NUM_OF_DG_CHEM_DISINFECT_STATES                     ///< Number of chemical disinfect mode states
 };
 typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;  ///< Type for DG chemical disinfect states enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup DGServiceMode
+ *  @{
+ */
+
+/// Enumeration of service mode states.
+enum DG_Service_States
+{
+    DG_SERVICE_STATE_START = 0,                     ///< Start service mode state
+    NUM_OF_DG_SERVICE_STATES                        ///< Number of service mode states
+};
+typedef enum DG_Service_States DG_SERVICE_STATE_T;  ///< Type for DG service states enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup DGCommand
+ *  @{
+ */
+
+/// Enumeration of available DG commands.
+enum DG_Command
+{
+    DG_CMD_SWITCH_RESERVOIR = 0,        ///< Command to request DG switch reservoirs
+    DG_CMD_START_DRAIN = 1,             ///< Command to request DG to start drain
+    DG_CMD_STOP_DRAIN = 2,              ///< Command to request DG to stop drain
+    DG_CMD_START_FILL = 3,              ///< Command to request DG to start fill
+    DG_CMD_STOP_FILL = 4,               ///< Command to request DG to stop fill
+    DG_CMD_START_TRIMMER_HEATER = 5,    ///< Command to request DG to start trimmer heater
+    DG_CMD_STOP_TRIMMER_HEATER = 6,     ///< Command to request DG to stop trimmer heater
+    NUM_OF_DG_COMMANDS                  ///< Number of DG commands
+};
+typedef enum DG_Command DG_COMMAND_T;   ///< Type for DG commands enumeration
 
 /**@}*/
 
-/**
- *  @addtogroup DGServiceMode
- *  @{
- */
-
-/// Enumeration of service mode states.
-enum DG_Service_States
-{
-    DG_SERVICE_STATE_START = 0,                     ///< Start service mode state
-    NUM_OF_DG_SERVICE_STATES                        ///< Number of service mode states
-};
-typedef enum DG_Service_States DG_SERVICE_STATE_T;  ///< Type for DG service states enumeration
-
-/**@}*/
-
 #endif
Index: HDDefs.h
===================================================================
diff -u -r73790ceebd6b833ab97bec4d9098b40009ebf2b4 -r83013a57b0b7a91f650a889fb096b4141cd26f00
--- HDDefs.h	(.../HDDefs.h)	(revision 73790ceebd6b833ab97bec4d9098b40009ebf2b4)
+++ HDDefs.h	(.../HDDefs.h)	(revision 83013a57b0b7a91f650a889fb096b4141cd26f00)
@@ -132,7 +132,6 @@
     HD_PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
     HD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self tests dry-run state
     HD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime both blood and dialysate circuits state
-    HD_PRE_TREATMENT_SELF_TEST_WET_STATE,                                   ///< Self tests wet-run state
     HD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
     HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
     NUM_OF_HD_PRE_TREATMENT_STATES                                          ///< Number of pre-treatment mode states
@@ -157,6 +156,7 @@
     HD_PRIME_DIALYSATE_DIALYZER_STATE,                                      ///< Dialysate dialyzer fluid path state
     HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE,                             ///< Wait for reservoir 2 fill complete
     HD_PRIME_DIALYSATE_BYPASS_STATE,                                        ///< Dialysate bypass fluid path state
+    HD_PRIME_WET_SELF_TESTS_STATE,                                          ///< Perform wet self-tests after priming complete
     NUM_OF_HD_PRIME_STATES                                                  ///< Number of prime sub-mode states
 };
 typedef enum HD_Pre_Treatment_Prime_States HD_PRE_TREATMENT_PRIME_STATE_T;  ///< Type for HD pre-treatment prime sub-mode states enumeration
Index: MsgDefs.h
===================================================================
diff -u -rb47892b0bd4a7b1e4805c05ed08b9c6e01b57fb9 -r83013a57b0b7a91f650a889fb096b4141cd26f00
--- MsgDefs.h	(.../MsgDefs.h)	(revision b47892b0bd4a7b1e4805c05ed08b9c6e01b57fb9)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 83013a57b0b7a91f650a889fb096b4141cd26f00)
@@ -267,13 +267,13 @@
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;       ///< Type for settings change rejection reason codes enumeration
 
-/// Enumeration of command request rejection reason codes
+/// Enumeration of HD to DG command request rejection reason codes
 enum Cmd_Request_Reject_Reasons
 {
-    CMD_REQUEST_REJECT_REASON_NONE = 0,                                 ///< Used when there is no rejection
-    CMD_REQUEST_REJECT_REASON_INVALID_MODE = 1,                         ///< Command is not allowed in the current operating mode
-    CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER = 2,                    ///< Command parameter is not valid
-    NUM_OF_CMD_REQUEST_REJECT_REASONS                                   ///< Number of command request reject codes
+    DG_CMD_REQUEST_REJECT_REASON_NONE = 0,                                 ///< Used when there is no rejection
+    DG_CMD_REQUEST_REJECT_REASON_INVALID_MODE = 1,                         ///< Command is not allowed in the current operating mode
+    DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER = 2,                    ///< Command parameter is not valid
+    NUM_OF_DG_CMD_REQUEST_REJECT_REASONS                                   ///< Number of command request reject codes
 };
 typedef enum Cmd_Request_Reject_Reasons CMD_REQUEST_REJECT_REASON_CODE_T;       ///< Type for command request rejection reason codes enumeration