diff --git a/build/CodeGen/Stage1/ResultCodegen.cs b/build/CodeGen/Stage1/ResultCodegen.cs
index d67cd325..f241d620 100644
--- a/build/CodeGen/Stage1/ResultCodegen.cs
+++ b/build/CodeGen/Stage1/ResultCodegen.cs
@@ -39,7 +39,7 @@ public static class ResultCodeGen
         byte[] archive = BuildArchive(modules);
         byte[] compressedArchive = Build.DeflateBytes(archive);
         string archiveStr = PrintArchive(compressedArchive);
-        WriteOutput("LibHac/ResultNameResolver.Generated.cs", archiveStr);
+        WriteOutput("LibHac/Common/ResultNameResolver.Generated.cs", archiveStr);
 
         string enumStr = PrintEnum(modules);
         WriteOutput("../.nuke/temp/result_enums.txt", enumStr);
@@ -382,7 +382,7 @@ public static class ResultCodeGen
         sb.AppendLine("using System;");
         sb.AppendLine();
 
-        sb.AppendLine("namespace LibHac;");
+        sb.AppendLine("namespace LibHac.Common;");
         sb.AppendLine();
 
         sb.AppendLine("internal partial class ResultNameResolver");
@@ -710,4 +710,4 @@ public sealed class ResultMap : ClassMap<ResultInfo>
             return flags;
         });
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/ResultNameResolver.Archive.cs b/src/LibHac/Common/ResultNameResolver.Archive.cs
similarity index 92%
rename from src/LibHac/ResultNameResolver.Archive.cs
rename to src/LibHac/Common/ResultNameResolver.Archive.cs
index 75401bf4..b5ca6af7 100644
--- a/src/LibHac/ResultNameResolver.Archive.cs
+++ b/src/LibHac/Common/ResultNameResolver.Archive.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 internal partial class ResultNameResolver
 {
@@ -11,4 +11,4 @@ internal partial class ResultNameResolver
         // The script can be run with the "codegen" option to run only the
         // code generation portion of the build.
     };
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/ResultNameResolver.cs b/src/LibHac/Common/ResultNameResolver.cs
similarity index 98%
rename from src/LibHac/ResultNameResolver.cs
rename to src/LibHac/Common/ResultNameResolver.cs
index bb2db98c..128c0c5e 100644
--- a/src/LibHac/ResultNameResolver.cs
+++ b/src/LibHac/Common/ResultNameResolver.cs
@@ -4,10 +4,9 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac;
+namespace LibHac.Common;
 
 internal partial class ResultNameResolver : Result.IResultNameResolver
 {
@@ -96,4 +95,4 @@ internal partial class ResultNameResolver : Result.IResultNameResolver
         }
 #pragma warning restore 649
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/LibHac.csproj b/src/LibHac/LibHac.csproj
index 209246b3..11a33b3f 100644
--- a/src/LibHac/LibHac.csproj
+++ b/src/LibHac/LibHac.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Condition="Exists('ResultNameResolver.Generated.cs')" Remove="ResultNameResolver.Archive.cs" />
+    <Compile Condition="Exists('Common\ResultNameResolver.Generated.cs')" Remove="Common\ResultNameResolver.Archive.cs" />
     <Compile Condition="Exists('Common\Keys\DefaultKeySet.Generated.cs')" Remove="Common\Keys\DefaultKeySet.Empty.cs" />
   </ItemGroup>