Refactored model names