Some minor tweaks to improve names.
Merge pull request #2 from mtiller/master

Fixed some naming issues.