Fix incorrect class names