Renaming of some functions