diff --git a/osu.Game/Database/ArchiveDownloadModelManager.cs b/osu.Game/Database/ArchiveDownloadModelManager.cs
index c868b8d1d5..8d221bd3ea 100644
--- a/osu.Game/Database/ArchiveDownloadModelManager.cs
+++ b/osu.Game/Database/ArchiveDownloadModelManager.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Database
     /// </summary>
     /// <typeparam name="TModel">The model type.</typeparam>
     /// <typeparam name="TFileModel">The associated file join type.</typeparam>
-    public abstract class ArchiveDownloadModelManager<TModel, TFileModel> : ArchiveModelManager<TModel, TFileModel>, IDownloadModelManager<TModel>
+    public abstract class ArchiveDownloadModelManager<TModel, TFileModel> : ArchiveModelManager<TModel, TFileModel>, IModelDownloader<TModel>
         where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete
         where TFileModel : INamedFileInfo, new()
     {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 50cb9dac8b..ccaba99427 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Database
     /// </summary>
     /// <typeparam name="TModel">The model type.</typeparam>
     /// <typeparam name="TFileModel">The associated file join type.</typeparam>
-    public abstract class ArchiveModelManager<TModel, TFileModel> : ICanAcceptFiles, IModelManager
+    public abstract class ArchiveModelManager<TModel, TFileModel> : ICanAcceptFiles, IModelManager<TModel>
         where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete
         where TFileModel : INamedFileInfo, new()
     {
@@ -44,7 +44,7 @@ namespace osu.Game.Database
         /// Fired when a new <see cref="TModel"/> becomes available in the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
-        public event ItemAddedDelegate ItemAdded;
+        public event Action<TModel, bool> ItemAdded;
 
         /// <summary>
         /// Fired when a <see cref="TModel"/> is removed from the database.
diff --git a/osu.Game/Database/IDownloadModelManager.cs b/osu.Game/Database/IModelDownloader.cs
similarity index 87%
rename from osu.Game/Database/IDownloadModelManager.cs
rename to osu.Game/Database/IModelDownloader.cs
index 3231d855ea..bf987bb53c 100644
--- a/osu.Game/Database/IDownloadModelManager.cs
+++ b/osu.Game/Database/IModelDownloader.cs
@@ -1,11 +1,12 @@
-using osu.Game.Online.API;
+// 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.
+
+using osu.Game.Online.API;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace osu.Game.Database
 {
-    public interface IDownloadModelManager<TModel> : IModelManager<TModel>
+    public interface IModelDownloader<TModel> : IModelManager<TModel>
         where TModel : class
     {
         /// <summary>
diff --git a/osu.Game/Database/IModelManager.cs b/osu.Game/Database/IModelManager.cs
index 6a0b2bde44..ee78df3db4 100644
--- a/osu.Game/Database/IModelManager.cs
+++ b/osu.Game/Database/IModelManager.cs
@@ -1,20 +1,14 @@
-
+// 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.
+
 using System;
 
 namespace osu.Game.Database
 {
     public interface IModelManager<TModel>
     {
-        /// <summary>
-        /// Fired when a new <see cref="TModel"/> becomes available in the database.
-        /// This is not guaranteed to run on the update thread.
-        /// </summary>
         event Action<TModel, bool> ItemAdded;
 
-        /// <summary>
-        /// Fired when a <see cref="TModel"/> is removed from the database.
-        /// This is not guaranteed to run on the update thread.
-        /// </summary>
         event Action<TModel> ItemRemoved;
     }
 }