Changed some names to fix shadowing warnings; refs #9371

[SVN r86680]