Improved rendering of event names