Refactor event name and usings