MatchFinished moved into a proper namespace