diff --git a/osu-framework b/osu-framework
index 53dfe2a110..db310bfc10 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 53dfe2a110d732cca0e7df58c33eca368bc7ff61
+Subproject commit db310bfc10cd1c9ed12c9e19cdc0edfa53117353
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs b/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
index 19cc32078c..da807d5e53 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
@@ -33,10 +33,10 @@ public override void Reset()
                 Position = new Vector2(275, 5)
             });
 
-            filter.PinTab(GroupMode.All);
-            filter.PinTab(GroupMode.RecentlyPlayed);
+            filter.PinItem(GroupMode.All);
+            filter.PinItem(GroupMode.RecentlyPlayed);
 
-            filter.ValueChanged += (sender, mode) =>
+            filter.ItemChanged += (sender, mode) =>
             {
                 text.Text = "Currently Selected: " + mode.ToString();
             };
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 02cd5d683a..d5699eddaf 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -28,7 +28,7 @@ public OsuTabControl()
                 throw new InvalidOperationException("OsuTabControl only supports enums as the generic type argument");
 
             foreach (var val in (T[])Enum.GetValues(typeof(T)))
-                AddTab(val);
+                AddItem(val);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 637b6eafbc..2a25928dc7 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -141,10 +141,10 @@ public FilterControl()
                 }
             };
 
-            groupTabs.PinTab(GroupMode.All);
-            groupTabs.PinTab(GroupMode.RecentlyPlayed);
-            groupTabs.ValueChanged += (sender, value) => Group = value;
-            sortTabs.ValueChanged += (sender, value) => Sort = value;
+            groupTabs.PinItem(GroupMode.All);
+            groupTabs.PinItem(GroupMode.RecentlyPlayed);
+            groupTabs.ItemChanged += (sender, value) => Group = value;
+            sortTabs.ItemChanged += (sender, value) => Sort = value;
         }
 
         public void Deactivate()