Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -rb87bac344f39b289e83d4794fba4e53cf3dac94a
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision b87bac344f39b289e83d4794fba4e53cf3dac94a)
@@ -44,7 +44,7 @@
 static U32 setBloodFlowRate;                                    ///< Currently set blood flow rate (from prescription).
 static U32 setDialysateFlowRate;                                ///< Currently set dialysate flow rate (from prescription).
 static F32 setUFVolumeL;                                        ///< Currently set total ultrafiltration volume (in L) for treatment (from prescription).
-static F32 setUFRateLHr;                                        ///< Currently set ultrafiltration rate (in L/hr from prescription).
+static F32 setUFRateMlMin;                                      ///< Currently set ultrafiltration rate (in mL/min from prescription).
 static OVERRIDE_F32_T measUFVolumeL;                            ///< Current total measured volume (in L) for ultrafiltration .
 
 static BOOL ufPauseRequested;                                   ///< Flag indicates UF pause has been requested by user.
@@ -81,7 +81,7 @@
     setBloodFlowRate         = 0;
     setDialysateFlowRate     = 0;
     setUFVolumeL             = 0.0F;
-    setUFRateLHr             = 0.0F;
+    setUFRateMlMin           = 0.0F;
 
     ufPauseRequested         = FALSE;
     ufResumeRequested        = FALSE;
@@ -115,7 +115,7 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
     // Set actuators as appropriate for state
-    cmdStartGenerateDialysate( setDialysateFlowRate, setUFRateLHr, dialTemp, FALSE,
+    cmdStartGenerateDialysate( setDialysateFlowRate, setUFRateMlMin, dialTemp, FALSE,
                                acidConvFactor, bicarbConvFactor, sodium, bicarbonate  );
     transitionToDialysisState( currentDialysisState );
 
@@ -141,7 +141,7 @@
             setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );     // set arterial valve to pump blood from patient
             setValvePosition( H19_VALV, VALVE_POSITION_B_OPEN );    // set venous valve to open, allowing blood to return to patient
             setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-            cmdChangeQuf( setUFRateLHr );
+            cmdChangeQuf( setUFRateMlMin );
 
             // Start auto-control of air trap valve
             startAirTrapControl();
@@ -219,17 +219,17 @@
  * The setDialysisDDParams function sets the dialysate rate and ultrafiltration
  * volume and rate parameters.
  * @details \b Inputs: none
- * @details \b Outputs: setDialysateFlowRate, setUFVolumeL, setUFRateLHr
+ * @details \b Outputs: setDialysateFlowRate, setUFVolumeL, setUFRateMlMin
  * @param qd target dialysate flow rate (in mL/min)
  * @param ufVol target ultrafiltration volume (in L)
- * @param quf target ultrafiltration flow rate (in L/hr)
+ * @param quf target ultrafiltration flow rate (in mL/min)
  * @return none
  *************************************************************************/
 void setDialysisDDParams( U32 qd, F32 ufVol, F32 quf )
 {
     setDialysateFlowRate = qd;
     setUFVolumeL = ufVol;
-    setUFRateLHr = quf;
+    setUFRateMlMin = quf;
 }
 
 /*********************************************************************//**
@@ -238,7 +238,7 @@
  * ultrafiltration.
  * @details \b Message \b Sent: MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE
  * @details \b Message \b Sent: UF_START_PAUSE_EVENT / UF_START_RESUME_EVENT
- * @details \b Inputs: currentDialysisState, setUFRateLHr
+ * @details \b Inputs: currentDialysisState, setUFRateMlMin
  * @details \b Outputs: ufPauseRequested, ufResumeRequested
  * @param message Message from UI which includes a flag indicating whether
  * to pause or resume ultrafiltration.
@@ -267,9 +267,9 @@
             {
                 ufResumeRequested = TRUE;
                 response.accepted = TRUE;
-                if ( setUFRateLHr > 0.0 )
+                if ( setUFRateMlMin > 0.0 )
                 {
-                    //sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, setUFRateLHr );
+                    //sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, setUFRateMlMin );
                 }
             }
             else
@@ -295,9 +295,9 @@
             {
                 ufPauseRequested = TRUE;
                 response.accepted = TRUE;
-                if ( setUFRateLHr > 0.0 )
+                if ( setUFRateMlMin > 0.0 )
                 {
-                    //sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRateLHr, 0.0 );
+                    //sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRateMlMin, 0.0 );
                 }
             }
             else