The OSX build showed these might be shadowed.

The OSX build showed these members might be shadowed by the parameter names, renamed the parameters to avoid it.

Cleans up a LOT of the OSX build warnings.