Fix Wshadow warnings

Christoph Grüningerrequested to merge
feature/fix-shadow-warnings into master

As always, please add your wishes for alternative renaming of variable names.

Merge request reports