event name refactor