minor refactoring, mostly spelling and better param names
Merge pull request #389 from pfschwartz/develop

minor refactoring, mostly spelling and better param names