Renamed Matcher to Filter