Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08 -re8c019d3d43b517cabfdfe75fa5d03749d036018
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e8c019d3d43b517cabfdfe75fa5d03749d036018)
@@ -95,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;
@@ -284,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;
 }
 
 /*********************************************************************//**
@@ -336,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;
@@ -772,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;
@@ -937,7 +937,7 @@
 {
     DG_HEATERS_RECORD_T record;
 
-    record.averageFillFlow = fillStatus.fillFlowRateAverage;
+    record.averageFillFlow = fillStatus.fillFlowRateAverageLPM;
 
     setHeatersInfoRecord( (U08*)&record, sizeof( DG_HEATERS_RECORD_T ) );
 }