Removed manipulation of name field