Fixed some shadowing between local variables

[mikael-s-persson]

Fixed some shadowing between local variables

Pretty simple fix, just renaming a couple local variables so they don't shadow other variables in scope. Just trying to reduce verbosity of warnings in users' own builds with higher warning levels (as is my case ;) ).

Obviously, no change in behavior, and hopefully the new names are reasonable.