refactored function names
Merge pull request #4 from tonydspaniard/master

Updated function names