refactoring model names