Mark model renaming as irreversible for now (#22248)