Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rbb648110d33fb859beed67fabc43f7e9614fc00a -r7959a737a00d914ccea0f2f3f3a6ddcbd82d6334
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision bb648110d33fb859beed67fabc43f7e9614fc00a)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 7959a737a00d914ccea0f2f3f3a6ddcbd82d6334)
@@ -738,8 +738,9 @@
         {
             lastTreatmentTimeStamp = getMSTimerCount();
             // Kick dialysis sub-mode off
-            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
-                               presMaxUFVolumeML, presUFRate );
+            setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+            setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+
             if ( presUFRate > 0.0 )
             {
                 sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, presUFRate );
@@ -1037,7 +1038,8 @@
             presTreatmentTimeSecs = treatmentTime * SEC_PER_MIN;
             setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
             setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) );
-            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+            setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+            setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
         else
@@ -1221,8 +1223,8 @@
             presUFRate = pendingUFRateChange;
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
-        setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
-                           presMaxUFVolumeML, presUFRate );
+        setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+        setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate  );
 
         // If UF paused, resume with new settings
         if ( ( TREATMENT_DIALYSIS_STATE == currentTreatmentState ) &&