rename function names
Merge pull request #378 from bstell/master

rename function names