General renaming of classes.