Bug 909201: Editing names doesn't update properly.
Merge pull request #15280 from rsajdok/909201

Bug 909201: Editing names doesn't update properly. r=bkelly