Update naming in line with discussion

osu.Game/Online/Multiplayer/MatchRulesetType.cs

@@ -1,11 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace osu.Game.Online.Multiplayer
-{
-    public enum MatchRulesetType
-    {
-        HeadToHead,
-        TeamVs
-    }
-}

osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Linq;
 using MessagePack;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -40,7 +41,7 @@ namespace osu.Game.Online.Multiplayer
         public string Password { get; set; } = string.Empty;
 
         [Key(8)]
-        public MatchRulesetType MatchRulesetType { get; set; }
+        public MatchType MatchRulesetType { get; set; }
 
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID

osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs

@@ -24,6 +24,9 @@ namespace osu.Game.Online.Multiplayer
         [Key(1)]
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
+        [Key(4)]
+        public MatchRulesetUserState? MatchRulesetState { get; set; }
+
         /// <summary>
         /// The availability state of the current beatmap.
         /// </summary>
@@ -36,9 +39,6 @@ namespace osu.Game.Online.Multiplayer
         [Key(3)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        [Key(4)]
-        public MatchRulesetUserState? MatchRulesetState { get; set; }
-
         [IgnoreMember]
         public User? User { get; set; }