Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ref4bc1eaa0f019b678b4d49011a5d23ebe558ad8 -rde9033912212f6af3a2f33321d948ce5aabac358
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ef4bc1eaa0f019b678b4d49011a5d23ebe558ad8)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision de9033912212f6af3a2f33321d948ce5aabac358)
@@ -106,7 +106,7 @@
 
 static F32 totalROFlowRateMLPM;                                                                              ///< Total RO flow rate over period of time.
 static F32 acidConductivityTotal;                                                                            ///< Total of acid conductivity during fill.
-static F32 dialysateConductivityTotal;                                                                       ///< Total of dialysate conductivity during fill.
+static F32 bicarbConductivityTotal;                                                                          ///< Total of bicard conductivity during fill.
 static U32 conductivitySampleCount;                                                                          ///< Sample count of conductivity during fill.
 
 static F32 averageBicardConductivity;                                                                        ///< Average bicard conductivity over 30 seconds.
@@ -152,7 +152,7 @@
  * @details Inputs: none
  * @details Outputs: fillState, dialysateFillStartTime, reservoirBaseWeight,
  * totalROFlowRateMLPM, concentrateTestStartTime, acidConductivityTotal,
- * dialysateConductivityTotal, conductivitySampleCount,
+ * bicarbConductivityTotal, conductivitySampleCount,
  * concentratePumpPrimeCount
  * @return none
  *************************************************************************/
@@ -164,7 +164,7 @@
     totalROFlowRateMLPM        = 0.0;
     concentrateTestStartTime   = 0;
     acidConductivityTotal      = 0.0;
-    dialysateConductivityTotal = 0.0;
+    bicarbConductivityTotal = 0.0;
     conductivitySampleCount    = 0;
     concentratePumpPrimeCount  = 0;
     pumpSpeedIndex = 0;
@@ -581,7 +581,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleDialysateProductionState function executes the dialysate production
+ * The handleProduceDialysateState function executes the dialysate production
  * state of the fill mode state machine.
  * @details Inputs: inlet water quality and dialysate temperature
  * @details Outputs: none
@@ -631,17 +631,16 @@
  *************************************************************************/
 static DG_FILL_MODE_STATE_T handleDeliverDialysateState( void )
 {
-    F32 integratedVolumeML;
-
+    DG_FILL_MODE_STATE_T result            = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
+    F32  integratedVolumeML;
     F32  measuredROFlowRateMLPM            = getMeasuredROFlowRateLPM() * ML_PER_LITER;
     F32  acidConductivity                  = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-    F32  dialysateConductivity             = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+    F32  bicarbConductivity                = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
     BOOL isAcidConductivityOutOfRange      = ( acidConductivity <= MIN_ACID_CONCENTRATE_CONDUCTIVITY ) ||
                                              ( acidConductivity >= MAX_ACID_CONCENTRATE_CONDUCTIVITY ) ? TRUE : FALSE;
-    BOOL isDialysateConductivityOutOfRange = ( dialysateConductivity <= MIN_BICARB_CONCENTRATE_CONDUCTIVITY ) ||
-                                             ( dialysateConductivity >= MAX_BICARB_CONCENTRATE_CONDUCTIVITY ) ? TRUE : FALSE;
+    BOOL isBicarbConductivityOutOfRange    = ( bicarbConductivity <= MIN_BICARB_CONCENTRATE_CONDUCTIVITY ) ||
+                                             ( bicarbConductivity >= MAX_BICARB_CONCENTRATE_CONDUCTIVITY ) ? TRUE : FALSE;
 
-    DG_FILL_MODE_STATE_T result         = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
     // Set concentrate pumps speed based off RO pump flow rate
@@ -653,7 +652,7 @@
     usedBicarbVolumeML.data    += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
 
     acidConductivityTotal      += acidConductivity;
-    dialysateConductivityTotal += dialysateConductivity;
+    bicarbConductivityTotal    += bicarbConductivity;
     conductivitySampleCount++;
 
     // DG is delivering dialysate keep collecting the sample counter and the measured flow
@@ -679,7 +678,7 @@
         result = DG_FILL_MODE_STATE_PAUSED;
     }
 
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, isDialysateConductivityOutOfRange ) )
+    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, isBicarbConductivityOutOfRange ) )
     {
         usedBicarbVolumeML.data = 0.0;
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
@@ -705,7 +704,7 @@
         F32 filledVolumeML                           = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
         F32 integratedVolumeToLoadCellReadingPercent = fabs( 1 - ( filledVolumeML / integratedVolumeML ) );
         F32 avgAcidConductivity                      = acidConductivityTotal / conductivitySampleCount;  // TODO - should we be checking this below?
-        F32 avgDialysateConductivity                 = dialysateConductivityTotal / conductivitySampleCount;
+        F32 avgDialysateConductivity                 = bicarbConductivityTotal / conductivitySampleCount;
 
         if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )
         {
@@ -838,7 +837,7 @@
     F32  valueMax     = baseValue + percentValue;
     F32  valueMin     = baseValue - percentValue;
 
-    if( ( testValue >= valueMin ) && ( testValue <= valueMax ) )
+    if ( ( testValue >= valueMin ) && ( testValue <= valueMax ) )
     {
         testFlag = TRUE;
     }