Index: firmware/App/Services/TxParams.h
===================================================================
diff -u -rc288f2956e37f1f0b964b077af7c39b6387a5df6 -r880a9762cc029d858dfbaadc678afa2c6f8633a2
--- firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision c288f2956e37f1f0b964b077af7c39b6387a5df6)
+++ firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision 880a9762cc029d858dfbaadc678afa2c6f8633a2)
@@ -119,15 +119,15 @@
 typedef struct
 {
     U32 duration;                                                       ///< Requested treatment duration in minutes.
-} DURATION_VALIDATE_REQUEST_PAYLOAD_T;
+} TREATMENT_DURATION_VALIDATE_REQUEST_PAYLOAD_T;
 
 /// Payload record structure for treatment duration confirm request.
 typedef struct
 {
     U32 duration;                                                       ///< Confirmed treatment duration in minutes.
-    U32 heparinDuration;                                                 ///< Confirmed heparin delivery duration in minutes.
+    U32 heparinDuration;                                                ///< Confirmed heparin delivery duration in minutes.
     F32 ufRate;                                                         ///< Confirmed UF rate in L/hr.
-} DURATION_CONFIRM_REQUEST_PAYLOAD_T;
+} TREATMENT_DURATION_CONFIRM_REQUEST_PAYLOAD_T;
 
 /// Payload record structure for treatment duration validate response.
 typedef struct
@@ -138,7 +138,7 @@
     U32 heparinDuration;                                                ///< Heparin delivery duration in minutes.
     F32 ufVolumeGoal;                                                   ///< UF volume goal in L.
     F32 ufRate;                                                         ///< UF rate in L/hr.
-} DURATION_VALIDATE_RESPONSE_PAYLOAD_T;
+} TREATMENT_DURATION_VALIDATE_RESPONSE_PAYLOAD_T;
 
 /// Payload record structure for bolus volume change request.
 typedef struct
@@ -205,27 +205,27 @@
     F32 temperature;                                                    ///< Dialysate temperature in degrees Celsius.
 } DIALYSATE_TEMPERATURE_CHANGE_REQUEST_PAYLOAD_T;
 
-/// Payload record structure for treatment set points change request.
+/// Payload record structure for prescription settings change request.
 typedef struct
 {
     U32 bloodFlowRate;                                                   ///< Blood flow rate.
     U32 dialysateFlowRate;                                               ///< Dialysate flow rate.
     F32 dialysateTemperature;                                            ///< Dialysate temperature.
     U32 acidConcentrate;                                                 ///< Acid concentrate.
     F32 acidConcentrateConversionFactor;                                 ///< Acid concentrate conversion factor.
-    U32 bicarbonateConcentrate;                                          ///< Bicarbonate concentrate.
+    U32 bicarbonateConcentrate;                                          ///< Dry bicarbonate cartridge size.
     U32 treatmentModality;                                               ///< Treatment modality.
     U32 hepatitis;                                                       ///< Hepatitis status.
     U32 sodium;                                                          ///< Sodium concentration.
-    U32 bicarbonate;                                                     ///< Bicarbonate concentration.
-} TREATMENT_PARAMETER_EDIT_REQUEST_T;
+    U32 bicarbonate;                                                     ///< Bicarbonate concentration (mEq/L).
+} TREATMENT_PRESCRIPTION_SETTINGS_EDIT_REQUEST_T;
 
-/// Payload record structure for treatment parameter edit response.
+/// Payload record structure for prescription settings change response.
 typedef struct
 {
     BOOL accepted;                                                       ///< Accepted/Rejected.
-    U32 rejectionReason[ NUM_OF_TREATMENT_SETPOINT_PARAMS ];             ///< Rejection reason for each set point.
-} TREATMENT_SET_POINTS_CHANGE_RESPONSE_T;
+    U32 rejectionReason[ NUM_OF_TREATMENT_SETPOINT_PARAMS ];             ///< Rejection reason for each prescription setting.
+} TREATMENT_PRESCRIPTION_SETTINGS_EDIT_RESPONSE_T;
 
 // ********** public function prototypes ****************
 
@@ -241,7 +241,7 @@
 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 validateAndSetTreatmentSetPoints( MESSAGE_T *message );                        // User provided treatment set point values to be validated and applied
+BOOL validateAndSetTreatmentSetPoints( MESSAGE_T *message );                        // User provided prescription setting values to be validated and applied
 BOOL validateAndSetBloodFlowRate( MESSAGE_T *message );                             // Validates and applies blood flow rate change from UI button request
 BOOL validateAndSetDialysateFlowRate( MESSAGE_T *message );                         // Validates and applies dialysate flow rate change from UI button request
 BOOL validateAndSetDialysateTemperature( MESSAGE_T *message );                      // Validates and applies temperature change from UI button request