Updated code to allow editing of all names.