diff --git a/build/Helpers.lua b/build/Helpers.lua
index 468d383e..301f3157 100644
--- a/build/Helpers.lua
+++ b/build/Helpers.lua
@@ -253,11 +253,11 @@ function AddPlatformSpecificFiles(folder, filename)
       files { path.join(folder, "i686-pc-win32-msvc", filename) }
   elseif os.istarget("macosx") then
     filter { "architecture:arm64" }
-      files { path.join(folder, "arm64-apple-darwin12.4.0", filename) }
+      files { path.join(folder, "arm64-apple-darwin", filename) }
     filter { "architecture:x86_64" }
-      files { path.join(folder, "x86_64-apple-darwin12.4.0", filename) }
+      files { path.join(folder, "x86_64-apple-darwin", filename) }
     filter {"architecture:x86" }
-      files { path.join(folder, "i686-apple-darwin12.4.0", filename) }
+      files { path.join(folder, "i686-apple-darwin", filename) }
   elseif os.istarget("linux") then
     filter { "architecture:arm64" }
       files { path.join(folder, "arm64-linux-gnu" .. (UseCxx11ABI() and "-cxx11abi" or ""), filename) }
diff --git a/src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj b/src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj
index cb09d656..e21dd2c8 100644
--- a/src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj
+++ b/src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj
@@ -9,9 +9,10 @@
     <PlatformParserFolder Condition="$(IsWindows) AND $(PlatformTarget) == x64">x86_64-pc-win32-msvc</PlatformParserFolder>
     <PlatformParserFolder Condition="$(IsLinux) AND $(PlatformTarget) == x64 AND $(UseCXX11ABI)">x86_64-linux-gnu-cxx11abi</PlatformParserFolder>
     <PlatformParserFolder Condition="$(IsLinux) AND $(PlatformTarget) == x64 AND !$(UseCXX11ABI)">x86_64-linux-gnu</PlatformParserFolder>
-    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x64">x86_64-apple-darwin12.4.0</PlatformParserFolder>
+    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x64">x86_64-apple-darwin</PlatformParserFolder>
+    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == arm64">arm64-apple-darwin</PlatformParserFolder>
     <PlatformParserFolder Condition="$(IsWindows) AND $(PlatformTarget) == x86">i686-pc-win32-msvc</PlatformParserFolder>
-    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x86">i686-apple-darwin12.4.0</PlatformParserFolder>
+    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x86">i686-apple-darwin</PlatformParserFolder>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/CppSharp.CppParser-symbols.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp
rename to src/CppParser/Bindings/CSharp/arm64-apple-darwin/CppSharp.CppParser-symbols.cpp
diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/CppSharp.CppParser.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/CppSharp.CppParser.cs
rename to src/CppParser/Bindings/CSharp/arm64-apple-darwin/CppSharp.CppParser.cs
diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/Std-symbols.cpp
rename to src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp
diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/arm64-apple-darwin12.4.0/Std.cs
rename to src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std.cs
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp b/src/CppParser/Bindings/CSharp/i686-apple-darwin/CppSharp.CppParser-symbols.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp
rename to src/CppParser/Bindings/CSharp/i686-apple-darwin/CppSharp.CppParser-symbols.cpp
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin/CppSharp.CppParser.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
rename to src/CppParser/Bindings/CSharp/i686-apple-darwin/CppSharp.CppParser.cs
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.dll-templates.cpp b/src/CppParser/Bindings/CSharp/i686-apple-darwin/CppSharp.CppParser.dll-templates.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.dll-templates.cpp
rename to src/CppParser/Bindings/CSharp/i686-apple-darwin/CppSharp.CppParser.dll-templates.cpp
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std-symbols.cpp
rename to src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
rename to src/CppParser/Bindings/CSharp/i686-apple-darwin/Std.cs
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/CppSharp.CppParser-symbols.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp
rename to src/CppParser/Bindings/CSharp/x86_64-apple-darwin/CppSharp.CppParser-symbols.cpp
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/CppSharp.CppParser.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
rename to src/CppParser/Bindings/CSharp/x86_64-apple-darwin/CppSharp.CppParser.cs
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.dll-templates.cpp b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/CppSharp.CppParser.dll-templates.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.dll-templates.cpp
rename to src/CppParser/Bindings/CSharp/x86_64-apple-darwin/CppSharp.CppParser.dll-templates.cpp
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp
similarity index 100%
rename from src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std-symbols.cpp
rename to src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
rename to src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std.cs
diff --git a/src/CppParser/ParserGen/ParserGen.cs b/src/CppParser/ParserGen/ParserGen.cs
index d886cb2f..9616de95 100644
--- a/src/CppParser/ParserGen/ParserGen.cs
+++ b/src/CppParser/ParserGen/ParserGen.cs
@@ -175,15 +175,15 @@ namespace CppSharp
             if (Directory.Exists(osxHeadersPath) || Platform.IsMacOS)
             {
                 Console.WriteLine("Generating the C# parser bindings for macOS x86...");
-                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin12.4.0"));
+                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin"));
                 Console.WriteLine();
 
                 Console.WriteLine("Generating the C# parser bindings for macOS x64...");
-                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin12.4.0"));
+                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin"));
                 Console.WriteLine();
 
                 Console.WriteLine("Generating the C# parser bindings for macOS ARM64...");
-                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin12.4.0"));
+                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin"));
                 Console.WriteLine();
             }
             else