renaming a few classes to make them more clear