Change name to event-emitter