Fixed 22248 -- Fixed backwards model renaming