diff --git a/src/Umbraco.Infrastructure/Services/Notifications/TreeChangeNotification.cs b/src/Umbraco.Core/Events/TreeChangeNotification.cs
similarity index 76%
rename from src/Umbraco.Infrastructure/Services/Notifications/TreeChangeNotification.cs
rename to src/Umbraco.Core/Events/TreeChangeNotification.cs
index 4929edc5d2..339b8a7404 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/TreeChangeNotification.cs
+++ b/src/Umbraco.Core/Events/TreeChangeNotification.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services.Changes;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Events
 {
     public abstract class TreeChangeNotification<T> : EnumerableObjectNotification<T>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs b/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
index 4015534650..0b6345cfcd 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
@@ -723,10 +723,13 @@ namespace Umbraco.Cms.Core.Services.Implement
                 IEnumerable<TreeChange<IMedia>> treeChanges = mediasA.Select(x => new TreeChange<IMedia>(x, TreeChangeTypes.RefreshNode));
 
                 scope.WriteLock(Cms.Core.Constants.Locks.MediaTree);
-                foreach (var media in mediasA)
+                foreach (IMedia media in mediasA)
                 {
                     if (media.HasIdentity == false)
+                    {
                         media.CreatorId = userId;
+                    }
+
                     _mediaRepository.Save(media);
                 }