Rename all event types with EventType suffix