Fix -Wshadow-field warnings

Brad Kingrequested to merge
brad.king/cmake:fix-shadow-field-warnings into master

Clang now has a -Wshadow-field diagnostic option that caught a few shadowed members. Rename/remove as appropriate.

Merge request reports