+ General renaming of classes