Sort event types; chage key name