Fix a few overlapping variable declarations.

Fixed with more specific (and longer) variable names.