diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 1a39d2a6dd..8df6aafa2d 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -85,9 +85,9 @@
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
       <Name>Umbraco.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Examine2\Umbraco.Examine2.csproj">
+    <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
       <Project>{f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8}</Project>
-      <Name>Umbraco.Examine2</Name>
+      <Name>Umbraco.Examine</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
diff --git a/src/Umbraco.Examine2/BaseValueSetBuilder.cs b/src/Umbraco.Examine/BaseValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/BaseValueSetBuilder.cs
rename to src/Umbraco.Examine/BaseValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
similarity index 100%
rename from src/Umbraco.Examine2/ContentIndexPopulator.cs
rename to src/Umbraco.Examine/ContentIndexPopulator.cs
diff --git a/src/Umbraco.Examine2/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/ContentValueSetBuilder.cs
rename to src/Umbraco.Examine/ContentValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/ContentValueSetValidator.cs b/src/Umbraco.Examine/ContentValueSetValidator.cs
similarity index 100%
rename from src/Umbraco.Examine2/ContentValueSetValidator.cs
rename to src/Umbraco.Examine/ContentValueSetValidator.cs
diff --git a/src/Umbraco.Examine2/IContentValueSetBuilder.cs b/src/Umbraco.Examine/IContentValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/IContentValueSetBuilder.cs
rename to src/Umbraco.Examine/IContentValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/IContentValueSetValidator.cs b/src/Umbraco.Examine/IContentValueSetValidator.cs
similarity index 100%
rename from src/Umbraco.Examine2/IContentValueSetValidator.cs
rename to src/Umbraco.Examine/IContentValueSetValidator.cs
diff --git a/src/Umbraco.Examine2/IIndexCreator.cs b/src/Umbraco.Examine/IIndexCreator.cs
similarity index 100%
rename from src/Umbraco.Examine2/IIndexCreator.cs
rename to src/Umbraco.Examine/IIndexCreator.cs
diff --git a/src/Umbraco.Examine2/IIndexDiagnostics.cs b/src/Umbraco.Examine/IIndexDiagnostics.cs
similarity index 100%
rename from src/Umbraco.Examine2/IIndexDiagnostics.cs
rename to src/Umbraco.Examine/IIndexDiagnostics.cs
diff --git a/src/Umbraco.Examine2/IIndexPopulator.cs b/src/Umbraco.Examine/IIndexPopulator.cs
similarity index 100%
rename from src/Umbraco.Examine2/IIndexPopulator.cs
rename to src/Umbraco.Examine/IIndexPopulator.cs
diff --git a/src/Umbraco.Examine2/IPublishedContentValueSetBuilder.cs b/src/Umbraco.Examine/IPublishedContentValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/IPublishedContentValueSetBuilder.cs
rename to src/Umbraco.Examine/IPublishedContentValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/IUmbracoContentIndex.cs b/src/Umbraco.Examine/IUmbracoContentIndex.cs
similarity index 100%
rename from src/Umbraco.Examine2/IUmbracoContentIndex.cs
rename to src/Umbraco.Examine/IUmbracoContentIndex.cs
diff --git a/src/Umbraco.Examine2/IUmbracoIndex.cs b/src/Umbraco.Examine/IUmbracoIndex.cs
similarity index 100%
rename from src/Umbraco.Examine2/IUmbracoIndex.cs
rename to src/Umbraco.Examine/IUmbracoIndex.cs
diff --git a/src/Umbraco.Examine2/IUmbracoIndexConfig.cs b/src/Umbraco.Examine/IUmbracoIndexConfig.cs
similarity index 100%
rename from src/Umbraco.Examine2/IUmbracoIndexConfig.cs
rename to src/Umbraco.Examine/IUmbracoIndexConfig.cs
diff --git a/src/Umbraco.Examine2/IUmbracoMemberIndex.cs b/src/Umbraco.Examine/IUmbracoMemberIndex.cs
similarity index 100%
rename from src/Umbraco.Examine2/IUmbracoMemberIndex.cs
rename to src/Umbraco.Examine/IUmbracoMemberIndex.cs
diff --git a/src/Umbraco.Examine2/IValueSetBuilder.cs b/src/Umbraco.Examine/IValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/IValueSetBuilder.cs
rename to src/Umbraco.Examine/IValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/IndexPopulator.cs b/src/Umbraco.Examine/IndexPopulator.cs
similarity index 100%
rename from src/Umbraco.Examine2/IndexPopulator.cs
rename to src/Umbraco.Examine/IndexPopulator.cs
diff --git a/src/Umbraco.Examine2/IndexRebuilder.cs b/src/Umbraco.Examine/IndexRebuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/IndexRebuilder.cs
rename to src/Umbraco.Examine/IndexRebuilder.cs
diff --git a/src/Umbraco.Examine2/IndexTypes.cs b/src/Umbraco.Examine/IndexTypes.cs
similarity index 100%
rename from src/Umbraco.Examine2/IndexTypes.cs
rename to src/Umbraco.Examine/IndexTypes.cs
diff --git a/src/Umbraco.Examine2/MediaIndexPopulator.cs b/src/Umbraco.Examine/MediaIndexPopulator.cs
similarity index 100%
rename from src/Umbraco.Examine2/MediaIndexPopulator.cs
rename to src/Umbraco.Examine/MediaIndexPopulator.cs
diff --git a/src/Umbraco.Examine2/MediaValueSetBuilder.cs b/src/Umbraco.Examine/MediaValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/MediaValueSetBuilder.cs
rename to src/Umbraco.Examine/MediaValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/MemberIndexPopulator.cs b/src/Umbraco.Examine/MemberIndexPopulator.cs
similarity index 100%
rename from src/Umbraco.Examine2/MemberIndexPopulator.cs
rename to src/Umbraco.Examine/MemberIndexPopulator.cs
diff --git a/src/Umbraco.Examine2/MemberValueSetBuilder.cs b/src/Umbraco.Examine/MemberValueSetBuilder.cs
similarity index 100%
rename from src/Umbraco.Examine2/MemberValueSetBuilder.cs
rename to src/Umbraco.Examine/MemberValueSetBuilder.cs
diff --git a/src/Umbraco.Examine2/MemberValueSetValidator.cs b/src/Umbraco.Examine/MemberValueSetValidator.cs
similarity index 100%
rename from src/Umbraco.Examine2/MemberValueSetValidator.cs
rename to src/Umbraco.Examine/MemberValueSetValidator.cs
diff --git a/src/Umbraco.Examine2/PublishedContentIndexPopulator.cs b/src/Umbraco.Examine/PublishedContentIndexPopulator.cs
similarity index 100%
rename from src/Umbraco.Examine2/PublishedContentIndexPopulator.cs
rename to src/Umbraco.Examine/PublishedContentIndexPopulator.cs
diff --git a/src/Umbraco.Examine2/Umbraco.Examine2.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
similarity index 91%
rename from src/Umbraco.Examine2/Umbraco.Examine2.csproj
rename to src/Umbraco.Examine/Umbraco.Examine.csproj
index e994fcfa47..93edee43f5 100644
--- a/src/Umbraco.Examine2/Umbraco.Examine2.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Umbraco.Examine2</AssemblyName>
+    <AssemblyName>Umbraco.Examine</AssemblyName>
     <RootNamespace>Umbraco.Examine</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/Umbraco.Examine2/UmbracoExamineExtensions.cs b/src/Umbraco.Examine/UmbracoExamineExtensions.cs
