prefs: rename variables (conflicts with builtin names)

(integrated from master branch change b279ac5 by Todd Whiteman <toddw@activestate.com>)