Merge pull request #130 from dadbodgeoff/remediation/r2a-rename-scope