Minor shakeout of the option names & descriptions.