Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a3a396aa37fb562327f05e54990f06538c7617ed)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546)
@@ -359,12 +359,12 @@
             {
                 case D5_HEAT:
                     alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON;
-                    isLevelLow  = ( ( getLevelStatus( FLOATER_LEVEL ) != 0 )? FALSE : TRUE );
+                    isLevelLow  = ( ( getLevelStatus( D6_LEVL ) != 0 )? FALSE : TRUE );
                     break;
 
                 case D45_HEAT:
                     alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON;
-                    isLevelLow  = ( ( getLevelStatus( SPENT_DIALYSATE_LEVEL ) != 0 )? FALSE : TRUE );
+                    isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != 0 )? FALSE : TRUE );
                     break;
 
                 default:
@@ -492,7 +492,7 @@
         switch ( heater )
         {
             case D5_HEAT:
-                measuredTemperature = getTemperatureValue( (U32)TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER );
+                measuredTemperature = getTemperatureValue( (U32)D4_TEMP );
                 if ( measuredTemperature >= targetTemperature )
                 {
                     // Turn off heater
@@ -508,7 +508,7 @@
                 break;
 
             case D45_HEAT:
-                measuredTemperature = getTemperatureValue( (U32)TEMPSENSORS_TRIMMER_HEATER );
+                measuredTemperature = getTemperatureValue( (U32)D50_TEMP );
                 //control = runPIController( PI_CONTROLLER_ID_D45_HEAT, targetTemperature, measuredTemperature );
                 if ( targetTemperature >  0.0F )
                 {