Friendlier name-matching