Correcting class names