Also unregister rename listeners