Renaming of several classes and methods