diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs b/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
index 8251e59c94..90f012f08a 100644
--- a/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
+++ b/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
@@ -2,9 +2,9 @@
 using System.Text.RegularExpressions;
 using Examine;
 using Examine.Search;
-using Umbraco.Extensions;
+using Umbraco.Cms.Infrastructure.Examine;
 
-namespace Umbraco.Cms.Infrastructure.Examine
+namespace Umbraco.Extensions
 {
     public static class UmbracoExamineExtensions
     {
diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
index 118a427fd7..d278e95bb2 100644
--- a/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
+++ b/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
@@ -1,4 +1,5 @@
 using Examine;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.Examine
 {
@@ -7,7 +8,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
     /// </summary>
     public class UmbracoFieldDefinitionCollection : FieldDefinitionCollection
     {
-        
+
         public UmbracoFieldDefinitionCollection()
             : base(UmbracoIndexFieldDefinitions)
         {
@@ -88,6 +89,6 @@ namespace Umbraco.Cms.Infrastructure.Examine
             return false;
         }
 
-        
+
     }
 }
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
index d0b1556dbb..8e693b83ee 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
@@ -8,10 +8,10 @@ using Serilog.Events;
 using Serilog.Formatting;
 using Serilog.Formatting.Compact;
 using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Logging.Serilog.Enrichers;
-using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Core.Logging.Serilog
+namespace Umbraco.Extensions
 {
     public static class LoggerConfigExtensions
     {
diff --git a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
index 25a184d356..ead0791f08 100644
--- a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
@@ -10,7 +10,6 @@ using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Collections;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Models.Packaging;
 using Umbraco.Cms.Core.PropertyEditors;
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
index e9aa286e4e..375cdc02de 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
@@ -13,6 +13,7 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Extensions;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Constants = Umbraco.Cms.Core.Constants;
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index 78b8e028da..fe2a13019b 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -12,6 +12,7 @@ using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Extensions;
 
 namespace Umbraco.Tests.UmbracoExamine
 {