Bug 913507 - Unifying how to produce name field and display name.