First stages of removing old models and renaming the new ones.

https://catami.atlassian.net/browse/CAT-619