Class names corrected