Changed naming conventions
Merge pull request #2 from brutalexcess/master

Changed naming conventions