Add and rename a few classes