Renaming a few classes.