Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -re6c4c61c793a91f9ed9dfe969e01bdeee565347d -rad6b3443575d3f6bbac52237866e19a212d36bc1
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ad6b3443575d3f6bbac52237866e19a212d36bc1)
@@ -156,7 +156,7 @@
     initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
 
     // Initialize the FPGA persistent alarm
-    initFPGAPersistentAlarm( MAIN_PRIMARY_HEATER_VOLTAGE_ADC, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT,
+    initFPGAPersistentAlarm( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT,
                              MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS, MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS );
 }
 
@@ -888,7 +888,7 @@
 #endif
     {
         // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC
-        checkFPGAPersistentAlarms( MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() );
+        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() );
     }
 
     F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V );