Merge pull request #3849 from RosettaCommons/JackMaguire/UpdateOverrides Renaming shadowed variables. Part 1 of 3-ish PRs to allow Rosetta to compile with the -Wshadow flag.