Bug 909201: Editing names doesn't update properly
Merge pull request #18002 from rsajdok/bug#909201b

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