-renaming of classes