Merge pull request #6262 from linkmauve/no-shadow Rename constructor parameters to avoid shadowing members
