Clean up event types to be consistent