Redo formatting of event names