fixes #6191 Need auto-update the name field