Make alarm naming work with the new map