Fixed the class names