Address review comments
Rename ServiceDescriptorsUpdateable to ServiceDescriptorsListener