Example data friend names are less cumbersome, and reflect the documentation
Merge branch 'example-friend-names'