Rename HandlerScope to Scope
Add to changelist