class names fixes