rename some func