Standardized function names as I'd already done in master branch.
No need for keeping old function names as well because this module has
not been released yet.