Renamed HashMatcher to MapMatcher.