better name matching