Renaming some functions names.