rename a few classes