Fixed #22239 -- Add auto detection of renamed models