updated naming for consistency.
Merge pull request #11 from mtbrooks33/matt

updated naming for consistency.