Rename some variables and APIs.