MatcherInterface renamed Matcher