Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r4a80b214d221c1f64feb215d828a10d8fddbaf4d -r4cabd64c4ff295eb985f0a62132fef94c4e92921
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4a80b214d221c1f64feb215d828a10d8fddbaf4d)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4cabd64c4ff295eb985f0a62132fef94c4e92921)
@@ -52,7 +52,7 @@
 
 #define D5_HEAT_TX_INIT_FEED_FORWARD                               0.0F                                                            ///< Initial Feed forward term for heater control
 #define D5_HEAT_TX_P_COEFFICIENT                                   0.050F                                                          ///< P Term for AC primary heater control during treatment mode.
-#define D5_HEAT_TX_I_COEFFICIENT                                   0.015F                                                         ///< I Term for AC primary heater control during treatment mode.
+#define D5_HEAT_TX_I_COEFFICIENT                                   0.015F                                                          ///< I Term for AC primary heater control during treatment mode.
 
 #define D45_HEAT_P_COEFFICIENT                                     0.20F                                                           ///< P Term for trimmer heater control.
 #define D45_HEAT_I_COEFFICIENT                                     0.05F                                                           ///< I Term for trimmer heater control.
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r4a80b214d221c1f64feb215d828a10d8fddbaf4d -r4cabd64c4ff295eb985f0a62132fef94c4e92921
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 4a80b214d221c1f64feb215d828a10d8fddbaf4d)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 4cabd64c4ff295eb985f0a62132fef94c4e92921)
@@ -44,7 +44,7 @@
 #define GEN_DIALYSATE_DATA_PUBLISH_INTERVAL     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) at which the gen dialysate mode data published.
 
 //Testing
-#define DELAY_BYPASS_STATE_AT_START_UP          ( 3 * MS_PER_SECOND )                       ///< Provide a bypass state start up delay to stabilize pump speed etc.,
+#define DELAY_BC_SWITCHING_AT_START_UP          ( 3 * MS_PER_SECOND )                       ///< Provide a balancing chamber switching start up delay to stabilize pump speed etc.,
 /// Payload record structure for Gen dialysate execution state set request
 typedef struct
 {
@@ -385,7 +385,7 @@
     //Testing
     if ( TRUE == delayBypassStateFlag )
     {
-        if (  TRUE == didTimeout( bypassStateDelayStartTimeMS, DELAY_BYPASS_STATE_AT_START_UP ) )
+        if (  TRUE == didTimeout( bypassStateDelayStartTimeMS, DELAY_BC_SWITCHING_AT_START_UP ) )
         {
             delayBypassStateFlag = FALSE;
         }