correct some variable shadowing

Merge request reports

Loading