Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r44cc25461e4936f7928904640c87a03ef7cf3c16 -ra58aa4a92a57c8b7dbec31a2f834916dc4612e4b
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 44cc25461e4936f7928904640c87a03ef7cf3c16)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision a58aa4a92a57c8b7dbec31a2f834916dc4612e4b)
@@ -130,7 +130,7 @@
 
 static BOOL isTemperatureInRange( void );
 static void execHeatDisinfectInternalStates( void );
-static void publishHeatDisinfectData ( void );
+static void publishHeatDisinfectData( void );
 static U32 getPublishHeatDisinfectDataInterval( void );
 static DATA_GET_PROTOTYPE( U32, getPublishHeatDisinfectDataInterval );
 static DATA_GET_PROTOTYPE( F32, getRecirculationDuration );
@@ -186,7 +186,7 @@
             heatDisinfectState = handleHeatDisinfectStart();
             break;
 
-        case DG_HEAT_DISINFECT_EVACUATE_DIALYSATE_FILL_WITH_WATER:
+        case DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER:
             heatDisinfectState = handleHeatDisinfectEvacuateDialysateFillWithWater();
             break;
 
@@ -279,7 +279,7 @@
 
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectStart( void )
 {
-    DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_EVACUATE_DIALYSATE_FILL_WITH_WATER;
+    DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER;
 
     stopActuators();
     drainPumpTargetRPM = DRAIN_PUMP_EVACUATE_FLUID_TARGET_RPM;
@@ -292,7 +292,7 @@
 
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectEvacuateDialysateFillWithWater( void )
 {
-    DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_EVACUATE_DIALYSATE_FILL_WITH_WATER;
+    DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER;
 
     execHeatDisinfectInternalStates(); //TODO test to see if it is needed to be in an if statement
 
@@ -547,7 +547,7 @@
     INTERNAL_HEAT_DISINFECT_STATE_T state = INTERNAL_HEAT_DISINFECT_STATE_OFF;
 
     // If the state is evacuate dialysate, start with evacuating recirculate path
-    if ( heatDisinfectState == DG_HEAT_DISINFECT_EVACUATE_DIALYSATE_FILL_WITH_WATER )
+    if ( heatDisinfectState == DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER )
     {
         // Set the actuators for evacuate recirculation path
         setValveState ( VPI, VALVE_STATE_OPEN );
@@ -611,7 +611,7 @@
     if ( reservoir1Weight >= FULL_RESERVOIRS_WEIGHT_GRAMS &&
          reservoir2Weight >= FULL_RESERVOIRS_WEIGHT_GRAMS )
     {
-        if ( heatDisinfectState == DG_HEAT_DISINFECT_EVACUATE_DIALYSATE_FILL_WITH_WATER )
+        if ( heatDisinfectState == DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER )
         {
             stopActuators();
             state = INTERNAL_HEAT_DISINFECT_STATE_COMPLETE;
@@ -703,7 +703,7 @@
 
     if ( reservoir2Weight <= EMPTY_RESERVOIRS_WEIGHT_GRAMS )
     {
-        if ( heatDisinfectState == DG_HEAT_DISINFECT_EVACUATE_DIALYSATE_FILL_WITH_WATER )
+        if ( heatDisinfectState == DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER )
         {
             setActuatorsToFillWater();
             state =  INTERNAL_HEAT_DISINFECT_STATE_FILL_WITH_WATER;