Renamed match-path to path-matches.