refactor model names