rename some APIs, add comments.