diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index 78475953b7..7169b93cb4 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
     /// <summary>
     /// Compose configurations.
     /// </summary>
-    public static class Configuration
+    internal static class Configuration
     {
         public static Composition ComposeConfiguration(this Composition composition)
         {
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs
index b1c76b0753..e13b4f9477 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Composing.CompositionExtensions
 {
-    public static class FileSystems
+    internal static class FileSystems
     {
         /*
          * HOW TO REPLACE THE MEDIA UNDERLYING FILESYSTEM
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
index 23dc9e67c6..0939dd0f71 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
     /// <summary>
     /// Composes repositories.
     /// </summary>
-    public static class Repositories
+    internal static class Repositories
     {
         public static Composition ComposeRepositories(this Composition composition)
         {
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
index a615630c85..c746c2b8b4 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
@@ -13,7 +13,7 @@ using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Core.Composing.CompositionExtensions
 {
-    public static class Services
+    internal static class Services
     {
         public static Composition ComposeServices(this Composition composition)
         {
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeContainerRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeContainerRepository.cs
index 752b641bc3..f36b60484a 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeContainerRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeContainerRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
-    class DataTypeContainerRepository : EntityContainerRepository, IDataTypeContainerRepository
+    internal class DataTypeContainerRepository : EntityContainerRepository, IDataTypeContainerRepository
     {
         public DataTypeContainerRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger)
             : base(scopeAccessor, cache, logger, Constants.ObjectTypes.DataTypeContainer)
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs
index d50981e036..4b5fe8817b 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
-    class DocumentTypeContainerRepository : EntityContainerRepository, IDocumentTypeContainerRepository
+    internal class DocumentTypeContainerRepository : EntityContainerRepository, IDocumentTypeContainerRepository
     {
         public DocumentTypeContainerRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger)
             : base(scopeAccessor, cache, logger, Constants.ObjectTypes.DocumentTypeContainer)