renamed events, changed event emitter