diff --git a/Il2CppInspector.Common/Outputs/CppScaffolding.cs b/Il2CppInspector.Common/Outputs/CppScaffolding.cs
index 825a408..2cd56b9 100644
--- a/Il2CppInspector.Common/Outputs/CppScaffolding.cs
+++ b/Il2CppInspector.Common/Outputs/CppScaffolding.cs
@@ -116,8 +116,8 @@ typedef size_t uintptr_t;
             }
             writer.Close();
 
-            // Write API function pointers to il2cpp-function-ptr.h
-            var il2cppFnPtrFile = Path.Combine(srcDataPath, "il2cpp-function-ptr.h");
+            // Write API function pointers to il2cpp-api-functions-ptr.h
+            var il2cppFnPtrFile = Path.Combine(srcDataPath, "il2cpp-api-functions-ptr.h");
 
             using var fs2 = new FileStream(il2cppFnPtrFile, FileMode.Create);
             writer = new StreamWriter(fs2, Encoding.ASCII);
@@ -136,8 +136,8 @@ typedef size_t uintptr_t;
 
             writer.Close();
 
-            // Write application type definition addresses to il2cpp-type-ptr.h
-            var il2cppTypeInfoFile = Path.Combine(srcDataPath, "il2cpp-type-ptr.h");
+            // Write application type definition addresses to il2cpp-types-ptr.h
+            var il2cppTypeInfoFile = Path.Combine(srcDataPath, "il2cpp-types-ptr.h");
 
             using var fs3 = new FileStream(il2cppTypeInfoFile, FileMode.Create);
             writer = new StreamWriter(fs3, Encoding.ASCII);
diff --git a/Il2CppInspector.Common/Properties/Resources.Designer.cs b/Il2CppInspector.Common/Properties/Resources.Designer.cs
index c0a46e2..d226bff 100644
--- a/Il2CppInspector.Common/Properties/Resources.Designer.cs
+++ b/Il2CppInspector.Common/Properties/Resources.Designer.cs
@@ -122,6 +122,7 @@ namespace Il2CppInspector.Properties {
         ///
         ///#include <string>
         ///#include <sstream>
+        ///#include <iomanip>
         ///
         ///// Helper function to get the module base address
         ///uintptr_t GetBaseAddress();
@@ -133,7 +134,7 @@ namespace Il2CppInspector.Properties {
         ///void NewConsole();
         ///
         ///// Helper function to convert a pointer to hex
-        ///template<typename T> std::string to_hex_string(T [rest of string was truncated]";.
+        ///template<t [rest of string was truncated]";.
         /// </summary>
         internal static string Cpp_HelpersH {
             get {
@@ -153,7 +154,7 @@ namespace Il2CppInspector.Properties {
         ///#include &quot;il2cpp-types.h&quot;
         ///
         ///// IL2CPP API function pointers
-        ///#include &quot;il2cpp-function-ptr.h&quot;
+        ///#include &quot;il2cpp-api-functions-ptr.h&quot;
         ///
         ///// IL2CPP APIs
         ///#define DO_API(r, n, p) extern r (*n) p
@@ -163,8 +164,7 @@ namespace Il2CppInspector.Properties {
         ///// Application-specific functions
         ///#define DO_APP_FUNC(a, r, n, p) extern r (*n) p
         ///namespace app {
-        ///	#include &quot;il2cpp-functions.h&quot;
-        ///} [rest of string was truncated]&quot;;.
+        ///	#incl [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Cpp_Il2CppAppDataH {
             get {
@@ -195,7 +195,7 @@ namespace Il2CppInspector.Properties {
         ///#undef DO_APP_FUNC
         ///
         ///// TypeInfo pointers
-        ///#define DO_TYPEDEF(a, n [rest of string was truncated]&quot;;.
+        ///# [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Cpp_Il2CppInitCpp {
             get {
diff --git a/Il2CppInspector.Common/Properties/Resources.resx b/Il2CppInspector.Common/Properties/Resources.resx
index f8110fd..cc9e560 100644
--- a/Il2CppInspector.Common/Properties/Resources.resx
+++ b/Il2CppInspector.Common/Properties/Resources.resx
@@ -190,6 +190,7 @@ void NewConsole() {
 
 #include &lt;string&gt;
 #include &lt;sstream&gt;
+#include &lt;iomanip&gt;
 
 // Helper function to get the module base address
 uintptr_t GetBaseAddress();
@@ -290,9 +291,9 @@ void Run()
   &lt;/ItemGroup&gt;
   &lt;ItemGroup&gt;
     &lt;ClInclude Include="appdata\il2cpp-api-functions.h" /&gt;
-    &lt;ClInclude Include="appdata\il2cpp-function-ptr.h" /&gt;
+    &lt;ClInclude Include="appdata\il2cpp-api-functions-ptr.h" /&gt;
     &lt;ClInclude Include="appdata\il2cpp-functions.h" /&gt;
-    &lt;ClInclude Include="appdata\il2cpp-type-ptr.h" /&gt;
+    &lt;ClInclude Include="appdata\il2cpp-types-ptr.h" /&gt;
     &lt;ClInclude Include="appdata\il2cpp-types.h" /&gt;
     &lt;ClInclude Include="framework\helpers.h" /&gt;
     &lt;ClInclude Include="framework\il2cpp-appdata.h" /&gt;
@@ -1143,7 +1144,7 @@ EndGlobal
 #include "il2cpp-types.h"
 
 // IL2CPP API function pointers
-#include "il2cpp-function-ptr.h"
+#include "il2cpp-api-functions-ptr.h"
 
 // IL2CPP APIs
 #define DO_API(r, n, p) extern r (*n) p
@@ -1160,7 +1161,7 @@ namespace app {
 // TypeInfo pointers
 #define DO_TYPEDEF(a, n) extern n ## __Class* n ## __TypeInfo
 namespace app {
-	#include "il2cpp-type-ptr.h"
+	#include "il2cpp-types-ptr.h"
 }
 #undef DO_TYPEDEF</value>
   </data>
@@ -1189,7 +1190,7 @@ namespace app {
 // TypeInfo pointers
 #define DO_TYPEDEF(a, n) n ## __Class* n ## __TypeInfo
 namespace app {
-#include "il2cpp-type-ptr.h"
+#include "il2cpp-types-ptr.h"
 }
 #undef DO_TYPEDEF
 
@@ -1213,7 +1214,7 @@ void init_il2cpp()
 
 	// Define TypeInfo variables
 	#define DO_TYPEDEF(a, n) n ## __TypeInfo = *(n ## __Class**) (baseAddress + a);
-	#include "il2cpp-type-ptr.h"
+	#include "il2cpp-types-ptr.h"
 	#undef DO_TYPEDEF
 }</value>
   </data>