Rename some more variables.