diff --git a/src/HotChocolate/Core/src/Types.Analyzers/Models/GroupedDataLoaderInfo.cs b/src/HotChocolate/Core/src/Types.Analyzers/Models/GroupedDataLoaderInfo.cs
index 93fe0580cb4..7898e96a202 100644
--- a/src/HotChocolate/Core/src/Types.Analyzers/Models/GroupedDataLoaderInfo.cs
+++ b/src/HotChocolate/Core/src/Types.Analyzers/Models/GroupedDataLoaderInfo.cs
@@ -1,4 +1,4 @@
-namespace HotChocolate.Types.Analyzers.FileBuilders;
+namespace HotChocolate.Types.Analyzers.Models;
 
 public class GroupedDataLoaderInfo
 {
diff --git a/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Extensions/HotChocolateInMemoryPersistedOperationsServiceCollectionExtensions.cs b/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Extensions/HotChocolateInMemoryPersistedOperationsServiceCollectionExtensions.cs
index 2c195a056cd..1e832b8c3f6 100644
--- a/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Extensions/HotChocolateInMemoryPersistedOperationsServiceCollectionExtensions.cs
+++ b/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Extensions/HotChocolateInMemoryPersistedOperationsServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Caching.Memory;
 using HotChocolate.PersistedOperations;
-using HotChocolate.PersistedOperations.FileSystem;
+using HotChocolate.PersistedOperations.InMemory;
 using HotChocolate.Utilities;
 
 namespace HotChocolate;
diff --git a/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/InMemoryOperationDocumentStorage.cs b/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/InMemoryOperationDocumentStorage.cs
index 405c4602599..352e2144c21 100644
--- a/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/InMemoryOperationDocumentStorage.cs
+++ b/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/InMemoryOperationDocumentStorage.cs
@@ -2,7 +2,7 @@
 using HotChocolate.Language;
 using Microsoft.Extensions.Caching.Memory;
 
-namespace HotChocolate.PersistedOperations.FileSystem;
+namespace HotChocolate.PersistedOperations.InMemory;
 
 /// <summary>
 /// An implementation of <see cref="IOperationDocumentStorage"/> that uses an in-memory cache.
diff --git a/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Properties/Resources.Designer.cs b/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Properties/Resources.Designer.cs
index 4cecb452b18..c7a35982488 100644
--- a/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Properties/Resources.Designer.cs
+++ b/src/HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace HotChocolate.PersistedOperations.FileSystem.Properties {
+namespace HotChocolate.PersistedOperations.InMemory.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HotChocolate.PersistedOperations.FileSystem.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HotChocolate.PersistedOperations.InMemory.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Builders/HashCodeBuilder.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Builders/HashCodeBuilder.cs
index 9973706d3df..55c35ea7a60 100644
--- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Builders/HashCodeBuilder.cs
+++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Builders/HashCodeBuilder.cs
@@ -1,6 +1,4 @@
-using StrawberryShake.CodeGeneration.CSharp.Builders;
-
-namespace StrawberryShake.CodeGeneration.CSharp.Generators;
+namespace StrawberryShake.CodeGeneration.CSharp.Builders;
 
 internal class HashCodeBuilder : ICode
 {
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Keywords.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Keywords.cs
index 8f644844ff5..16ced4e05e5 100644
--- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Keywords.cs
+++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Keywords.cs
@@ -1,4 +1,4 @@
-namespace StrawberryShake.CodeGeneration.CSharp;
+namespace StrawberryShake.CodeGeneration;
 
 public static class Keywords
 {
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/RuntimeTypeInfo.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/RuntimeTypeInfo.cs
index 7309c504bab..a4be9ac603f 100644
--- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/RuntimeTypeInfo.cs
+++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/RuntimeTypeInfo.cs
@@ -1,5 +1,3 @@
-using StrawberryShake.CodeGeneration.CSharp;
-
 namespace StrawberryShake.CodeGeneration;
 
 public class RuntimeTypeInfo : IEquatable<RuntimeTypeInfo>
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Utilities/NameUtils.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Utilities/NameUtils.cs
index edfcd028879..ce001a61942 100644
--- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Utilities/NameUtils.cs
+++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration/Utilities/NameUtils.cs
@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Text;
 using HotChocolate;
-using StrawberryShake.CodeGeneration.CSharp;
 using Path = HotChocolate.Path;
 
 namespace StrawberryShake.CodeGeneration.Utilities;