renaming of classes for more intuitive naming