Change class names to model