slight improvement to name matching