modified naming
Merge pull request #18 from jonnyparris/new_names

modified naming