Rename some vars.