Reword and rename classes.