Fixup on rename