refactored event names