Rename Spot to Match for now to have no conflicts with benchmark Spot