primary_name_tokens -> name_tokens (now indexing tokens from funder alternate names).