This should fix the name field update issue