Fixed -Wshadow declaration warnings

6 jobs for compiler_warnings in 49 seconds (queued for 1 second)