Add auto detection of renamed models