Rename HandlerScope to Scope