diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelectV2.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelectV2.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 6d2d507bf1..fa0092eedb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelectV2.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -27,7 +27,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public partial class TestScenePlaylistsSongSelectV2 : OnlinePlayTestScene
+    public partial class TestScenePlaylistsSongSelect : OnlinePlayTestScene
     {
         private RulesetStore rulesets = null!;
         private BeatmapManager manager = null!;
@@ -191,7 +191,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 rulesets.Dispose();
         }
 
-        private partial class TestPlaylistsSongSelect : PlaylistsSongSelectV2
+        private partial class TestPlaylistsSongSelect : PlaylistsSongSelect
         {
             public new IBindable<bool> Freestyle => base.Freestyle;
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index e46d8f74a5..b720772cac 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
                 AddStep("edit playlist", () => InputManager.Key(Key.Enter));
 
-                AddUntilStep("wait for song select", () => playlistScreen.CurrentSubScreen is PlaylistsSongSelectV2 songSelect && songSelect.IsLoaded && !songSelect.IsFiltering);
+                AddUntilStep("wait for song select", () => playlistScreen.CurrentSubScreen is PlaylistsSongSelect songSelect && songSelect.IsLoaded && !songSelect.IsFiltering);
 
                 AddUntilStep("wait for selection", () => !Game.Beatmap.IsDefault);
 
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.Navigation
                     InputManager.Click(MouseButton.Left);
                 });
 
-                AddUntilStep("wait for song select", () => playlistScreen.CurrentSubScreen is PlaylistsSongSelectV2 songSelect && songSelect.IsLoaded && !songSelect.IsFiltering);
+                AddUntilStep("wait for song select", () => playlistScreen.CurrentSubScreen is PlaylistsSongSelect songSelect && songSelect.IsLoaded && !songSelect.IsFiltering);
 
                 AddStep("press home button", () =>
                 {
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistTray.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistTray.cs
index e64d74ecba..f936bdaaf9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistTray.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistTray.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Playlists
         {
             base.SetUpSteps();
 
-            AddStep("add tray", () => Child = new PlaylistsSongSelectV2.PlaylistTray(room = new Room())
+            AddStep("add tray", () => Child = new PlaylistsSongSelect.PlaylistTray(room = new Room())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 16570e68e9..646da4e967 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -404,7 +404,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                     EditPlaylist = () =>
                                     {
                                         if (this.IsCurrentScreen())
-                                            this.Push(new PlaylistsSongSelectV2(room));
+                                            this.Push(new PlaylistsSongSelect(room));
                                     }
                                 }
                             }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelectV2.PlaylistTray.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.PlaylistTray.cs
similarity index 99%
rename from osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelectV2.PlaylistTray.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.PlaylistTray.cs
index 10c6ee6ef9..b467599153 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelectV2.PlaylistTray.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.PlaylistTray.cs
@@ -20,7 +20,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public partial class PlaylistsSongSelectV2
+    public partial class PlaylistsSongSelect
     {
         public partial class PlaylistTray : CompositeDrawable
         {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelectV2.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
similarity index 98%
rename from osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelectV2.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 0431885d1f..60a3133758 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelectV2.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -23,7 +23,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public partial class PlaylistsSongSelectV2 : SongSelect, IOnlinePlaySubScreen
+    public partial class PlaylistsSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public string ShortTitle => "song selection";
 
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private IDisposable? modSelectOverlayRegistration;
 
-        public PlaylistsSongSelectV2(Room room)
+        public PlaylistsSongSelect(Room room)
         {
             this.room = room;