Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r94695022c89578c365bbe6e8b247b2ecdbd2b33e
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 94695022c89578c365bbe6e8b247b2ecdbd2b33e)
@@ -29,7 +29,7 @@
 #include "SafetyShutdown.h"
 #include "TaskGeneral.h"
 #include "TaskPriority.h"
-#include "TemperatureSensors.h"
+#include "TemperatureSensor.h"
 #include "Timers.h"
 #include "Utilities.h"
 
@@ -321,7 +321,7 @@
 
         default:
             // The heater is in an unknown state. Alarm, turn heater off and switch to off state
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_HEATER_INVALID_EXEC_STATE, (U32)heatersStatus.state );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_HEATER_INVALID_EXEC_STATE, (U32)heatersStatus.state );
             stopHeater();
             break;
     }
@@ -538,7 +538,7 @@
 
         dataPublicationTimerCounter = 0;
 
-        broadcastData( MSG_ID_RO_HEATER_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( HEATERS_DATA_T ) );
+        broadcastData( MSG_ID_FP_HEATER_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( HEATERS_DATA_T ) );
     }
 }