improved naming scheme
Merge pull request #8 from iambernie/namescheme

improved naming scheme