Rename some functions