Index: AlarmDefs.h
===================================================================
diff -u -r6e98f4ef15d782d3353cce39580ad7f371d30edf -r33d21a82caa07ab8e0c0e428cab35a38420d0303
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 6e98f4ef15d782d3353cce39580ad7f371d30edf)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 33d21a82caa07ab8e0c0e428cab35a38420d0303)
@@ -298,7 +298,7 @@
     ALARM_ID_FW_RESERVED_266                                        = 266,  ///< FW reserved for use
     ALARM_ID_FW_RESERVED_267                                        = 267,  ///< FW reserved for use
     ALARM_ID_FW_RESERVED_268                                        = 268,  ///< FW reserved for use
-    ALARM_ID_FW_RESERVED_269                                     = 269,  ///< TD processor is in Disinfect Flush mode
+    ALARM_ID_FW_RESERVED_269                                        = 269,  ///< TD processor is in Disinfect Flush mode
     ALARM_ID_FW_RESERVED_270                                        = 270,  ///< FW reserved for use
     ALARM_ID_FW_RESERVED_271                                        = 271,  ///< FW reserved for use
     ALARM_ID_FW_RESERVED_272                                        = 272,  ///< FW reserved for use
Index: DDDefs.h
===================================================================
diff -u -r6e98f4ef15d782d3353cce39580ad7f371d30edf -r33d21a82caa07ab8e0c0e428cab35a38420d0303
--- DDDefs.h	(.../DDDefs.h)	(revision 6e98f4ef15d782d3353cce39580ad7f371d30edf)
+++ DDDefs.h	(.../DDDefs.h)	(revision 33d21a82caa07ab8e0c0e428cab35a38420d0303)
@@ -294,12 +294,12 @@
 /// Enumeration of available DD commands.
 enum DD_Command
 {
-    DD_CMD_NONE = 0,                           ///< Not a command
-    DD_CMD_START_FLUSH,                            ///< Command to request DD to start flush
-    DD_CMD_START_HEAT_DISINFECT_ACTIVE_COOL,       ///< Command to request DD to start heat disinfect with active cool
-    NUM_OF_DD_COMMANDS                         ///< Number of DD commands
+    DD_CMD_NONE = 0,                                ///< Not a command
+    DD_CMD_START_FLUSH,                             ///< Command to request DD to start flush
+    DD_CMD_START_HEAT_DISINFECT_ACTIVE_COOL,        ///< Command to request DD to start heat disinfect with active cool
+    NUM_OF_DD_COMMANDS                              ///< Number of DD commands
 };
-typedef enum DD_Command DD_COMMAND_T;          ///< Type for DD commands enumeration
+typedef enum DD_Command DD_COMMAND_T;               ///< Type for DD commands enumeration
 
 /// Enumeration of general commands to DD sub-system.
 enum DD_General_Commands
Index: MsgDefs.h
===================================================================
diff -u -r6e98f4ef15d782d3353cce39580ad7f371d30edf -r33d21a82caa07ab8e0c0e428cab35a38420d0303
--- MsgDefs.h	(.../MsgDefs.h)	(revision 6e98f4ef15d782d3353cce39580ad7f371d30edf)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 33d21a82caa07ab8e0c0e428cab35a38420d0303)
@@ -264,13 +264,13 @@
     MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE_RESPONSE = 0x126,                       ///< DD NVM Set Bicarbonate Concentrate Calibration Record Response
     MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR_RESPONSE = 0x127,                             ///< DD NVM Set Accelerometer Sensor Calibration Record Response.
     MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0x128,                        ///< DD NVM Set Blood Leak Sensor Calibration Record Response.
-    MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD = 0x129,
-    MSG_ID_TD_DD_USAGE_INFO_REQUEST = 0x12A,
-    MSG_ID_TD_DD_FLUSH_REQUEST = 0x12B,
-    MSG_ID_TD_DD_HEAT_DISINFECT_REQUEST = 0x12C,
-    MSG_ID_TD_DD_HEAT_DISINFECT_ACTIVE_COOL_REQUEST = 0x12D,
-    MSG_ID_UI_DISINFECT_REQUEST = 0x7F,                                             ///< UI disinfection selection
-    MSG_ID_TD_DISINFECT_RESPONSE = 0x80,                                ///< HD response to disinfection selection
+    MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD = 0x129,                             ///< TD request for DD service record information.
+    MSG_ID_TD_DD_USAGE_INFO_REQUEST = 0x12A,                                         ///< TD request for DD usage information.
+    MSG_ID_TD_DD_FLUSH_REQUEST = 0x12B,                                              ///< TD request to start DD flush mode.
+    MSG_ID_TD_DD_HEAT_DISINFECT_REQUEST = 0x12C,                                     ///< TD request to start DD heat disinfect mode.
+    MSG_ID_TD_DD_HEAT_DISINFECT_ACTIVE_COOL_REQUEST = 0x12D,                         ///< TD request to start DD heat disinfect mode with active cooling.
+    MSG_ID_UI_DISINFECT_REQUEST = 0xCE,                                              ///< UI request to start the selected disinfection or flush operation.
+    MSG_ID_TD_DISINFECT_RESPONSE = 0xCF,                                             ///< TD response to the UI disinfection selection request.
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID