small refactor of model names