Make event names match the event names in the code