diff --git a/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs b/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
index 41c930ae86..bdb087f0d2 100644
--- a/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
+++ b/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Web;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
diff --git a/src/Umbraco.Web/IpResolver.cs b/src/Umbraco.Web/AspNetIpResolver.cs
similarity index 90%
rename from src/Umbraco.Web/IpResolver.cs
rename to src/Umbraco.Web/AspNetIpResolver.cs
index 3284f1b2d9..d12b4395de 100644
--- a/src/Umbraco.Web/IpResolver.cs
+++ b/src/Umbraco.Web/AspNetIpResolver.cs
@@ -3,7 +3,7 @@ using Umbraco.Core;
 
 namespace Umbraco.Web
 {
-    public class IpResolver : IIpResolver
+    public class AspNetIpResolver : IIpResolver
     {
         public string GetCurrentRequestIpAddress()
         {
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 57774e533c..3bcb297730 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Web.Runtime
             base.Compose(composition);
 
             composition.Register<UmbracoInjectedModule>();
-            composition.Register<IIpResolver, IpResolver>();
+            composition.Register<IIpResolver, AspNetIpResolver>();
             composition.Register<IHostingEnvironment, AspNetHostingEnvironment>();
 
             composition.RegisterUnique<IHttpContextAccessor, AspNetHttpContextAccessor>(); // required for hybrid accessors
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2dbf47c35b..4c213ac3c4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -164,7 +164,7 @@
     <Compile Include="Editors\RelationTypeController.cs" />
     <Compile Include="Editors\TinyMceController.cs" />
     <Compile Include="Hosting\AspNetHostingEnvironment.cs" />
-    <Compile Include="IpResolver.cs" />
+    <Compile Include="AspNetIpResolver.cs" />
     <Compile Include="IUmbracoContextFactory.cs" />
     <Compile Include="Install\ChangesMonitor.cs" />
     <Compile Include="Logging\WebProfiler.cs" />