fixed class names