ensure variables are all camel case - little OCD

found these when doing the global leak cleanup - figured while I was there, I would fix these for consistency.
Merge pull request #210 from danshultz/variable-name-consistency

ensure variables are all camel case - little OCD