Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r25ede6f944eb53b68c8073404663c99d3ce158b0 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 25ede6f944eb53b68c8073404663c99d3ce158b0)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -187,7 +187,7 @@
     // Clear fill timeout alarm condition if low level sensor sees fluid
     if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
     {
-        clearAlarmCondition( ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT );
+        clearAlarmCondition( ALARM_ID_HD_AIR_TRAP_FILL_DURING_TREATMENT );
     }
 
     // Check level readings are valid
@@ -201,7 +201,7 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ILLEGAL_AIR_TRAP_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS );
+                activateAlarmNoData( ALARM_ID_HD_AIR_TRAP_ILLEGAL_LEVELS );
             }
         }
     }
@@ -233,7 +233,7 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT );
+                activateAlarmNoData( ALARM_ID_HD_AIR_TRAP_FILL_DURING_TREATMENT );
             }
         }
     }