Corrected setting friendlyName support

Jira Issue: WP-1221