Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rb63b3557501c98f7bce5ccdc65b6cbbef4b23e44 -rd5132b313275cf991a06917fa9d28b5c043cd6c2
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision b63b3557501c98f7bce5ccdc65b6cbbef4b23e44)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d5132b313275cf991a06917fa9d28b5c043cd6c2)
@@ -85,7 +85,7 @@
 //Testing
 static U32 bypassStateDelayStartTimeMS;                                                     ///< Delay balancing chamber switching for a second to preapre pump steady state.
 static BOOL delayBypassStateFlag;                                                           ///< To indicate change in treatment parameters
-static F32 dialysateFlowRate;                                                               ///< Current dialysate flow rate (ml/min)
+static F32 dialysateToDialyzerFlowRate;                                                     ///< Current dialysate to dialyzer flow rate (ml/min)
 
 // ********** private function prototypes **********
 
@@ -138,7 +138,7 @@
     //Testing
     bypassStateDelayStartTimeMS                 = 0;
     delayBypassStateFlag                        = TRUE;
-    dialysateFlowRate                           = 0;
+    dialysateToDialyzerFlowRate                 = 0.0F;
 
     //Initialize balancing chamber module
     initBalanceChamber();
@@ -821,23 +821,25 @@
 
 /*********************************************************************//**
  * @brief
- * The updateDialysateFlowRate function updates the target Qd depending on the state
+ * The updateDialysateFlowRate function updates the current dialysate to dialyzer
+ * flow rate only when in the dialysate delivery state, otherwise the flow rate
+ * is set to zero
  * @details \b Inputs: genDialysateState
- * @details \b Outputs: dialysateFlowRate
+ * @details \b Outputs: dialysateToDialyzerFlowRate
  * @return none
  *************************************************************************/
 void updateDialysateFlowRate( void )
 {
-    // Check the operation mode
+    // Check the current Gen Dialysate Mode state
     if ( DD_GEND_DIALYSATE_DELIVERY_STATE == genDialysateState )
     {
         // Update the dialysate flow rate to the TD request
-        dialysateFlowRate = getTDDialysateFlowrate();
+        dialysateToDialyzerFlowRate = getTDDialysateFlowrate();
     }
     else
     {
         // Set the dialysate flow rate to zero
-        dialysateFlowRate = 0;
+        dialysateToDialyzerFlowRate = 0.0F;
     }
 }