model names refactored