Model names refactoring