changed model names to be more concise