scopeDescriptor -> scopes

Now that we have a real ScopeDescriptor object, 
these should change back!