Change the event names to be generic

This will mean that we can close open events with NORMALs because
they'll have the same event name.