Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -rf1cb4be5fb8201cec188589e683c8bf20d895ec0
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
@@ -69,6 +69,8 @@
 #define RO_PUMP_LOOKUP_TABLE_SIZE                       4                                                    ///< Size of array used as RO pump speed lookup table.
 #define CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN       5.0F                                                 ///< Concentrate pump additional speed during priming in mL/min.
 #define CONCENTRATE_TEST_TIME_OUT_MS                    ( 30 * MS_PER_SECOND )                               ///< Concentrate test time out period in ms.
+// 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
+// Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
 #define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
@@ -93,7 +95,7 @@
     U32  fillSampleCounter;                                                                                  ///< Fill flow sample counter.
     F32  fillTemperatureRunningSum;                                                                          ///< Fill temperature running sum.
     F32  fillTemperatureAverage;                                                                             ///< Fill temperature average value.
-    F32  fillFlowRateAverage;                                                                                ///< Fill flow average value.
+    F32  fillFlowRateAverageLPM;                                                                             ///< Fill flow average value in L/min.
     F32  fillLastTemperature;                                                                                ///< Fill last temperature value.
     BOOL isThisFirstFill;                                                                                    ///< Fill flag to indicate whether it is the first fill or not.
 } FILL_CONDITION_STATUS_T;
@@ -282,15 +284,15 @@
 
 /*********************************************************************//**
  * @brief
- * The getAvgFillFlowRate function returns the average fill flow rate in
+ * The getAvgFillFlowRateLPM function returns the average fill flow rate in
  * each fill.
  * @details Inputs: none
- * @details Outputs: fillFlowRateAverage
+ * @details Outputs: fillFlowRateAverageLPM
  * @return average of the fill flow rate
  *************************************************************************/
-F32 getAvgFillFlowRate( void )
+F32 getAvgFillFlowRateLPM( void )
 {
-    return fillStatus.fillFlowRateAverage;
+    return fillStatus.fillFlowRateAverageLPM;
 }
 
 /*********************************************************************//**
@@ -334,7 +336,7 @@
     getNVRecord2Driver( GET_INF_HEATERS_RECORD, (U08*)&heaterInfo, sizeof( DG_HEATERS_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
     // If the data in the NV data management was not initialized properly, set it to 0 otherwise, set the average flow rate
-    fillStatus.fillFlowRateAverage       = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
+    fillStatus.fillFlowRateAverageLPM       = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
     fillStatus.fillFlowRateRunningSum    = 0.0;
     fillStatus.fillSampleCounter         = 0;
     fillStatus.fillTemperatureRunningSum = 0.0;
@@ -770,7 +772,7 @@
         // Done with this fill. Calculate the average fill flow rate and average temperature
         // Reset the variables for the next fill
         // Get the last fill temperature before leaving to Generation Idle
-        fillStatus.fillFlowRateAverage       = fillStatus.fillFlowRateRunningSum / (F32)fillStatus.fillSampleCounter;
+        fillStatus.fillFlowRateAverageLPM    = fillStatus.fillFlowRateRunningSum / (F32)fillStatus.fillSampleCounter;
         fillStatus.fillTemperatureAverage    = fillStatus.fillTemperatureRunningSum / (F32)fillStatus.fillSampleCounter;
         fillStatus.fillFlowRateRunningSum    = 0.0;
         fillStatus.fillTemperatureRunningSum = 0.0;
@@ -935,7 +937,7 @@
 {
     DG_HEATERS_RECORD_T record;
 
-    record.averageFillFlow = fillStatus.fillFlowRateAverage;
+    record.averageFillFlow = fillStatus.fillFlowRateAverageLPM;
 
     setHeatersInfoRecord( (U08*)&record, sizeof( DG_HEATERS_RECORD_T ) );
 }