Refactoring scope name definition