similarity index 100%
rename from src/Umbraco.Examine2/UmbracoExamineExtensions.cs
rename to src/Umbraco.Examine/UmbracoExamineExtensions.cs
diff --git a/src/Umbraco.Examine2/UmbracoExamineFieldNames.cs b/src/Umbraco.Examine/UmbracoExamineFieldNames.cs
similarity index 100%
rename from src/Umbraco.Examine2/UmbracoExamineFieldNames.cs
rename to src/Umbraco.Examine/UmbracoExamineFieldNames.cs
diff --git a/src/Umbraco.Examine2/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
similarity index 100%
rename from src/Umbraco.Examine2/UmbracoFieldDefinitionCollection.cs
rename to src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
diff --git a/src/Umbraco.Examine2/UmbracoIndexConfig.cs b/src/Umbraco.Examine/UmbracoIndexConfig.cs
similarity index 100%
rename from src/Umbraco.Examine2/UmbracoIndexConfig.cs
rename to src/Umbraco.Examine/UmbracoIndexConfig.cs
diff --git a/src/Umbraco.Examine2/ValueSetValidator.cs b/src/Umbraco.Examine/ValueSetValidator.cs
similarity index 100%
rename from src/Umbraco.Examine2/ValueSetValidator.cs
rename to src/Umbraco.Examine/ValueSetValidator.cs
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index d58ca97fcc..887ee3c01f 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -564,9 +564,9 @@
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Examine2\Umbraco.Examine2.csproj">
+    <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
       <Project>{f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8}</Project>
-      <Name>Umbraco.Examine2</Name>
+      <Name>Umbraco.Examine</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7881fb2653..9d226cda3d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -112,9 +112,9 @@
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Examine2\Umbraco.Examine2.csproj">
+    <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
       <Project>{f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8}</Project>
-      <Name>Umbraco.Examine2</Name>
+      <Name>Umbraco.Examine</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj">
       <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 3c55116909..338bc3f3dd 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -113,7 +113,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Infrastrucure.Persi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.TestData", "Umbraco.TestData\Umbraco.TestData.csproj", "{FB5676ED-7A69-492C-B802-E7B24144C0FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine2", "Umbraco.Examine2\Umbraco.Examine2.csproj", "{F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine", "Umbraco.Examine\Umbraco.Examine.csproj", "{F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution