Renaming some classes.