Support scopes with spaces in the name