Renaming of classes and methods to shorten code and reduce name
redundancy