diff --git a/src/Umbraco.Tests/Routing/FinderByAliasTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
similarity index 92%
rename from src/Umbraco.Tests/Routing/FinderByAliasTests.cs
rename to src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
index 8c72a9ddf4..71e81c7c77 100644
--- a/src/Umbraco.Tests/Routing/FinderByAliasTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
@@ -5,7 +5,7 @@ using Umbraco.Web.Routing;
 namespace Umbraco.Tests.Routing
 {
 	[TestFixture]
-	public class FinderByAliasTests : BaseRoutingTest
+	public class ContentFinderByAliasTests : BaseRoutingTest
 	{
 		public override void Initialize()
 		{
diff --git a/src/Umbraco.Tests/Routing/FinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
similarity index 91%
rename from src/Umbraco.Tests/Routing/FinderByIdTests.cs
rename to src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
index 91c8e9d249..7981a9f06b 100644
--- a/src/Umbraco.Tests/Routing/FinderByIdTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
@@ -7,7 +7,7 @@ using umbraco.cms.businesslogic.template;
 namespace Umbraco.Tests.Routing
 {
 	[TestFixture]
-	public class FinderByIdTests : BaseRoutingTest
+	public class ContentFinderByIdTests : BaseRoutingTest
 	{
 		/// <summary>
 		/// We don't need a db for this test, will run faster without one
diff --git a/src/Umbraco.Tests/Routing/FinderByNiceUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
similarity index 92%
rename from src/Umbraco.Tests/Routing/FinderByNiceUrlAndTemplateTests.cs
rename to src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
index 6b00c2dddc..745f0d2bb5 100644
--- a/src/Umbraco.Tests/Routing/FinderByNiceUrlAndTemplateTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
@@ -7,7 +7,7 @@ using umbraco.cms.businesslogic.template;
 namespace Umbraco.Tests.Routing
 {
 	[TestFixture]
-	public class FinderByNiceUrlAndTemplateTests : BaseRoutingTest
+	public class ContentFinderByNiceUrlAndTemplateTests : BaseRoutingTest
 	{
 		public override void Initialize()
 		{
diff --git a/src/Umbraco.Tests/Routing/FinderByNiceUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs
similarity index 95%
rename from src/Umbraco.Tests/Routing/FinderByNiceUrlTests.cs
rename to src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs
index 4fb0817f07..269ae66845 100644
--- a/src/Umbraco.Tests/Routing/FinderByNiceUrlTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs
@@ -8,7 +8,7 @@ using umbraco.cms.businesslogic.template;
 namespace Umbraco.Tests.Routing
 {
 	[TestFixture]
-	public class FinderByNiceUrlTests : BaseRoutingTest
+	public class ContentFinderByNiceUrlTests : BaseRoutingTest
 	{
 		public override void Initialize()
 		{
diff --git a/src/Umbraco.Tests/Routing/FinderByNiceUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
similarity index 98%
rename from src/Umbraco.Tests/Routing/FinderByNiceUrlWithDomainsTests.cs
rename to src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
index 0e7cdf88f3..2897e9662d 100644
--- a/src/Umbraco.Tests/Routing/FinderByNiceUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
@@ -12,7 +12,7 @@ using System.Configuration;
 namespace Umbraco.Tests.Routing
 {
 	[TestFixture]
-	public class FinderByNiceUrlWithDomainsTests : BaseRoutingTest
+	public class ContentFinderByNiceUrlWithDomainsTests : BaseRoutingTest
 	{
 		public override void Initialize()
 		{
diff --git a/src/Umbraco.Tests/Routing/FinderByPageIdQueryTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
similarity index 93%
rename from src/Umbraco.Tests/Routing/FinderByPageIdQueryTests.cs
rename to src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
index 6a8e3c8e9c..5d96feec07 100644
--- a/src/Umbraco.Tests/Routing/FinderByPageIdQueryTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
@@ -8,7 +8,7 @@ using umbraco.cms.businesslogic.template;
 namespace Umbraco.Tests.Routing
 {
 	[TestFixture]
-	public class FinderByPageIdQueryTests : BaseRoutingTest
+	public class ContentFinderByPageIdQueryTests : BaseRoutingTest
 	{
 		/// <summary>
 		/// We don't need a db for this test, will run faster without one
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f0cf2d870a..5acb8ab0e0 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -246,7 +246,7 @@
     <Compile Include="ContentStores\PublishContentStoreTests.cs" />
     <Compile Include="DataTypeFactoryTests.cs" />
     <Compile Include="Resolvers\LazyManyObjectResolverTests.cs" />
-    <Compile Include="Routing\FinderByNiceUrlWithDomainsTests.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrlWithDomainsTests.cs" />
     <Compile Include="Routing\NiceUrlsProviderWithDomainsTests.cs" />
     <Compile Include="Routing\uQueryGetNodeIdByUrlTests.cs" />
     <Compile Include="Routing\UrlsWithNestedDomains.cs" />
@@ -260,11 +260,11 @@
     <Compile Include="TestHelpers\BaseDatabaseFactoryTest.cs" />
     <Compile Include="TestHelpers\BaseRoutingTest.cs" />
     <Compile Include="GlobalSettingsTests.cs" />
-    <Compile Include="Routing\FinderByAliasTests.cs" />
-    <Compile Include="Routing\FinderByIdTests.cs" />
-    <Compile Include="Routing\FinderByNiceUrlAndTemplateTests.cs" />
-    <Compile Include="Routing\FinderByNiceUrlTests.cs" />
-    <Compile Include="Routing\FinderByPageIdQueryTests.cs" />
+    <Compile Include="Routing\ContentFinderByAliasTests.cs" />
+    <Compile Include="Routing\ContentFinderByIdTests.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrlAndTemplateTests.cs" />
+    <Compile Include="Routing\ContentFinderByNiceUrlTests.cs" />
+    <Compile Include="Routing\ContentFinderByPageIdQueryTests.cs" />
     <Compile Include="Routing\NiceUrlProviderTests.cs" />
     <Compile Include="Routing\RenderRouteHandlerTests.cs" />
     <Compile Include="Routing\RouteTestExtensions.cs" />