Index: firmware/App/Services/TxParams.h
===================================================================
diff -u -r8cceda439faa23a1e927721c6a9ef8e4ee30c5be -re23b34695d4b67bbce65248f97fc346d3acb7aa6
--- firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision 8cceda439faa23a1e927721c6a9ef8e4ee30c5be)
+++ firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision e23b34695d4b67bbce65248f97fc346d3acb7aa6)
@@ -135,28 +135,27 @@
     S32 tmpPressureLimitWindowMMHG;                  ///< TMP pressure limit window in mmHg.
 } PRESSURE_LIMIT_CHANGE_RESPONSE_T;
 
-/// Payload record structure for UF change response.
+/// Payload record structure for UF volume validate request.
 typedef struct
 {
-    BOOL accepted;              ///< Accepted/Rejected
-    U32 rejectionReason;        ///< Rejection reason if not accepted.
-    F32 ufVolume;               ///< UF Volume in mL.
-    U32 durationInMinutes;      ///< new Treatment duration in minutes.
-    S32 timeDiff;               ///< Treatment duration difference.
-    F32 ufRate;                 ///< new UF rate in mL/min.
-    F32 rateDiff;               ///< difference between new and old UF rates.
-    F32 oldUFRate;              ///< Previous UF Rate in mL/min.
-} UF_SETTINGS_CHANGE_RESPONSE_PAYLOAD_T;
+    F32 ufVolume;               ///< Requested UF volume in mL.
+} UF_VOLUME_VALIDATE_REQUEST_PAYLOAD_T;
 
-/// Payload record structure for UF change confirmation response.
+/// Payload record structure for UF volume confirm request.
 typedef struct
 {
+    F32 ufVolume;               ///< Confirmed UF volume in mL.
+} UF_VOLUME_CONFIRM_REQUEST_PAYLOAD_T;
+
+/// Payload record structure for UF change response.
+typedef struct
+{
     BOOL accepted;              ///< Accepted/Rejected
     U32 rejectionReason;        ///< Rejection reason if not accepted.
-    F32 volume;                 ///< UF Volume in mL.
-    U32 duration;               ///< Treatment duration in minutes
-    F32 ufRate;                 ///< UF rate in mL.
-} UF_SETTINGS_CONFIRMATION_RESPONSE_PAYLOAD_T;
+    F32 ufVolumeGoal;           ///< UF Volume in mL.
+    U32 duration;               ///< new Treatment duration in minutes.
+    F32 ufRate;                 ///< new UF rate in mL/min.
+} UF_VOLUME_RESPONSE_PAYLOAD_T;
 
 /// Payload record structure for blood / dialysate rate change response.
 typedef struct
@@ -178,12 +177,12 @@
 S32  getTreatmentParameterS32DefaultValue( TREATMENT_PARAM_T param );               // Get the default value for a specified signed integer treatment parameter
 
 BOOL validateAndSetTreatmentParameters( MESSAGE_T *message );                       // User provided treatment params to be set and validated
-BOOL validateAndSetUFVolume( MESSAGE_T *message );                                  // User provided ultrafiltration volume to be set and validated
 
 // Edit Treatment parameter handlers
 BOOL validateAndSetTreatmentDuration( MESSAGE_T *message );                         // User provided treatment duration to be set and validated
 BOOL validateAndSetBolusVolume( MESSAGE_T *message );                               // User provided bolus volume to be set and validated
 BOOL pressureLimitHandleChangeRequest( MESSAGE_T *message );                        // User provided pressure limit window values to be validated and applied
+BOOL validateAndSetUFVolume( MESSAGE_T *message );                                  // User provided ultrafiltration volume to be set and validated
 BOOL signalUserConfirmationOfTreatmentDuration( MESSAGE_T *message );               // Process UI confirm/reject treatment duration
 BOOL signalUserConfirmationOfUFVolume( MESSAGE_T *message );                        // Process UI confirm/reject ultrafiltration volume change