Friendly name updates in PZH and Service discovery

Jira Issue: WP-263