Index: MsgDefs.h
===================================================================
diff -u -r185751d3c101bf5df17a176724d732ab447589f0 -r38fca679ac07fa6a16fc4b756aebb4e3f95e207a
--- MsgDefs.h	(.../MsgDefs.h)	(revision 185751d3c101bf5df17a176724d732ab447589f0)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 38fca679ac07fa6a16fc4b756aebb4e3f95e207a)
@@ -94,8 +94,8 @@
     MSG_ID_TD_ULTRAFILTRATION_DATA = 0x3E,                                          ///< TD ultrafiltration status data broadcast
     MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE = 0x3F,                                  ///< UI treatment parameters to be validated by TD
     MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE = 0x40,                             ///< TD response to treatment parameter validation request
-    MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE = 0x41,                            ///< UI ultrafiltration volume parameter to be validated by TD
-    MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE = 0x42,                       ///< TD response to ultrafiltration volume validation request
+    MSG_ID_UI_TREATMENT_UF_VOLUME_VALIDATE_REQUEST = 0x41,                          ///< UI ultrafiltration volume parameter to be validated by TD
+    MSG_ID_TD_TREATMENT_UF_VOLUME_VALIDATE_RESPONSE = 0x42,                         ///< TD response to ultrafiltration volume validation request
     MSG_ID_TD_TREATMENT_PARAM_RANGES = 0x43,                                        ///< TD treatment parameter ranges for UI
     MSG_ID_TD_VALIDATED_TREATMENT_PARAMS = 0x44,                                    ///< Treatment parameters validated and confirmed from TD
     MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW = 0x45,                                   ///< UI initiate/cancel treatment workflow request
@@ -131,8 +131,8 @@
     MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63,                                        ///< UI request to initiate a blood pressure reading
     MSG_ID_TD_BLOOD_PRESSURE_READING = 0x64,                                        ///< TD blood pressure reading to UI
     MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65,                                           ///< TD blood pressure broadcast data
-    MSG_ID_UI_ULTRAFILTRATION_CHANGE_VALIDATE_REQUEST = 0x66,                       ///< UI request to validate ultrafiltration volume change
-    MSG_ID_TD_ULTRAFILTRATION_CHANGE_VALIDATE_RESPONSE = 0x67,                      ///< TD response to request to validate ultrafiltration volume change
+    MSG_ID_UI_ULTRAFILTRATION_CHANGE_CONFIRM_REQUEST = 0x66,                        ///< UI request to validate ultrafiltration volume change
+    MSG_ID_TD_ULTRAFILTRATION_CHANGE_CONFIRM_RESPONSE = 0x67,                       ///< TD response to request to validate ultrafiltration volume change
     MSG_ID_DD_VOLTAGES_DATA = 0x68,                                                 ///< DD voltage broadcast data
     MSG_ID_DD_RINSE_PUMP_DATA = 0x69,                                               ///< DD rinse pump data
     MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT = 0x6A,                                     ///< TD treatment log alarm event
@@ -157,8 +157,8 @@
     MSG_ID_TD_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_RESPONSE = 0x7D,                ///< TD treatment set point blood flow change response
     MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST = 0x7E,             ///< UI treatment set point dialysate flow change request
     MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_RESPONSE = 0x7F,            ///< TD treatment set point dialysate flow change response
-    MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_REQUEST = 0x80,      ///< UI treatment set point dialysate temperature change request
-    MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_RESPONSE = 0x81,     ///< TD treatment set point dialysate temperature change response
+    MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_REQUEST = 0x80,             ///< UI treatment set point dialysate temperature change request
+    MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_RESPONSE = 0x81,            ///< TD treatment set point dialysate temperature change response
     MSG_ID_TD_INSTITUTIONAL_RECORD_REQUEST = 0x82,                                  ///< TD institutional record request
     MSG_ID_TD_INSTITUTIONAL_RECORD_RESPONSE = 0x83,                                 ///< TD institutional record response
     MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_REQUEST = 0x84,                           ///< TD adjust institutional record request
Index: TDDefs.h
===================================================================
diff -u -r04ab00143dc8f915e83ae0a6b0873eeb707fb227 -r38fca679ac07fa6a16fc4b756aebb4e3f95e207a
--- TDDefs.h	(.../TDDefs.h)	(revision 04ab00143dc8f915e83ae0a6b0873eeb707fb227)
+++ TDDefs.h	(.../TDDefs.h)	(revision 38fca679ac07fa6a16fc4b756aebb4e3f95e207a)
@@ -653,7 +653,7 @@
     TREATMENT_SETPOINT_BICARBONATE,                            ///< Bicarbonate concentration (mEq/L)
     NUM_OF_TREATMENT_SETPOINT_PARAMS                           ///< Total number of treatment set point parameters
 };
-typedef enum Treatment_SetPoint_Params TREATMENT_SETPOINT_PARAM_T;
+typedef enum Treatment_SetPoint_Params TREATMENT_SETPOINT_PARAM_T;               ///< Type for treatment set point parameter indices enumeration
 
 /// Enumeration of system configured treatment parameters.
 enum System_Config_Treatment_Params