Changed internal event names to be able to expose them with EventEmitter in future