Updated class and model names