improve name token to field name conversion