Minor UI changes to reflect proper terminology.