Renaming some more classes.