Keep up with the emitter name change