Fixed naming issues
Merge pull request #12 from davedissian/master

Fixed naming issues