Fixed #22248 -- Made RenameModel reversible