Changed naming to conform to standard
Merge pull request #45 from kaptk2/develop

Changed naming to conform to standard