Bug 32660: (follow-up) Use more unique variable name to avoid collisions