Rename a few variables.