Fixing bug when editing certain names; Fixing name duplication bug