Some renaming of classes