Better names
Merge pull request #42 from klambycom/rename-functions

Better names (closes #32)