Correct class names