Changing names of functions to something more consistent with PHP language.