refactor(semantic)!: make Scoping methods consistent
#9628
Merged
Scoping methods consistent
#9628