renaming a few classes