Alter function names
Merge pull request #11 from jsks/master

Alter function names