Corrected some class' name