fix several name shadowing occurrences