Rename functions to its original.
Merge pull request #3 from najor/master-renamed-functions

Rename functions to its original.