Change the name of some functions