changed naming conventions for consistancy
Merge pull request #50 from thequbit/master

changed naming conventions for consistancy