Clean up what we store for each match

Let's go with `MatchTeam` and `MatchPlayer`. It makes more sense out of context.