corrected class names