Corrected naming conventions
Merge pull request #5 from simp1eton/master

Corrected naming conventions