Fixed option text.
More renaming.
Merge pull request #100 from jaredbischof/master

Minor fixes.