refactored some model names (no functional changes)