Renamed factory classes from MatchX to MatchingX