Changed some names to fix shadowing warnings; refs #9376

[SVN r86681]