updated names
Merge pull request #24 from michaelbjames/refactor/rename

Updated names