Minor changes to some of the wording/naming.