Completed refactor of naming to models and API's.

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