Renamed some local variables to fix shadowed variable warnings.

I have the warning for shadowed variables enabled in my project and there were a few instances where YapDatabase was showing warnings. I renamed the shadowed variables as best I could, but I'm definitely open to better naming suggestions.