Rename a few classes to be more specific