Correcting name of some classes.