Renaming some functions