Drop the Match prefix from the MatchSource variants