Corrected wrong class names