Fixed 'name shadowing' warning
Fixed 'name shadowing' warnings