fixed class names in model