Fix variable shadowing and linting violations in security fix#8657

Copilot wants to merge 3 commits intomaingithub/gh-aw:mainfrom

copilot/sub-pr-8656github/gh-aw:copilot/sub-pr-8656Copy head branch name to clipboard