cleaning up event type names and constants