Fix class names