Fix in class names