Corrected misnamed classes.