better names
Merge pull request #3 from aaylward/rename

better names