Make name field less of a special case