diff --git a/src/Umbraco.Core/Resolving/ActionsResolver.cs b/src/Umbraco.Core/ActionsResolver.cs
similarity index 92%
rename from src/Umbraco.Core/Resolving/ActionsResolver.cs
rename to src/Umbraco.Core/ActionsResolver.cs
index 8dfc274dae..cae5a4575f 100644
--- a/src/Umbraco.Core/Resolving/ActionsResolver.cs
+++ b/src/Umbraco.Core/ActionsResolver.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core
 {
 	/// <summary>
 	/// A resolver to return all IAction objects
diff --git a/src/Umbraco.Core/Resolving/CacheRefreshersResolver.cs b/src/Umbraco.Core/CacheRefreshersResolver.cs
similarity index 88%
rename from src/Umbraco.Core/Resolving/CacheRefreshersResolver.cs
rename to src/Umbraco.Core/CacheRefreshersResolver.cs
index ba19e1fe35..dab9555069 100644
--- a/src/Umbraco.Core/Resolving/CacheRefreshersResolver.cs
+++ b/src/Umbraco.Core/CacheRefreshersResolver.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core
 {
 	/// <summary>
 	/// A resolver to return all ICacheRefresher objects
diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 118494dac9..1d14c8c5dd 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Core
 {
diff --git a/src/Umbraco.Core/Resolving/DataTypesResolver.cs b/src/Umbraco.Core/DataTypesResolver.cs
similarity index 88%
rename from src/Umbraco.Core/Resolving/DataTypesResolver.cs
rename to src/Umbraco.Core/DataTypesResolver.cs
index 3965d1df85..2d0163e8e7 100644
--- a/src/Umbraco.Core/Resolving/DataTypesResolver.cs
+++ b/src/Umbraco.Core/DataTypesResolver.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core
 {
 	/// <summary>
 	/// A resolver to return all IDataType objects
diff --git a/src/Umbraco.Core/Resolving/LegacyTransientObjectsResolver.cs b/src/Umbraco.Core/ObjectResolution/LegacyTransientObjectsResolver.cs
similarity index 96%
rename from src/Umbraco.Core/Resolving/LegacyTransientObjectsResolver.cs
rename to src/Umbraco.Core/ObjectResolution/LegacyTransientObjectsResolver.cs
index 9344214113..582ec50b9e 100644
--- a/src/Umbraco.Core/Resolving/LegacyTransientObjectsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/LegacyTransientObjectsResolver.cs
@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 	/// <summary>
 	/// A base resolver used for old legacy factories such as the DataTypeFactory or CacheResolverFactory.
diff --git a/src/Umbraco.Core/Resolving/MacroFieldEditorsResolver.cs b/src/Umbraco.Core/ObjectResolution/MacroFieldEditorsResolver.cs
similarity index 95%
rename from src/Umbraco.Core/Resolving/MacroFieldEditorsResolver.cs
rename to src/Umbraco.Core/ObjectResolution/MacroFieldEditorsResolver.cs
index fd51e9951d..c9d5f05b24 100644
--- a/src/Umbraco.Core/Resolving/MacroFieldEditorsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/MacroFieldEditorsResolver.cs
@@ -4,7 +4,7 @@ using System.Web.UI;
 using Umbraco.Core.Macros;
 using umbraco.interfaces;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 	/// <summary>
 	/// A resolver to return all IMacroGuiRendering objects
diff --git a/src/Umbraco.Core/Resolving/ManyObjectsResolverBase.cs b/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
similarity index 96%
rename from src/Umbraco.Core/Resolving/ManyObjectsResolverBase.cs
rename to src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
index 936cfec2da..8c6dba8fd2 100644
--- a/src/Umbraco.Core/Resolving/ManyObjectsResolverBase.cs
+++ b/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Web;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 	internal abstract class ManyObjectsResolverBase<TResolver, TResolved> : ResolverBase<TResolver>
 		where TResolved : class 
diff --git a/src/Umbraco.Core/Resolving/ObjectLifetimeScope.cs b/src/Umbraco.Core/ObjectResolution/ObjectLifetimeScope.cs
similarity index 64%
rename from src/Umbraco.Core/Resolving/ObjectLifetimeScope.cs
rename to src/Umbraco.Core/ObjectResolution/ObjectLifetimeScope.cs
index 8c290ff54b..ac0101d80f 100644
--- a/src/Umbraco.Core/Resolving/ObjectLifetimeScope.cs
+++ b/src/Umbraco.Core/ObjectResolution/ObjectLifetimeScope.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 	internal enum ObjectLifetimeScope
 	{
diff --git a/src/Umbraco.Core/Resolving/Resolution.cs b/src/Umbraco.Core/ObjectResolution/Resolution.cs
similarity index 85%
rename from src/Umbraco.Core/Resolving/Resolution.cs
rename to src/Umbraco.Core/ObjectResolution/Resolution.cs
index b63f39d4a9..1016d5b838 100644
--- a/src/Umbraco.Core/Resolving/Resolution.cs
+++ b/src/Umbraco.Core/ObjectResolution/Resolution.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 
 
diff --git a/src/Umbraco.Core/Resolving/ResolverBase.cs b/src/Umbraco.Core/ObjectResolution/ResolverBase.cs
similarity index 93%
rename from src/Umbraco.Core/Resolving/ResolverBase.cs
rename to src/Umbraco.Core/ObjectResolution/ResolverBase.cs
index 4cec7a1ea5..f0bd5d1f7c 100644
--- a/src/Umbraco.Core/Resolving/ResolverBase.cs
+++ b/src/Umbraco.Core/ObjectResolution/ResolverBase.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 	/// <summary>
 	/// base class for resolvers which declare a singleton accessor
diff --git a/src/Umbraco.Core/Resolving/SingleObjectResolverBase.cs b/src/Umbraco.Core/ObjectResolution/SingleObjectResolverBase.cs
similarity index 92%
rename from src/Umbraco.Core/Resolving/SingleObjectResolverBase.cs
rename to src/Umbraco.Core/ObjectResolution/SingleObjectResolverBase.cs
index 3aba9c29a9..b74a486f3c 100644
--- a/src/Umbraco.Core/Resolving/SingleObjectResolverBase.cs
+++ b/src/Umbraco.Core/ObjectResolution/SingleObjectResolverBase.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core.ObjectResolution
 {
 	/// <summary>
 	/// A Resolver to return and set a Single registered object.
diff --git a/src/Umbraco.Core/Resolving/PackageActionsResolver.cs b/src/Umbraco.Core/PackageActionsResolver.cs
similarity index 87%
rename from src/Umbraco.Core/Resolving/PackageActionsResolver.cs
rename to src/Umbraco.Core/PackageActionsResolver.cs
index eb5561ddd1..8c1d412374 100644
--- a/src/Umbraco.Core/Resolving/PackageActionsResolver.cs
+++ b/src/Umbraco.Core/PackageActionsResolver.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
 
-namespace Umbraco.Core.Resolving
+namespace Umbraco.Core
 {
 	/// <summary>
 	/// A resolver to return all IPackageAction objects
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7e70662240..96ac25111b 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -55,12 +55,12 @@
     <Compile Include="DocumentPropertyExtensions.cs" />
     <Compile Include="Models\IDocument.cs" />
     <Compile Include="Models\IDocumentProperty.cs" />
-    <Compile Include="Resolving\ActionsResolver.cs" />
-    <Compile Include="Resolving\CacheRefreshersResolver.cs" />
+    <Compile Include="ActionsResolver.cs" />
+    <Compile Include="CacheRefreshersResolver.cs" />
     <Compile Include="Configuration\GlobalSettings.cs" />
     <Compile Include="Configuration\UmbracoSettings.cs" />
     <Compile Include="CustomBooleanTypeConverter.cs" />
-    <Compile Include="Resolving\DataTypesResolver.cs" />
+    <Compile Include="DataTypesResolver.cs" />
     <Compile Include="DisposableObject.cs" />
     <Compile Include="DisposableTimer.cs" />
     <Compile Include="ExpressionHelper.cs" />
@@ -71,20 +71,20 @@
     <Compile Include="IO\SystemDirectories.cs" />
     <Compile Include="IO\SystemFiles.cs" />
     <Compile Include="LambdaExpressionCacheKey.cs" />
-    <Compile Include="Resolving\PackageActionsResolver.cs" />
-    <Compile Include="Resolving\LegacyTransientObjectsResolver.cs" />
+    <Compile Include="PackageActionsResolver.cs" />
+    <Compile Include="ObjectResolution\LegacyTransientObjectsResolver.cs" />
     <Compile Include="Logging\AsynchronousRollingFileAppender.cs" />
     <Compile Include="Logging\LoggingTaskExtension.cs" />
     <Compile Include="Logging\LogHelper.cs" />
-    <Compile Include="Resolving\MacroFieldEditorsResolver.cs" />
+    <Compile Include="ObjectResolution\MacroFieldEditorsResolver.cs" />
     <Compile Include="Macros\PersistableMacroProperty.cs" />
     <Compile Include="ObjectExtensions.cs" />
     <Compile Include="RazorDataTypeModelStaticMappingItem.cs" />
-    <Compile Include="Resolving\ManyObjectsResolverBase.cs" />
-    <Compile Include="Resolving\ObjectLifetimeScope.cs" />
-    <Compile Include="Resolving\Resolution.cs" />
-    <Compile Include="Resolving\ResolverBase.cs" />
-    <Compile Include="Resolving\SingleObjectResolverBase.cs" />
+    <Compile Include="ObjectResolution\ManyObjectsResolverBase.cs" />
+    <Compile Include="ObjectResolution\ObjectLifetimeScope.cs" />
+    <Compile Include="ObjectResolution\Resolution.cs" />
+    <Compile Include="ObjectResolution\ResolverBase.cs" />
+    <Compile Include="ObjectResolution\SingleObjectResolverBase.cs" />
     <Compile Include="TypeExtensions.cs" />
     <Compile Include="ReadLock.cs" />
     <Compile Include="SystemUtilities.cs" />
diff --git a/src/Umbraco.Tests/ActionsResolverTests.cs b/src/Umbraco.Tests/ActionsResolverTests.cs
index eac2ee21dc..45eab01c35 100644
--- a/src/Umbraco.Tests/ActionsResolverTests.cs
+++ b/src/Umbraco.Tests/ActionsResolverTests.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
 using umbraco.BasePages;
 using umbraco.interfaces;
diff --git a/src/Umbraco.Tests/CacheRefresherFactoryTests.cs b/src/Umbraco.Tests/CacheRefresherFactoryTests.cs
index b6c1988bd7..e9a2c075fb 100644
--- a/src/Umbraco.Tests/CacheRefresherFactoryTests.cs
+++ b/src/Umbraco.Tests/CacheRefresherFactoryTests.cs
@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
 using umbraco.interfaces;
 
diff --git a/src/Umbraco.Tests/DataTypeFactoryTests.cs b/src/Umbraco.Tests/DataTypeFactoryTests.cs
index b781432735..d836b8f836 100644
--- a/src/Umbraco.Tests/DataTypeFactoryTests.cs
+++ b/src/Umbraco.Tests/DataTypeFactoryTests.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
 using umbraco.cms.businesslogic.datatype;
 using umbraco.interfaces;
diff --git a/src/Umbraco.Tests/DocumentLookups/BaseTest.cs b/src/Umbraco.Tests/DocumentLookups/BaseTest.cs
index 324a134907..27085522ce 100644
--- a/src/Umbraco.Tests/DocumentLookups/BaseTest.cs
+++ b/src/Umbraco.Tests/DocumentLookups/BaseTest.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.Stubs;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
diff --git a/src/Umbraco.Tests/EnumerableExtensionsTests.cs b/src/Umbraco.Tests/EnumerableExtensionsTests.cs
index c13cee8ea9..64f0c6a381 100644
--- a/src/Umbraco.Tests/EnumerableExtensionsTests.cs
+++ b/src/Umbraco.Tests/EnumerableExtensionsTests.cs
@@ -4,7 +4,6 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Tests;
 using umbraco.BusinessLogic;
-using Umbraco.Core.Resolving;
 
 namespace Umbraco.Tests
 {
diff --git a/src/Umbraco.Tests/MacroFieldEditorsResolverTests.cs b/src/Umbraco.Tests/MacroFieldEditorsResolverTests.cs
index 33a976dec3..e08fb325a8 100644
--- a/src/Umbraco.Tests/MacroFieldEditorsResolverTests.cs
+++ b/src/Umbraco.Tests/MacroFieldEditorsResolverTests.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Web.UI;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
 using umbraco.editorControls.macrocontainer;
 using umbraco.interfaces;
diff --git a/src/Umbraco.Tests/ManyObjectResolverTests.cs b/src/Umbraco.Tests/ManyObjectResolverTests.cs
index 6461478a07..52a6c61676 100644
--- a/src/Umbraco.Tests/ManyObjectResolverTests.cs
+++ b/src/Umbraco.Tests/ManyObjectResolverTests.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using NUnit.Framework;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests
diff --git a/src/Umbraco.Tests/PackageActionsResolverTests.cs b/src/Umbraco.Tests/PackageActionsResolverTests.cs
index aed55c9e03..82f7381267 100644
--- a/src/Umbraco.Tests/PackageActionsResolverTests.cs
+++ b/src/Umbraco.Tests/PackageActionsResolverTests.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
 using umbraco.cms.businesslogic.packager;
 using umbraco.interfaces;
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs
index faeb7075dc..11533a686c 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs
@@ -4,8 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Web;
 using Umbraco.Core;
-
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using umbraco.BusinessLogic;
 using umbraco.BusinessLogic.Utils;
 
diff --git a/src/Umbraco.Web/Mvc/FilteredControllerFactoriesResolver.cs b/src/Umbraco.Web/Mvc/FilteredControllerFactoriesResolver.cs
index 5f3465b4db..c6c0e5d109 100644
--- a/src/Umbraco.Web/Mvc/FilteredControllerFactoriesResolver.cs
+++ b/src/Umbraco.Web/Mvc/FilteredControllerFactoriesResolver.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Web.Mvc
 {
diff --git a/src/Umbraco.Web/Routing/DocumentLookupsResolver.cs b/src/Umbraco.Web/Routing/DocumentLookupsResolver.cs
index 7122d73584..3d3f4fe7eb 100644
--- a/src/Umbraco.Web/Routing/DocumentLookupsResolver.cs
+++ b/src/Umbraco.Web/Routing/DocumentLookupsResolver.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading;
 
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Web.Routing
 {
diff --git a/src/Umbraco.Web/Routing/LastChanceLookupResolver.cs b/src/Umbraco.Web/Routing/LastChanceLookupResolver.cs
index 11bfaa4ba1..6a4703ac8c 100644
--- a/src/Umbraco.Web/Routing/LastChanceLookupResolver.cs
+++ b/src/Umbraco.Web/Routing/LastChanceLookupResolver.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Web.Routing
 {
diff --git a/src/Umbraco.Web/Routing/LookupByAlias.cs b/src/Umbraco.Web/Routing/LookupByAlias.cs
index e9bb0aff6d..2128ad37f7 100644
--- a/src/Umbraco.Web/Routing/LookupByAlias.cs
+++ b/src/Umbraco.Web/Routing/LookupByAlias.cs
@@ -2,7 +2,6 @@ using System.Diagnostics;
 using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Resolving;
 using umbraco.interfaces;
 
 namespace Umbraco.Web.Routing
diff --git a/src/Umbraco.Web/Routing/LookupById.cs b/src/Umbraco.Web/Routing/LookupById.cs
index ed1655d456..fb684ac4c9 100644
--- a/src/Umbraco.Web/Routing/LookupById.cs
+++ b/src/Umbraco.Web/Routing/LookupById.cs
@@ -3,7 +3,6 @@ using System.Diagnostics;
 using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Resolving;
 using umbraco.interfaces;
 
 namespace Umbraco.Web.Routing
diff --git a/src/Umbraco.Web/Routing/LookupByNiceUrl.cs b/src/Umbraco.Web/Routing/LookupByNiceUrl.cs
index 06ba8b83fd..cbea836c60 100644
--- a/src/Umbraco.Web/Routing/LookupByNiceUrl.cs
+++ b/src/Umbraco.Web/Routing/LookupByNiceUrl.cs
@@ -2,7 +2,6 @@ using System.Diagnostics;
 using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Resolving;
 using umbraco.interfaces;
 
 namespace Umbraco.Web.Routing
diff --git a/src/Umbraco.Web/Routing/LookupByNiceUrlAndTemplate.cs b/src/Umbraco.Web/Routing/LookupByNiceUrlAndTemplate.cs
index 692a6221c3..b9b6b6755d 100644
--- a/src/Umbraco.Web/Routing/LookupByNiceUrlAndTemplate.cs
+++ b/src/Umbraco.Web/Routing/LookupByNiceUrlAndTemplate.cs
@@ -2,7 +2,6 @@ using System.Diagnostics;
 using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Resolving;
 using umbraco.cms.businesslogic.template;
 
 namespace Umbraco.Web.Routing
diff --git a/src/Umbraco.Web/Routing/LookupByProfile.cs b/src/Umbraco.Web/Routing/LookupByProfile.cs
index 1e19ac1107..10dbfc3601 100644
--- a/src/Umbraco.Web/Routing/LookupByProfile.cs
+++ b/src/Umbraco.Web/Routing/LookupByProfile.cs
@@ -2,7 +2,6 @@ using System.Diagnostics;
 using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Resolving;
 using umbraco;
 
 namespace Umbraco.Web.Routing
diff --git a/src/Umbraco.Web/Routing/RoutesCacheResolver.cs b/src/Umbraco.Web/Routing/RoutesCacheResolver.cs
index 25a194571c..a472f34783 100644
--- a/src/Umbraco.Web/Routing/RoutesCacheResolver.cs
+++ b/src/Umbraco.Web/Routing/RoutesCacheResolver.cs
@@ -1,5 +1,5 @@
 using System;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Web.Routing
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs
index 5879869187..646542b4bf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs
@@ -4,7 +4,6 @@ using System.Net;
 using System.Threading;
 using System.Xml;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
 using umbraco.BusinessLogic;
 using umbraco.interfaces;
 using umbraco.IO;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/factory.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/factory.cs
index 6b5448d88c..1f6e3589b6 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/factory.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/factory.cs
@@ -3,7 +3,6 @@ using System.Collections.Concurrent;
 using System.Linq;
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
 using Umbraco.Web;
 using umbraco.BusinessLogic.Utils;
 using umbraco.interfaces;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
index 90f2f56d99..d2ecd05a33 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
@@ -7,7 +7,6 @@ using System.Web;
 using System.Web.Services;
 using System.Xml;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
 
 namespace umbraco.presentation.webservices
 {
diff --git a/src/umbraco.cms/Actions/Action.cs b/src/umbraco.cms/Actions/Action.cs
index b86379ce71..34ff982eb2 100644
--- a/src/umbraco.cms/Actions/Action.cs
+++ b/src/umbraco.cms/Actions/Action.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Web;
 using System.Reflection;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
 using umbraco.BasePages;
 using umbraco.BusinessLogic.Utils;
 using umbraco.cms;
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs
index 0b71beeccf..eb82658be5 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Web;
 using System.Xml;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
 using umbraco.BasePages;
 using umbraco.BusinessLogic.Utils;
 using umbraco.cms.businesslogic.web;
diff --git a/src/umbraco.cms/businesslogic/datatype/factory.cs b/src/umbraco.cms/businesslogic/datatype/factory.cs
index 24cd523f2f..b1cf3797bc 100644
--- a/src/umbraco.cms/businesslogic/datatype/factory.cs
+++ b/src/umbraco.cms/businesslogic/datatype/factory.cs
@@ -4,7 +4,6 @@ using System.Collections.Concurrent;
 using System.Linq;
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Core.Resolving;
 using umbraco.BusinessLogic.Utils;
 using umbraco.interfaces;
 using System.Collections.Generic;
diff --git a/src/umbraco.editorControls/macrocontainer/MacroEditor.cs b/src/umbraco.editorControls/macrocontainer/MacroEditor.cs
index 54e709f177..6016743daf 100644
--- a/src/umbraco.editorControls/macrocontainer/MacroEditor.cs
+++ b/src/umbraco.editorControls/macrocontainer/MacroEditor.cs
@@ -6,7 +6,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Macros;
-using Umbraco.Core.Resolving;
+using Umbraco.Core.ObjectResolution;
 using umbraco.cms.businesslogic.macro;
 using System.Collections;
 using umbraco.presentation;