Small event name refactoring