Refactor names
Merge pull request #5 from jamesdunay/develop

Refactor names