Rename some vars