rename some functions