Rename some APIs