Renaming of classes