Rename discovery components. DiscoveryClient -> DiscoveryService. DiscoveryServer -> DiscoveryBrowser.