diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index 95013859f0..e2335b4d3c 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(new MemoryStream());
 
                     Assert.That(collectionManager.Collections.Count, Is.Zero);
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Collections.IO
 
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
 
                     using (var ms = new MemoryStream())
                     {
@@ -143,7 +143,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
                     await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
 
                     // Move first beatmap from second collection into the first.
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Collections.IO
                 {
                     var osu = loadOsu(host, true);
 
-                    var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+                    var collectionManager = osu.Dependencies.Get<CollectionManager>();
 
                     Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
 
@@ -192,7 +192,7 @@ namespace osu.Game.Tests.Collections.IO
 
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
 
-            var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>();
+            var collectionManager = osu.Dependencies.Get<CollectionManager>();
             waitForOrAssert(() => collectionManager.DatabaseLoaded, "Collection database did not load in a reasonable amount of time");
 
             return osu;
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Collections.IO
             protected override void AddInternal(Drawable drawable)
             {
                 // The beatmap must be imported just before the collection manager is loaded.
-                if (drawable is BeatmapCollectionManager && withBeatmap)
+                if (drawable is CollectionManager && withBeatmap)
                     BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
 
                 base.AddInternal(drawable);
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 0c57c27911..54ab20af7f 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Collections
 
         private readonly Container content;
         private readonly DialogOverlay dialogOverlay;
-        private readonly BeatmapCollectionManager manager;
+        private readonly CollectionManager manager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Collections
         {
             base.Content.AddRange(new Drawable[]
             {
-                manager = new BeatmapCollectionManager(LocalStorage),
+                manager = new CollectionManager(LocalStorage),
                 content = new Container { RelativeSizeAxes = Axes.Both },
                 dialogOverlay = new DialogOverlay()
             });
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 5b0e244bbe..6012150513 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        private readonly BeatmapCollectionManager collectionManager;
+        private readonly CollectionManager collectionManager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             base.Content.AddRange(new Drawable[]
             {
-                collectionManager = new BeatmapCollectionManager(LocalStorage),
+                collectionManager = new CollectionManager(LocalStorage),
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }
diff --git a/osu.Game/Collections/BeatmapCollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
similarity index 99%
rename from osu.Game/Collections/BeatmapCollectionManager.cs
rename to osu.Game/Collections/CollectionManager.cs
index 0e78c44024..8b91ab219f 100644
--- a/osu.Game/Collections/BeatmapCollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Collections
     /// This is currently reading and writing from the osu-stable file format. This is a temporary arrangement until we refactor the
     /// database backing the game. Going forward writing should be done in a similar way to other model stores.
     /// </remarks>
-    public class BeatmapCollectionManager : Component
+    public class CollectionManager : Component
     {
         /// <summary>
         /// Database version in stable-compatible YYYYMMDD format.
@@ -53,7 +53,7 @@ namespace osu.Game.Collections
 
         private readonly Storage storage;
 
-        public BeatmapCollectionManager(Storage storage)
+        public CollectionManager(Storage storage)
         {
             this.storage = storage;
         }
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index a7075c3179..7d158f182f 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Collections
         private const float button_width = item_height * 0.75f;
 
         /// <summary>
-        /// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.
+        /// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="CollectionManager"/>.
         /// </summary>
         public IBindable<bool> IsCreated => isCreated;
 
@@ -38,7 +38,7 @@ namespace osu.Game.Collections
         /// Creates a new <see cref="DrawableCollectionListItem"/>.
         /// </summary>
         /// <param name="item">The <see cref="BeatmapCollection"/>.</param>
-        /// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.</param>
+        /// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="CollectionManager"/>.</param>
         public DrawableCollectionListItem(BeatmapCollection item, bool isCreated)
             : base(item)
         {
@@ -63,7 +63,7 @@ namespace osu.Game.Collections
             private readonly BeatmapCollection collection;
 
             [Resolved]
-            private BeatmapCollectionManager collectionManager { get; set; }
+            private CollectionManager collectionManager { get; set; }
 
             private Container textBoxPaddingContainer;
             private ItemTextBox textBox;
@@ -159,7 +159,7 @@ namespace osu.Game.Collections
             private DialogOverlay dialogOverlay { get; set; }
 
             [Resolved]
-            private BeatmapCollectionManager collectionManager { get; set; }
+            private CollectionManager collectionManager { get; set; }
 
             private readonly BeatmapCollection collection;
 
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index f6964191a1..cfde9d5550 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Collections
         private const double exit_duration = 200;
 
         [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
+        private CollectionManager collectionManager { get; set; }
 
         public ManageCollectionsDialog()
         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d98d4e2123..d4741f9e69 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -57,7 +57,7 @@ namespace osu.Game
 
         protected BeatmapManager BeatmapManager;
 
-        protected BeatmapCollectionManager CollectionManager;
+        protected CollectionManager CollectionManager;
 
         protected ScoreManager ScoreManager;
 
@@ -228,7 +228,7 @@ namespace osu.Game
             dependencies.Cache(difficultyManager);
             AddInternal(difficultyManager);
 
-            dependencies.Cache(CollectionManager = new BeatmapCollectionManager(Storage));
+            dependencies.Cache(CollectionManager = new CollectionManager(Storage));
             AddInternal(CollectionManager);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 30fd5921eb..83ee5e497a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, BeatmapCollectionManager collectionManager, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collectionManager, DialogOverlay dialogOverlay)
         {
             if (beatmaps.SupportsImportFromStable)
             {
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index e9990ab078..1db73702bb 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select.Carousel
         private BeatmapDifficultyManager difficultyManager { get; set; }
 
         [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
+        private CollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fe700f12df..fd66315f67 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay { get; set; }
 
         [Resolved]
-        private BeatmapCollectionManager collectionManager { get; set; }
+        private CollectionManager collectionManager { get; set; }
 
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
diff --git a/osu.Game/Screens/Select/CollectionFilterDropdown.cs b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
index 6b9ae1b5c8..7270354e87 100644
--- a/osu.Game/Screens/Select/CollectionFilterDropdown.cs
+++ b/osu.Game/Screens/Select/CollectionFilterDropdown.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapCollectionManager collectionManager)
+        private void load(CollectionManager collectionManager)
         {
             collections.BindTo(collectionManager.Collections);
             collections.CollectionChanged += (_, __) => collectionsChanged();