Rename some variables that have long scope from being generic names.