Corrected class names