replace name with email
and moved name to data->name