Refactor event names