Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rb07b7e985cc46d55f1db4fe7e2b544c45ea9c7db -r66c624837b7b915415810e67249048ce5a46c163
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b07b7e985cc46d55f1db4fe7e2b544c45ea9c7db)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 66c624837b7b915415810e67249048ce5a46c163)
@@ -236,9 +236,11 @@
     // Windowed time count for FPGA temperature sensor error
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_TEMPERATURE_SENSOR_ERROR, MAX_TEMPERATURE_SENSOR_FAILURES, MAX_TEMPERATURE_SENSOR_FAILURE_WINDOW_MS );
 
-    initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, ALARM_DATA_TYPE_F32, INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT, INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT );
-
-    initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_TEMPERATURE, ALARM_DATA_TYPE_F32, INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT, INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT );
+    // Persistent alarms for inlet water high/low temperature
+    initPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_HIGH_TEMPERATURE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE,
+                         INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT, INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT );
+    initPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_LOW_TEMPERATURE, ALARM_ID_INLET_WATER_LOW_TEMPERATURE,
+                         INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT, INLET_WATER_TEMPERATURE_PERSISTENCE_COUNT );
 }
 
 /*************************************************************************
@@ -324,8 +326,8 @@
     BOOL const isWaterTempTooHigh = temperature > MAX_WATER_INPUT_TEMPERATURE;
     BOOL const isWaterTempTooLow = temperature < MIN_WATER_INPUT_TEMPERATURE;
 
-    checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, isWaterTempTooHigh, temperature );
-    checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_TEMPERATURE, isWaterTempTooLow, temperature );
+    checkPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_HIGH_TEMPERATURE, isWaterTempTooHigh, temperature );
+    checkPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_LOW_TEMPERATURE, isWaterTempTooLow, temperature );
 }
 
 /*************************************************************************