Small renaming of classes.