diff --git a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
index 5793e70785..765bd6f761 100644
--- a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
+++ b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
@@ -12,11 +12,10 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Examine;
 using Umbraco.Extensions;
 using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public class BackOfficeExamineSearcher : IBackOfficeExamineSearcher
     {
diff --git a/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs b/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs
index 2784164bec..a33bc3c182 100644
--- a/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs
+++ b/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs
@@ -6,10 +6,9 @@ using Examine.LuceneEngine.Directories;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Runtime;
-using Umbraco.Examine;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public sealed class ExamineLuceneComponent : IComponent
     {
diff --git a/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs b/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
index d63f9b30e8..ddebb458b1 100644
--- a/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
+++ b/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
@@ -4,10 +4,9 @@
 using System.Runtime.InteropServices;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Examine;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     // We want to run after core composers since we are replacing some items
     [ComposeAfter(typeof(ICoreComposer))]
diff --git a/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComponent.cs b/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComponent.cs
index ccf1610b40..c5beb26122 100644
--- a/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComponent.cs
+++ b/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComponent.cs
@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public class ExamineLuceneFinalComponent : IComponent
     {
diff --git a/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs b/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
index a51a35769c..58e2474754 100644
--- a/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
+++ b/src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
@@ -3,7 +3,7 @@
 
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     // examine's Lucene final composer composes after all user composers
     // and *also* after ICoreComposer (in case IUserComposer is disabled)
diff --git a/src/Umbraco.Examine.Lucene/ILuceneDirectoryFactory.cs b/src/Umbraco.Examine.Lucene/ILuceneDirectoryFactory.cs
index f3b085e0ec..0127b8f601 100644
--- a/src/Umbraco.Examine.Lucene/ILuceneDirectoryFactory.cs
+++ b/src/Umbraco.Examine.Lucene/ILuceneDirectoryFactory.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public interface ILuceneDirectoryFactory
     {
diff --git a/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs b/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs
index 7066fe760c..d68dce320b 100644
--- a/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs
@@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Hosting;
 using Umbraco.Extensions;
 using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public class LuceneFileSystemDirectoryFactory : ILuceneDirectoryFactory
     {
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
index 010559a02d..0353a3417f 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
@@ -7,9 +7,8 @@ using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
-using Umbraco.Examine;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
index c2af00fd3e..ebc74e694a 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
@@ -7,10 +7,9 @@ using Lucene.Net.Store;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Hosting;
-using Umbraco.Examine;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public class LuceneIndexDiagnostics : IIndexDiagnostics
     {
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
index 92e75b2824..d987e8d6d8 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
@@ -5,9 +5,8 @@ using Examine;
 using Examine.LuceneEngine.Providers;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Hosting;
-using Umbraco.Examine;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     /// <summary>
     /// Implementation of <see cref="IIndexDiagnosticsFactory"/> which returns <see cref="LuceneIndexDiagnostics"/>
diff --git a/src/Umbraco.Examine.Lucene/LuceneRAMDirectoryFactory.cs b/src/Umbraco.Examine.Lucene/LuceneRAMDirectoryFactory.cs
index b71b20ffa7..5bf8fd7b94 100644
--- a/src/Umbraco.Examine.Lucene/LuceneRAMDirectoryFactory.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneRAMDirectoryFactory.cs
@@ -4,7 +4,7 @@
 using System;
 using Lucene.Net.Store;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public class LuceneRAMDirectoryFactory : ILuceneDirectoryFactory
     {
diff --git a/src/Umbraco.Examine.Lucene/NoPrefixSimpleFsLockFactory.cs b/src/Umbraco.Examine.Lucene/NoPrefixSimpleFsLockFactory.cs
index 046af266ac..1709a1a6a6 100644
--- a/src/Umbraco.Examine.Lucene/NoPrefixSimpleFsLockFactory.cs
+++ b/src/Umbraco.Examine.Lucene/NoPrefixSimpleFsLockFactory.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using Lucene.Net.Store;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     /// <summary>
     /// A custom <see cref="SimpleFSLockFactory"/> that ensures a prefixless lock prefix
diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 696a14e22f..137d4d425c 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net472</TargetFramework>
-        <RootNamespace>Umbraco.Cms.Examine</RootNamespace>
+        <RootNamespace>Umbraco.Examine</RootNamespace>
         <Product>Umbraco CMS</Product>
         <Title>Umbraco.Examine.Lucene</Title>
         <LangVersion>8</LangVersion>
diff --git a/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
index 4d10f1b5ae..f03088afbf 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
@@ -12,9 +12,8 @@ using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Examine;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     /// <summary>
     /// An indexer for Umbraco content and media
diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
index d32a154bd8..95655d5688 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
@@ -16,10 +16,9 @@ using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Examine;
 using Directory = Lucene.Net.Store.Directory;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
 
     /// <summary>
diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
index adb89cc082..124cd11f67 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
@@ -5,9 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Hosting;
-using Umbraco.Examine;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     public class UmbracoExamineIndexDiagnostics : LuceneIndexDiagnostics
     {
diff --git a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
index 6e53687f6e..000eba7f58 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
@@ -12,10 +12,9 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Examine;
 using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     /// <summary>
     /// Creates the indexes used by Umbraco
diff --git a/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
index a164e4fe22..37a139bbc8 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
@@ -7,10 +7,9 @@ using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Examine;
 using Directory = Lucene.Net.Store.Directory;
 
-namespace Umbraco.Cms.Examine
+namespace Umbraco.Examine
 {
     /// <summary>
     /// Custom indexer for members
diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
index d389940042..1c5b05ca2f 100644
--- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -17,7 +17,6 @@ using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Examine;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
 using Umbraco.Cms.Tests.Integration.Implementations;
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 6f07ca3b44..b713a5237b 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -16,16 +16,7 @@ using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Examine;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Services;
 using Umbraco.Examine;
 using Umbraco.Tests.TestHelpers;
 using IContentService = Umbraco.Cms.Core.Services.IContentService;