diff --git a/src/Generator/Generators/NAPI/NAPIMarshal.cs b/src/Generator/Generators/NAPI/NAPIMarshal.cs
index 5f78d244..86938f52 100644
--- a/src/Generator/Generators/NAPI/NAPIMarshal.cs
+++ b/src/Generator/Generators/NAPI/NAPIMarshal.cs
@@ -128,7 +128,7 @@ namespace CppSharp.Generators.NAPI
 
         public bool VisitPrimitiveType(PrimitiveType primitive)
         {
-            var result = $"__result";
+            var result = Generator.GeneratedIdentifier(Context.ReturnVarName);
             var (_, func) = GetNAPIPrimitiveType(primitive);
 
             switch (primitive)
@@ -755,7 +755,7 @@ namespace CppSharp.Generators.NAPI
 
         public override bool VisitEnumDecl(Enumeration @enum)
         {
-            VisitPrimitiveType(PrimitiveType.Int);
+            VisitPrimitiveType(@enum.BuiltinType.Type);
 
             Context.Return.StringBuilder.Clear();
             Context.Return.Write($"(::{@enum.QualifiedOriginalName}){Context.Parameter.Name}");