Rename a few classes