Rename from DiscoverySystem to WMP