Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f -r6dc826002a31e63d50ef7b3fced3cfe99b4394b8
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 6dc826002a31e63d50ef7b3fced3cfe99b4394b8)
@@ -473,7 +473,7 @@
         setSmallPrimaryHeaterPWM ( 0 );
         setTrimmerHeaterPWM ( 0 );
 
-        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP );
+        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL );
 
         if ( fabs(convertedTemperature - SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE) > HEATERS_POST_TEMPERATURE_TOLERANCE )
         {
@@ -513,7 +513,7 @@
     {
         setMainPrimaryHeaterPWM ( 0 );
 
-        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP );
+        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL );
 
         if ( fabs(convertedTemperature - MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE ) > HEATERS_POST_TEMPERATURE_TOLERANCE )
         {
@@ -598,7 +598,7 @@
 
     if ( ++primaryHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT )
     {
-        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR );
+        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
         mainPrimaryHeaterDutyCycle = runPIController ( PI_CONTROLLER_ID_PRIMARY_HEATER,
                                                        primaryHeaterTargetTemperature, outletTemp );
 
@@ -717,7 +717,7 @@
 
     if ( ++trimmerHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT )
     {
-        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR );
+        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY );
         trimmerHeaterDutyCycle = runPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER,
                                                    trimmerHeaterTargetTemperature, outletTemp );
         setTrimmerHeaterPWM ( trimmerHeaterDutyCycle );
@@ -869,15 +869,14 @@
     {
        char debugTempStr[ 256 ];
        sprintf( debugTempStr, "TPo: %6.2f, PriCJ: %6.2f, PriTC: %6.2f, TpriInt: %6.2f, TRo: %6.2f, TriCJ: %6.2f, TriTC: %6.2f, TtriInt: %6.2f\r\n",
-                              getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ),
-                              getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP )
-                              );
+                getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER ),
+                getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ),
+                getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ),
+                getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL ),
+                getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY ),
+                getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ),
+                getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ),
+                getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL ) );
 
         sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) );
     }