Refactor NameMatcher -> StringMatcher