Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -ree311636fcfb7db1913edef2d9fea22153465a87 -rb4e65bc0026ff22f0bb77e4e066724368ef1cfd5
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision ee311636fcfb7db1913edef2d9fea22153465a87)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision b4e65bc0026ff22f0bb77e4e066724368ef1cfd5)
@@ -220,7 +220,7 @@
 static PI_CONTROLLER_SIGNALS_DATA bicarbControlSignals;                                         ///< Bicarb closed loop control signal data
 static PI_CONTROLLER_SIGNALS_DATA acidControlSignals;                                           ///< Acid closed loop control signal data
 
-static DRY_BICART_OPERATION_T prevState;                                                       ///< Last dry bicart operation prior to current state.
+static DRY_BICART_OPERATION_T prevDryBicartState;                                               ///< Last dry bicart operation prior to current state.
 
 // ********** private function prototypes **********
 
@@ -402,7 +402,7 @@
     dryBiCartDrainCondStableCount                       = 0;
     dryBiCartDrainTimePeriod                            = 0;
     dryBiCartPersistanceStartTime                       = 0;
-    prevState                                           = DRY_BICART_IDLE;
+    prevDryBicartState                                  = DRY_BICART_IDLE;
 
     initializePIController( PI_CONTROLLER_ID_BICARB_VOL, 0.0F,\
                            getBicarbKpGainCoefficient(), getBicarbKiGainCoefficient(),\
@@ -519,10 +519,10 @@
             break;
     }
 
-    if ( prevState != dryBicartStartRequest )
+    if ( prevDryBicartState != dryBicartStartRequest )
     {
-        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_DRY_BICART_STATE_CHANGE, prevState, dryBicartStartRequest );
-        prevState = dryBicartStartRequest;
+        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_DRY_BICART_STATE_CHANGE, prevDryBicartState, dryBicartStartRequest );
+        prevDryBicartState = dryBicartStartRequest;
     }
 
     // Publish dry bicart data