diff --git a/Directory.Build.props b/Directory.Build.props
index 850fc00..d69f95b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
 
   <!-- Version -->
   <PropertyGroup>
-    <VersionPrefix>2.2.4</VersionPrefix>
+    <VersionPrefix>2.2.5</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
   </PropertyGroup>
   
diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index 109846e..8e19e37 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -881,6 +881,8 @@ public static class Program
         { "DXGI_OFFER_RESOURCE_FLAGS", "DXGI_OFFER_RESOURCE_FLAG" },
         { "DXGI_SHARED_RESOURCE_RW", "DXGI_SHARED_RESOURCE" },
         { "DXGI_CREATE_FACTORY_FLAGS", "DXGI_CREATE_FACTORY" },
+        { "DXGI_MWA_FLAGS", "DXGI_MWA" },
+        { "DXGI_MAP_FLAGS", "DXGI_MAP" },
 
         // D3D
         { "D3D_INTERPOLATION_MODE", "D3D_INTERPOLATION" },
@@ -915,7 +917,8 @@ public static class Program
         { "D3D12_DEBUG_DEVICE_PARAMETER_TYPE", "D3D12_DEBUG_DEVICE_PARAMETER" },
         { "D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE", "D3D12_DEBUG_COMMAND_LIST_PARAMETER" },
         { "D3D12_SHADER_VERSION_TYPE", "D3D12_SHVER" },
-
+        { "D3D12_STANDARD_MULTISAMPLE_QUALITY_LEVELS", "D3D12" },
+        
         // Dxc
         { "DXC_OUT_KIND", "DXC_OUT" },
 
@@ -939,6 +942,16 @@ public static class Program
         { "WICPixelFormatNumericRepresentation", "WICPixelFormatNumericRepresentation" },
         { "WICPlanarOptions", "WICPlanarOptions" },
         { "WICPersistOptions", "WICPersistOption" },
+        { "WICGifLogicalScreenDescriptorProperties", "WICGifLogicalScreen" },
+        { "WICJpegIndexingOptions", "WICJpegIndexingOptions" },
+        { "WICTiffCompressionOption", "WICTiffCompression" },
+        { "WICJpegYCrCbSubsamplingOption", "WICJpegYCrCb" },
+        { "WICPngFilterOption", "WICPngFilter" },
+        { "WICNamedWhitePoint", "WICWhitePoint" },
+        { "WICRawCapabilities", "WICRawCapability" },
+        { "WICRawRotationCapabilities", "WICRawRotationCapability" },
+        { "WICDdsDimension", "WICDds" },
+        { "WICMetadataCreationOptions", "WICMetadataCreation" },
 
         // FXC
         { "D3DCOMPILER_STRIP_FLAGS", "D3DCOMPILER_STRIP" },
@@ -982,6 +995,11 @@ public static class Program
         { "D2D1_BUFFER_PRECISION_16BPC_FLOAT", "Precision16BitFloat" },
         { "D2D1_BUFFER_PRECISION_32BPC_FLOAT", "Precision32BitFloat" },
 
+        // WIC
+        { "WICAsShotParameterSet", "AsShot" },
+        { "WICUserAdjustedParameterSet", "UserAdjusted" },
+        { "WICAutoAdjustedParameterSet", "AutoAdjusted" },
+
         // XAudio2
         { "XAPO_BUFFER_SILENT", "Silent" },
         { "XAPO_BUFFER_VALID", "Valid" },
@@ -1198,6 +1216,7 @@ public static class Program
     private static readonly Dictionary<string, Dictionary<string, List<ApiType>>> s_visitedComTypes = new();
     private static readonly HashSet<string> s_enumConstants = [];
 
+    private static bool s_generateDocs = true;
     private static bool s_generateUnmanagedDocs = true;
 
     public static string FindRepoRoot()
@@ -1854,7 +1873,9 @@ public static class Program
             functionName = function.Name;
         }
 
-        if (string.IsNullOrEmpty(writer.DocFileName) == false && !asParameter && !asCallback)
+        if (s_generateDocs == true &&
+            string.IsNullOrEmpty(writer.DocFileName) == false
+            && !asParameter && !asCallback)
         {
             writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{functionName}\"]/*' />");
         }
@@ -1959,6 +1980,18 @@ public static class Program
                 enumPrefix = knowPrefix!;
                 skipPrettify = true;
             }
+            else if(csTypeName.EndsWith("Properties"))
+            {
+                // WICGifImageDescriptorProperties => WICGifImageDescriptor
+                enumPrefix = csTypeName.Substring(0, csTypeName.IndexOf("Properties"));
+                skipPrettify = true;
+            }
+            else
+            {
+                // WICJpegTransferMatrix => WICJpegTransferMatrix
+                enumPrefix = csTypeName;
+                skipPrettify = true;
+            }
         }
         else if (enumType.Name.StartsWith("D3D")
             && !enumType.Name.StartsWith("D3D_")
@@ -1988,7 +2021,9 @@ public static class Program
 
         string baseTypeName = GetTypeName(enumType.IntegerBase);
 
-        if (!autoGenerated && string.IsNullOrEmpty(writer.DocFileName) == false)
+        if (s_generateDocs == true &&
+            !autoGenerated
+            && string.IsNullOrEmpty(writer.DocFileName) == false)
         {
             writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{enumType.Name}\"]/*' />");
         }
@@ -2083,7 +2118,9 @@ public static class Program
 
                 string enumValueName = GetEnumItemName(enumType, enumItem, enumPrefix, skipPrettify);
 
-                if (!autoGenerated && string.IsNullOrEmpty(writer.DocFileName) == false)
+                if (s_generateDocs == true &&
+                    !autoGenerated
+                    && string.IsNullOrEmpty(writer.DocFileName) == false)
                 {
                     writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{enumType.Name}::{enumItem.Name}\"]/*' />");
                 }
@@ -2212,7 +2249,8 @@ public static class Program
 
         if (!nestedType)
         {
-            if (string.IsNullOrEmpty(writer.DocFileName) == false)
+            if (s_generateDocs == true &&
+                string.IsNullOrEmpty(writer.DocFileName) == false)
             {
                 writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{structType.Name}\"]/*' />");
             }
@@ -2255,7 +2293,8 @@ public static class Program
                 }
 
                 string fieldTypeName = GetTypeNameWithPointerCheck(api, field.Type);
-                if (string.IsNullOrEmpty(writer.DocFileName) == false)
+                if (s_generateDocs == true &&
+                    string.IsNullOrEmpty(writer.DocFileName) == false)
                 {
                     writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{structType.Name}::{field.Name}\"]/*' />");
                 }
@@ -2448,7 +2487,8 @@ public static class Program
             namespaces.ToArray()
             );
 
-        if (string.IsNullOrEmpty(writer.DocFileName) == false)
+        if (s_generateDocs == true &&
+            string.IsNullOrEmpty(writer.DocFileName) == false)
         {
             writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{comType.Name}\"]/*' />");
         }
@@ -2701,7 +2741,8 @@ public static class Program
                     bool needToAddInterfaceMethod = true;
                     if (comType.Name == docName)
                     {
-                        if (string.IsNullOrEmpty(writer.DocFileName) == false)
+                        if (s_generateDocs == true &&
+                            string.IsNullOrEmpty(writer.DocFileName) == false)
                         {
                             writer.WriteLine($"/// <include file='{writer.DocFileName}.xml' path='doc/member[@name=\"{comType.Name}::{method.Name}\"]/*' />");
                         }
diff --git a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs
index cd03c87..10a7e37 100644
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
 
 using System.Buffers;
-using System.Text.RegularExpressions;
+using System.Runtime.InteropServices.Marshalling;
 using System.Text;
 using static Win32.Apis;
 
@@ -16,29 +16,41 @@ public static unsafe partial class Apis
         string source,
         string entryPoint,
         string target,
-        CompileFlags flags = CompileFlags.None)
+        string? sourceName = default,
+        ShaderMacro* pDefines = default,
+        ID3DInclude* includeHandler = default,
+        CompileFlags flags = CompileFlags.None,
+        CompileFlags2 flags2 = CompileFlags2.None)
     {
-        byte[] sourceUtf8 = Encoding.UTF8.GetBytes(source);
-        byte[] entryPointUtf8 = Encoding.UTF8.GetBytes(entryPoint);
-        byte[] targetUtf8 = Encoding.UTF8.GetBytes(target);
-
-        using ComPtr<ID3DBlob> d3dBlobBytecode = default;
-        using ComPtr<ID3DBlob> d3dBlobErrors = default;
-
-        fixed (byte* sourcePtr = sourceUtf8)
-        fixed (byte* entryPointPtr = entryPointUtf8)
-        fixed (byte* targetPtr = targetUtf8)
+        scoped Utf8StringMarshaller.ManagedToUnmanagedIn __source__marshaller = new();
+        scoped Utf8StringMarshaller.ManagedToUnmanagedIn __sourceName__marshaller = new();
+        scoped Utf8StringMarshaller.ManagedToUnmanagedIn __entryPoint__marshaller = new();
+        scoped Utf8StringMarshaller.ManagedToUnmanagedIn __target__marshaller = new();
+        try
         {
+            __source__marshaller.FromManaged(source, stackalloc byte[Utf8StringMarshaller.ManagedToUnmanagedIn.BufferSize]);
+            __sourceName__marshaller.FromManaged(sourceName, stackalloc byte[Utf8StringMarshaller.ManagedToUnmanagedIn.BufferSize]);
+            __entryPoint__marshaller.FromManaged(entryPoint, stackalloc byte[Utf8StringMarshaller.ManagedToUnmanagedIn.BufferSize]);
+            __target__marshaller.FromManaged(target, stackalloc byte[Utf8StringMarshaller.ManagedToUnmanagedIn.BufferSize]);
+
+            byte* sourcePtr = __source__marshaller.ToUnmanaged();
+            byte* sourceNamePtr = __sourceName__marshaller.ToUnmanaged();
+            byte* entryPointPtr = __entryPoint__marshaller.ToUnmanaged();
+            byte* targetPtr = __target__marshaller.ToUnmanaged();
+
+            using ComPtr<ID3DBlob> d3dBlobBytecode = default;
+            using ComPtr<ID3DBlob> d3dBlobErrors = default;
+
             HResult hr = D3DCompile(
                 pSrcData: sourcePtr,
-                SrcDataSize: (nuint)sourceUtf8.Length,
-                pSourceName: null,
-                pDefines: null,
-                pInclude: D3D_COMPILE_STANDARD_FILE_INCLUDE,
+                SrcDataSize: (nuint)source.Length,
+                pSourceName: sourceNamePtr,
+                pDefines: pDefines,
+                pInclude: includeHandler != null ? includeHandler : D3D_COMPILE_STANDARD_FILE_INCLUDE,
                 pEntrypoint: entryPointPtr,
                 pTarget: targetPtr,
                 Flags1: flags,
-                Flags2: 0u,
+                Flags2: (uint)flags2,
                 ppCode: d3dBlobBytecode.GetAddressOf(),
                 ppErrorMsgs: d3dBlobErrors.GetAddressOf()
                 );
@@ -54,60 +66,13 @@ public static unsafe partial class Apis
 
             ThrowIfFailed(hr);
 
-            return d3dBlobBytecode.Move();
-        }
-    }
-
-    public static ComPtr<ID3DBlob> D3DCompile(
-        ReadOnlySpan<char> source,
-        ReadOnlySpan<char> entryPoint,
-        ReadOnlySpan<char> target,
-        CompileFlags flags = CompileFlags.None)
-    {
-        int maxLength = Encoding.UTF8.GetMaxByteCount(source.Length);
-        byte[] sourceBuffer = ArrayPool<byte>.Shared.Rent(maxLength);
-        int writtenBytes = Encoding.UTF8.GetBytes(source, sourceBuffer);
-
-        maxLength = Encoding.UTF8.GetMaxByteCount(entryPoint.Length);
-        byte[] entryPointBuffer = ArrayPool<byte>.Shared.Rent(maxLength);
-        int entryPointWrittenBytes = Encoding.UTF8.GetBytes(entryPoint, entryPointBuffer);
-
-        maxLength = Encoding.UTF8.GetMaxByteCount(target.Length);
-        byte[] targetBuffer = ArrayPool<byte>.Shared.Rent(maxLength);
-        int targetWrittenBytes = Encoding.UTF8.GetBytes(target, targetBuffer);
-
-        try
-        {
-            using ComPtr<ID3DBlob> d3dBlobBytecode = default;
-            using ComPtr<ID3DBlob> d3dBlobErrors = default;
-
-            HResult hr = D3DCompile(
-                sourceBuffer.AsSpan(0, writtenBytes),
-                entryPointBuffer.AsSpan(0, entryPointWrittenBytes),
-                targetBuffer.AsSpan(0, targetWrittenBytes),
-                flags,
-                d3dBlobBytecode.GetAddressOf(),
-                d3dBlobErrors.GetAddressOf());
-
-            if (hr.Failure)
-            {
-                // Throw if an error was retrieved, then also double check the HRESULT
-                if (d3dBlobErrors.Get() is not null)
-                {
-                    ThrowHslsCompilationException(d3dBlobErrors.Get());
-                }
-            }
-
-            ThrowIfFailed(hr);
-
             return d3dBlobBytecode.Move();
         }
         finally
         {
-
-            ArrayPool<byte>.Shared.Return(sourceBuffer);
-            ArrayPool<byte>.Shared.Return(entryPointBuffer);
-            ArrayPool<byte>.Shared.Return(targetBuffer);
+            __source__marshaller.Free();
+            __entryPoint__marshaller.Free();
+            __target__marshaller.Free();
         }
     }
 
@@ -174,18 +139,6 @@ public static unsafe partial class Apis
     {
         string message = new((sbyte*)d3DOperationResult->GetBufferPointer());
 
-        // The error message will be in a format like this:
-        // "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\Roslyn\Shader@0x0000019AD1B4BA70(22,32-35): error X3004: undeclared identifier 'this'"
-        // This regex tries to match the unnecessary header and remove it, if present. This doesn't need to be bulletproof, and this regex should match all cases anyway.
-        message = Regex.Replace(message, @"^[A-Z]:\\[^:]+: (\w+ \w+:)", static m => m.Groups[1].Value, RegexOptions.Multiline).Trim();
-
-        // Add a trailing '.' if not present
-        if (message is { Length: > 0 } &&
-            message[message.Length - 1] != '.')
-        {
-            message += '.';
-        }
-
-        throw new FxcCompilationException(message);
+        throw new ExternalException(message);
     }
 }
diff --git a/src/Vortice.Win32.Graphics.Direct3D.Fxc/FxcCompilationException.cs b/src/Vortice.Win32.Graphics.Direct3D.Fxc/FxcCompilationException.cs
deleted file mode 100644
index c7237ae..0000000
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/FxcCompilationException.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © Amer Koleci and Contributors.
-// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
-
-using System.Text;
-
-namespace Win32.Graphics.Direct3D.Fxc;
-
-/// <summary>
-/// A custom <see cref="Exception"/> type that indicates when a shader compilation with the FXC compiler has failed.
-/// </summary>
-public sealed class FxcCompilationException : Exception
-{
-    /// <summary>
-    /// Creates a new <see cref="FxcCompilationException"/> instance.
-    /// </summary>
-    /// <param name="error">The error message produced by the DXC compiler.</param>
-    internal FxcCompilationException(string error)
-        : base(GetExceptionMessage(error))
-    {
-    }
-
-    /// <summary>
-    /// Gets a formatted exception message for a given compilation error.
-    /// </summary>
-    /// <param name="error">The input compilatin error message from the FXC compiler.</param>
-    /// <returns>A formatted error message for a new <see cref="FxcCompilationException"/> instance.</returns>
-    private static string GetExceptionMessage(string error)
-    {
-        StringBuilder builder = new(512);
-
-        builder.AppendLine("The FXC compiler encountered one or more errors while trying to compile the shader:");
-        builder.AppendLine();
-        builder.AppendLine(error.Trim());
-
-        return builder.ToString();
-    }
-}
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.cs
index 9ef0e62..88a0e65 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.cs
@@ -1281,8 +1281,8 @@ public static partial class Apis
 	public const IndexBufferStripCutValue D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED = IndexBufferStripCutValue.Disabled;
 	public const IndexBufferStripCutValue D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF = IndexBufferStripCutValue.I16Bits;
 	public const IndexBufferStripCutValue D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF = IndexBufferStripCutValue.I32Bits;
-	public const StandardMultisampleQualityLevels D3D12_STANDARD_MULTISAMPLE_PATTERN = StandardMultisampleQualityLevels.D3D12_STANDARD_MULTISAMPLE_PATTERN;
-	public const StandardMultisampleQualityLevels D3D12_CENTER_MULTISAMPLE_PATTERN = StandardMultisampleQualityLevels.D3D12_CENTER_MULTISAMPLE_PATTERN;
+	public const StandardMultisampleQualityLevels D3D12_STANDARD_MULTISAMPLE_PATTERN = StandardMultisampleQualityLevels.StandardMultisamplePattern;
+	public const StandardMultisampleQualityLevels D3D12_CENTER_MULTISAMPLE_PATTERN = StandardMultisampleQualityLevels.CenterMultisamplePattern;
 	public const PipelineStateFlags D3D12_PIPELINE_STATE_FLAG_NONE = PipelineStateFlags.None;
 	public const PipelineStateFlags D3D12_PIPELINE_STATE_FLAG_TOOL_DEBUG = PipelineStateFlags.ToolDebug;
 	public const PipelineStateFlags D3D12_PIPELINE_STATE_FLAG_DYNAMIC_DEPTH_BIAS = PipelineStateFlags.DynamicDepthBias;
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs
index 903261f..1576ca7 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs
@@ -414,10 +414,10 @@ public enum StandardMultisampleQualityLevels
 {
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_STANDARD_MULTISAMPLE_QUALITY_LEVELS::D3D12_STANDARD_MULTISAMPLE_PATTERN"]/*' />
 	/// <unmanaged>D3D12_STANDARD_MULTISAMPLE_PATTERN</unmanaged>
-	D3D12_STANDARD_MULTISAMPLE_PATTERN = -1,
+	StandardMultisamplePattern = -1,
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_STANDARD_MULTISAMPLE_QUALITY_LEVELS::D3D12_CENTER_MULTISAMPLE_PATTERN"]/*' />
 	/// <unmanaged>D3D12_CENTER_MULTISAMPLE_PATTERN</unmanaged>
-	D3D12_CENTER_MULTISAMPLE_PATTERN = -2,
+	CenterMultisamplePattern = -2,
 }
 
 /// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_PIPELINE_STATE_FLAGS"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.cs
index 211b845..6073bb0 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.cs
@@ -201,13 +201,13 @@ public static partial class Apis
 	public const EnumModesFlags DXGI_ENUM_MODES_SCALING = EnumModesFlags.Scaling;
 	public const EnumModesFlags DXGI_ENUM_MODES_STEREO = EnumModesFlags.Stereo;
 	public const EnumModesFlags DXGI_ENUM_MODES_DISABLED_STEREO = EnumModesFlags.DisabledStereo;
-	public const WindowAssociationFlags DXGI_MWA_NO_WINDOW_CHANGES = WindowAssociationFlags.DXGI_MWA_NO_WINDOW_CHANGES;
-	public const WindowAssociationFlags DXGI_MWA_NO_ALT_ENTER = WindowAssociationFlags.DXGI_MWA_NO_ALT_ENTER;
-	public const WindowAssociationFlags DXGI_MWA_NO_PRINT_SCREEN = WindowAssociationFlags.DXGI_MWA_NO_PRINT_SCREEN;
-	public const WindowAssociationFlags DXGI_MWA_VALID = WindowAssociationFlags.DXGI_MWA_VALID;
-	public const MapFlags DXGI_MAP_READ = MapFlags.DXGI_MAP_READ;
-	public const MapFlags DXGI_MAP_WRITE = MapFlags.DXGI_MAP_WRITE;
-	public const MapFlags DXGI_MAP_DISCARD = MapFlags.DXGI_MAP_DISCARD;
+	public const WindowAssociationFlags DXGI_MWA_NO_WINDOW_CHANGES = WindowAssociationFlags.NoWindowChanges;
+	public const WindowAssociationFlags DXGI_MWA_NO_ALT_ENTER = WindowAssociationFlags.NoAltEnter;
+	public const WindowAssociationFlags DXGI_MWA_NO_PRINT_SCREEN = WindowAssociationFlags.NoPrintScreen;
+	public const WindowAssociationFlags DXGI_MWA_VALID = WindowAssociationFlags.Valid;
+	public const MapFlags DXGI_MAP_READ = MapFlags.Read;
+	public const MapFlags DXGI_MAP_WRITE = MapFlags.Write;
+	public const MapFlags DXGI_MAP_DISCARD = MapFlags.Discard;
 	public const ResourcePriority DXGI_RESOURCE_PRIORITY_MINIMUM = ResourcePriority.Minimum;
 	public const ResourcePriority DXGI_RESOURCE_PRIORITY_LOW = ResourcePriority.Low;
 	public const ResourcePriority DXGI_RESOURCE_PRIORITY_NORMAL = ResourcePriority.Normal;
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs
index a6c8a90..d5535e8 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs
@@ -101,16 +101,16 @@ public enum WindowAssociationFlags : uint
 	None = 0,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MWA_FLAGS::DXGI_MWA_NO_WINDOW_CHANGES"]/*' />
 	/// <unmanaged>DXGI_MWA_NO_WINDOW_CHANGES</unmanaged>
-	DXGI_MWA_NO_WINDOW_CHANGES = 1,
+	NoWindowChanges = 1,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MWA_FLAGS::DXGI_MWA_NO_ALT_ENTER"]/*' />
 	/// <unmanaged>DXGI_MWA_NO_ALT_ENTER</unmanaged>
-	DXGI_MWA_NO_ALT_ENTER = 2,
+	NoAltEnter = 2,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MWA_FLAGS::DXGI_MWA_NO_PRINT_SCREEN"]/*' />
 	/// <unmanaged>DXGI_MWA_NO_PRINT_SCREEN</unmanaged>
-	DXGI_MWA_NO_PRINT_SCREEN = 4,
+	NoPrintScreen = 4,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MWA_FLAGS::DXGI_MWA_VALID"]/*' />
 	/// <unmanaged>DXGI_MWA_VALID</unmanaged>
-	DXGI_MWA_VALID = 7,
+	Valid = 7,
 }
 
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MAP_FLAGS"]/*' />
@@ -121,13 +121,13 @@ public enum MapFlags : uint
 	None = 0,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MAP_FLAGS::DXGI_MAP_READ"]/*' />
 	/// <unmanaged>DXGI_MAP_READ</unmanaged>
-	DXGI_MAP_READ = 1,
+	Read = 1,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MAP_FLAGS::DXGI_MAP_WRITE"]/*' />
 	/// <unmanaged>DXGI_MAP_WRITE</unmanaged>
-	DXGI_MAP_WRITE = 2,
+	Write = 2,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MAP_FLAGS::DXGI_MAP_DISCARD"]/*' />
 	/// <unmanaged>DXGI_MAP_DISCARD</unmanaged>
-	DXGI_MAP_DISCARD = 4,
+	Discard = 4,
 }
 
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_RESOURCE_PRIORITY"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.cs
index 080983f..1d3ffad 100644
--- a/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.cs
+++ b/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.cs
@@ -6588,80 +6588,80 @@ public static partial class Apis
 	public const WICComponentSigning WICComponentUnsigned = WICComponentSigning.Unsigned;
 	public const WICComponentSigning WICComponentSafe = WICComponentSigning.Safe;
 	public const WICComponentSigning WICComponentDisabled = WICComponentSigning.Disabled;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenSignature = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenSignature;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorWidth = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorWidth;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorHeight = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorHeight;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorGlobalColorTableFlag = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorGlobalColorTableFlag;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorColorResolution = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorColorResolution;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorSortFlag = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorSortFlag;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorGlobalColorTableSize = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorGlobalColorTableSize;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorBackgroundColorIndex = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorBackgroundColorIndex;
-	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorPixelAspectRatio = WICGifLogicalScreenDescriptorProperties.WICGifLogicalScreenDescriptorPixelAspectRatio;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorLeft = WICGifImageDescriptorProperties.WICGifImageDescriptorLeft;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorTop = WICGifImageDescriptorProperties.WICGifImageDescriptorTop;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorWidth = WICGifImageDescriptorProperties.WICGifImageDescriptorWidth;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorHeight = WICGifImageDescriptorProperties.WICGifImageDescriptorHeight;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorLocalColorTableFlag = WICGifImageDescriptorProperties.WICGifImageDescriptorLocalColorTableFlag;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorInterlaceFlag = WICGifImageDescriptorProperties.WICGifImageDescriptorInterlaceFlag;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorSortFlag = WICGifImageDescriptorProperties.WICGifImageDescriptorSortFlag;
-	public const WICGifImageDescriptorProperties WICGifImageDescriptorLocalColorTableSize = WICGifImageDescriptorProperties.WICGifImageDescriptorLocalColorTableSize;
-	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionDisposal = WICGifGraphicControlExtensionProperties.WICGifGraphicControlExtensionDisposal;
-	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionUserInputFlag = WICGifGraphicControlExtensionProperties.WICGifGraphicControlExtensionUserInputFlag;
-	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionTransparencyFlag = WICGifGraphicControlExtensionProperties.WICGifGraphicControlExtensionTransparencyFlag;
-	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionDelay = WICGifGraphicControlExtensionProperties.WICGifGraphicControlExtensionDelay;
-	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionTransparentColorIndex = WICGifGraphicControlExtensionProperties.WICGifGraphicControlExtensionTransparentColorIndex;
-	public const WICGifApplicationExtensionProperties WICGifApplicationExtensionApplication = WICGifApplicationExtensionProperties.WICGifApplicationExtensionApplication;
-	public const WICGifApplicationExtensionProperties WICGifApplicationExtensionData = WICGifApplicationExtensionProperties.WICGifApplicationExtensionData;
-	public const WICGifCommentExtensionProperties WICGifCommentExtensionText = WICGifCommentExtensionProperties.WICGifCommentExtensionText;
-	public const WICJpegCommentProperties WICJpegCommentText = WICJpegCommentProperties.WICJpegCommentText;
-	public const WICJpegLuminanceProperties WICJpegLuminanceTable = WICJpegLuminanceProperties.WICJpegLuminanceTable;
-	public const WICJpegChrominanceProperties WICJpegChrominanceTable = WICJpegChrominanceProperties.WICJpegChrominanceTable;
-	public const WIC8BIMIptcProperties WIC8BIMIptcPString = WIC8BIMIptcProperties.WIC8BIMIptcPString;
-	public const WIC8BIMIptcProperties WIC8BIMIptcEmbeddedIPTC = WIC8BIMIptcProperties.WIC8BIMIptcEmbeddedIPTC;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoPString = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoPString;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoHResolution = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoHResolution;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoHResolutionUnit = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoHResolutionUnit;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoWidthUnit = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoWidthUnit;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoVResolution = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoVResolution;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoVResolutionUnit = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoVResolutionUnit;
-	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoHeightUnit = WIC8BIMResolutionInfoProperties.WIC8BIMResolutionInfoHeightUnit;
-	public const WIC8BIMIptcDigestProperties WIC8BIMIptcDigestPString = WIC8BIMIptcDigestProperties.WIC8BIMIptcDigestPString;
-	public const WIC8BIMIptcDigestProperties WIC8BIMIptcDigestIptcDigest = WIC8BIMIptcDigestProperties.WIC8BIMIptcDigestIptcDigest;
-	public const WICPngGamaProperties WICPngGamaGamma = WICPngGamaProperties.WICPngGamaGamma;
-	public const WICPngBkgdProperties WICPngBkgdBackgroundColor = WICPngBkgdProperties.WICPngBkgdBackgroundColor;
-	public const WICPngItxtProperties WICPngItxtKeyword = WICPngItxtProperties.WICPngItxtKeyword;
-	public const WICPngItxtProperties WICPngItxtCompressionFlag = WICPngItxtProperties.WICPngItxtCompressionFlag;
-	public const WICPngItxtProperties WICPngItxtLanguageTag = WICPngItxtProperties.WICPngItxtLanguageTag;
-	public const WICPngItxtProperties WICPngItxtTranslatedKeyword = WICPngItxtProperties.WICPngItxtTranslatedKeyword;
-	public const WICPngItxtProperties WICPngItxtText = WICPngItxtProperties.WICPngItxtText;
-	public const WICPngChrmProperties WICPngChrmWhitePointX = WICPngChrmProperties.WICPngChrmWhitePointX;
-	public const WICPngChrmProperties WICPngChrmWhitePointY = WICPngChrmProperties.WICPngChrmWhitePointY;
-	public const WICPngChrmProperties WICPngChrmRedX = WICPngChrmProperties.WICPngChrmRedX;
-	public const WICPngChrmProperties WICPngChrmRedY = WICPngChrmProperties.WICPngChrmRedY;
-	public const WICPngChrmProperties WICPngChrmGreenX = WICPngChrmProperties.WICPngChrmGreenX;
-	public const WICPngChrmProperties WICPngChrmGreenY = WICPngChrmProperties.WICPngChrmGreenY;
-	public const WICPngChrmProperties WICPngChrmBlueX = WICPngChrmProperties.WICPngChrmBlueX;
-	public const WICPngChrmProperties WICPngChrmBlueY = WICPngChrmProperties.WICPngChrmBlueY;
-	public const WICPngHistProperties WICPngHistFrequencies = WICPngHistProperties.WICPngHistFrequencies;
-	public const WICPngIccpProperties WICPngIccpProfileName = WICPngIccpProperties.WICPngIccpProfileName;
-	public const WICPngIccpProperties WICPngIccpProfileData = WICPngIccpProperties.WICPngIccpProfileData;
-	public const WICPngSrgbProperties WICPngSrgbRenderingIntent = WICPngSrgbProperties.WICPngSrgbRenderingIntent;
-	public const WICPngTimeProperties WICPngTimeYear = WICPngTimeProperties.WICPngTimeYear;
-	public const WICPngTimeProperties WICPngTimeMonth = WICPngTimeProperties.WICPngTimeMonth;
-	public const WICPngTimeProperties WICPngTimeDay = WICPngTimeProperties.WICPngTimeDay;
-	public const WICPngTimeProperties WICPngTimeHour = WICPngTimeProperties.WICPngTimeHour;
-	public const WICPngTimeProperties WICPngTimeMinute = WICPngTimeProperties.WICPngTimeMinute;
-	public const WICPngTimeProperties WICPngTimeSecond = WICPngTimeProperties.WICPngTimeSecond;
-	public const WICHeifProperties WICHeifOrientation = WICHeifProperties.WICHeifOrientation;
-	public const WICHeifHdrProperties WICHeifHdrMaximumLuminanceLevel = WICHeifHdrProperties.WICHeifHdrMaximumLuminanceLevel;
-	public const WICHeifHdrProperties WICHeifHdrMaximumFrameAverageLuminanceLevel = WICHeifHdrProperties.WICHeifHdrMaximumFrameAverageLuminanceLevel;
-	public const WICHeifHdrProperties WICHeifHdrMinimumMasteringDisplayLuminanceLevel = WICHeifHdrProperties.WICHeifHdrMinimumMasteringDisplayLuminanceLevel;
-	public const WICHeifHdrProperties WICHeifHdrMaximumMasteringDisplayLuminanceLevel = WICHeifHdrProperties.WICHeifHdrMaximumMasteringDisplayLuminanceLevel;
-	public const WICHeifHdrProperties WICHeifHdrCustomVideoPrimaries = WICHeifHdrProperties.WICHeifHdrCustomVideoPrimaries;
-	public const WICWebpAnimProperties WICWebpAnimLoopCount = WICWebpAnimProperties.WICWebpAnimLoopCount;
-	public const WICWebpAnmfProperties WICWebpAnmfFrameDuration = WICWebpAnmfProperties.WICWebpAnmfFrameDuration;
-	public const WICSectionAccessLevel WICSectionAccessLevelRead = WICSectionAccessLevel.WICSectionAccessLevelRead;
-	public const WICSectionAccessLevel WICSectionAccessLevelReadWrite = WICSectionAccessLevel.WICSectionAccessLevelReadWrite;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenSignature = WICGifLogicalScreenDescriptorProperties.Signature;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorWidth = WICGifLogicalScreenDescriptorProperties.DescriptorWidth;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorHeight = WICGifLogicalScreenDescriptorProperties.DescriptorHeight;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorGlobalColorTableFlag = WICGifLogicalScreenDescriptorProperties.DescriptorGlobalColorTableFlag;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorColorResolution = WICGifLogicalScreenDescriptorProperties.DescriptorColorResolution;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorSortFlag = WICGifLogicalScreenDescriptorProperties.DescriptorSortFlag;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorGlobalColorTableSize = WICGifLogicalScreenDescriptorProperties.DescriptorGlobalColorTableSize;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorBackgroundColorIndex = WICGifLogicalScreenDescriptorProperties.DescriptorBackgroundColorIndex;
+	public const WICGifLogicalScreenDescriptorProperties WICGifLogicalScreenDescriptorPixelAspectRatio = WICGifLogicalScreenDescriptorProperties.DescriptorPixelAspectRatio;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorLeft = WICGifImageDescriptorProperties.Left;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorTop = WICGifImageDescriptorProperties.Top;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorWidth = WICGifImageDescriptorProperties.Width;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorHeight = WICGifImageDescriptorProperties.Height;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorLocalColorTableFlag = WICGifImageDescriptorProperties.LocalColorTableFlag;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorInterlaceFlag = WICGifImageDescriptorProperties.InterlaceFlag;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorSortFlag = WICGifImageDescriptorProperties.SortFlag;
+	public const WICGifImageDescriptorProperties WICGifImageDescriptorLocalColorTableSize = WICGifImageDescriptorProperties.LocalColorTableSize;
+	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionDisposal = WICGifGraphicControlExtensionProperties.Disposal;
+	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionUserInputFlag = WICGifGraphicControlExtensionProperties.UserInputFlag;
+	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionTransparencyFlag = WICGifGraphicControlExtensionProperties.TransparencyFlag;
+	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionDelay = WICGifGraphicControlExtensionProperties.Delay;
+	public const WICGifGraphicControlExtensionProperties WICGifGraphicControlExtensionTransparentColorIndex = WICGifGraphicControlExtensionProperties.TransparentColorIndex;
+	public const WICGifApplicationExtensionProperties WICGifApplicationExtensionApplication = WICGifApplicationExtensionProperties.Application;
+	public const WICGifApplicationExtensionProperties WICGifApplicationExtensionData = WICGifApplicationExtensionProperties.Data;
+	public const WICGifCommentExtensionProperties WICGifCommentExtensionText = WICGifCommentExtensionProperties.Text;
+	public const WICJpegCommentProperties WICJpegCommentText = WICJpegCommentProperties.Text;
+	public const WICJpegLuminanceProperties WICJpegLuminanceTable = WICJpegLuminanceProperties.Table;
+	public const WICJpegChrominanceProperties WICJpegChrominanceTable = WICJpegChrominanceProperties.Table;
+	public const WIC8BIMIptcProperties WIC8BIMIptcPString = WIC8BIMIptcProperties.PString;
+	public const WIC8BIMIptcProperties WIC8BIMIptcEmbeddedIPTC = WIC8BIMIptcProperties.EmbeddedIPTC;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoPString = WIC8BIMResolutionInfoProperties.PString;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoHResolution = WIC8BIMResolutionInfoProperties.HResolution;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoHResolutionUnit = WIC8BIMResolutionInfoProperties.HResolutionUnit;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoWidthUnit = WIC8BIMResolutionInfoProperties.WidthUnit;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoVResolution = WIC8BIMResolutionInfoProperties.VResolution;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoVResolutionUnit = WIC8BIMResolutionInfoProperties.VResolutionUnit;
+	public const WIC8BIMResolutionInfoProperties WIC8BIMResolutionInfoHeightUnit = WIC8BIMResolutionInfoProperties.HeightUnit;
+	public const WIC8BIMIptcDigestProperties WIC8BIMIptcDigestPString = WIC8BIMIptcDigestProperties.PString;
+	public const WIC8BIMIptcDigestProperties WIC8BIMIptcDigestIptcDigest = WIC8BIMIptcDigestProperties.IptcDigest;
+	public const WICPngGamaProperties WICPngGamaGamma = WICPngGamaProperties.Gamma;
+	public const WICPngBkgdProperties WICPngBkgdBackgroundColor = WICPngBkgdProperties.BackgroundColor;
+	public const WICPngItxtProperties WICPngItxtKeyword = WICPngItxtProperties.Keyword;
+	public const WICPngItxtProperties WICPngItxtCompressionFlag = WICPngItxtProperties.CompressionFlag;
+	public const WICPngItxtProperties WICPngItxtLanguageTag = WICPngItxtProperties.LanguageTag;
+	public const WICPngItxtProperties WICPngItxtTranslatedKeyword = WICPngItxtProperties.TranslatedKeyword;
+	public const WICPngItxtProperties WICPngItxtText = WICPngItxtProperties.Text;
+	public const WICPngChrmProperties WICPngChrmWhitePointX = WICPngChrmProperties.WhitePointX;
+	public const WICPngChrmProperties WICPngChrmWhitePointY = WICPngChrmProperties.WhitePointY;
+	public const WICPngChrmProperties WICPngChrmRedX = WICPngChrmProperties.RedX;
+	public const WICPngChrmProperties WICPngChrmRedY = WICPngChrmProperties.RedY;
+	public const WICPngChrmProperties WICPngChrmGreenX = WICPngChrmProperties.GreenX;
+	public const WICPngChrmProperties WICPngChrmGreenY = WICPngChrmProperties.GreenY;
+	public const WICPngChrmProperties WICPngChrmBlueX = WICPngChrmProperties.BlueX;
+	public const WICPngChrmProperties WICPngChrmBlueY = WICPngChrmProperties.BlueY;
+	public const WICPngHistProperties WICPngHistFrequencies = WICPngHistProperties.Frequencies;
+	public const WICPngIccpProperties WICPngIccpProfileName = WICPngIccpProperties.ProfileName;
+	public const WICPngIccpProperties WICPngIccpProfileData = WICPngIccpProperties.ProfileData;
+	public const WICPngSrgbProperties WICPngSrgbRenderingIntent = WICPngSrgbProperties.RenderingIntent;
+	public const WICPngTimeProperties WICPngTimeYear = WICPngTimeProperties.Year;
+	public const WICPngTimeProperties WICPngTimeMonth = WICPngTimeProperties.Month;
+	public const WICPngTimeProperties WICPngTimeDay = WICPngTimeProperties.Day;
+	public const WICPngTimeProperties WICPngTimeHour = WICPngTimeProperties.Hour;
+	public const WICPngTimeProperties WICPngTimeMinute = WICPngTimeProperties.Minute;
+	public const WICPngTimeProperties WICPngTimeSecond = WICPngTimeProperties.Second;
+	public const WICHeifProperties WICHeifOrientation = WICHeifProperties.Orientation;
+	public const WICHeifHdrProperties WICHeifHdrMaximumLuminanceLevel = WICHeifHdrProperties.MaximumLuminanceLevel;
+	public const WICHeifHdrProperties WICHeifHdrMaximumFrameAverageLuminanceLevel = WICHeifHdrProperties.MaximumFrameAverageLuminanceLevel;
+	public const WICHeifHdrProperties WICHeifHdrMinimumMasteringDisplayLuminanceLevel = WICHeifHdrProperties.MinimumMasteringDisplayLuminanceLevel;
+	public const WICHeifHdrProperties WICHeifHdrMaximumMasteringDisplayLuminanceLevel = WICHeifHdrProperties.MaximumMasteringDisplayLuminanceLevel;
+	public const WICHeifHdrProperties WICHeifHdrCustomVideoPrimaries = WICHeifHdrProperties.CustomVideoPrimaries;
+	public const WICWebpAnimProperties WICWebpAnimLoopCount = WICWebpAnimProperties.LoopCount;
+	public const WICWebpAnmfProperties WICWebpAnmfFrameDuration = WICWebpAnmfProperties.FrameDuration;
+	public const WICSectionAccessLevel WICSectionAccessLevelRead = WICSectionAccessLevel.Read;
+	public const WICSectionAccessLevel WICSectionAccessLevelReadWrite = WICSectionAccessLevel.ReadWrite;
 	public const WICPixelFormatNumericRepresentation WICPixelFormatNumericRepresentationUnspecified = WICPixelFormatNumericRepresentation.Unspecified;
 	public const WICPixelFormatNumericRepresentation WICPixelFormatNumericRepresentationIndexed = WICPixelFormatNumericRepresentation.Indexed;
 	public const WICPixelFormatNumericRepresentation WICPixelFormatNumericRepresentationUnsignedInteger = WICPixelFormatNumericRepresentation.UnsignedInteger;
@@ -6670,70 +6670,70 @@ public static partial class Apis
 	public const WICPixelFormatNumericRepresentation WICPixelFormatNumericRepresentationFloat = WICPixelFormatNumericRepresentation.Float;
 	public const WICPlanarOptions WICPlanarOptionsDefault = WICPlanarOptions.Default;
 	public const WICPlanarOptions WICPlanarOptionsPreserveSubsampling = WICPlanarOptions.PreserveSubsampling;
-	public const WICJpegIndexingOptions WICJpegIndexingOptionsGenerateOnDemand = WICJpegIndexingOptions.WICJpegIndexingOptionsGenerateOnDemand;
-	public const WICJpegIndexingOptions WICJpegIndexingOptionsGenerateOnLoad = WICJpegIndexingOptions.WICJpegIndexingOptionsGenerateOnLoad;
-	public const WICJpegTransferMatrix WICJpegTransferMatrixIdentity = WICJpegTransferMatrix.WICJpegTransferMatrixIdentity;
-	public const WICJpegTransferMatrix WICJpegTransferMatrixBT601 = WICJpegTransferMatrix.WICJpegTransferMatrixBT601;
-	public const WICJpegScanType WICJpegScanTypeInterleaved = WICJpegScanType.WICJpegScanTypeInterleaved;
-	public const WICJpegScanType WICJpegScanTypePlanarComponents = WICJpegScanType.WICJpegScanTypePlanarComponents;
-	public const WICJpegScanType WICJpegScanTypeProgressive = WICJpegScanType.WICJpegScanTypeProgressive;
-	public const WICTiffCompressionOption WICTiffCompressionDontCare = WICTiffCompressionOption.WICTiffCompressionDontCare;
-	public const WICTiffCompressionOption WICTiffCompressionNone = WICTiffCompressionOption.WICTiffCompressionNone;
-	public const WICTiffCompressionOption WICTiffCompressionCCITT3 = WICTiffCompressionOption.WICTiffCompressionCCITT3;
-	public const WICTiffCompressionOption WICTiffCompressionCCITT4 = WICTiffCompressionOption.WICTiffCompressionCCITT4;
-	public const WICTiffCompressionOption WICTiffCompressionLZW = WICTiffCompressionOption.WICTiffCompressionLZW;
-	public const WICTiffCompressionOption WICTiffCompressionRLE = WICTiffCompressionOption.WICTiffCompressionRLE;
-	public const WICTiffCompressionOption WICTiffCompressionZIP = WICTiffCompressionOption.WICTiffCompressionZIP;
-	public const WICTiffCompressionOption WICTiffCompressionLZWHDifferencing = WICTiffCompressionOption.WICTiffCompressionLZWHDifferencing;
-	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsamplingDefault = WICJpegYCrCbSubsamplingOption.WICJpegYCrCbSubsamplingDefault;
-	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling420 = WICJpegYCrCbSubsamplingOption.WICJpegYCrCbSubsampling420;
-	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling422 = WICJpegYCrCbSubsamplingOption.WICJpegYCrCbSubsampling422;
-	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling444 = WICJpegYCrCbSubsamplingOption.WICJpegYCrCbSubsampling444;
-	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling440 = WICJpegYCrCbSubsamplingOption.WICJpegYCrCbSubsampling440;
-	public const WICPngFilterOption WICPngFilterUnspecified = WICPngFilterOption.WICPngFilterUnspecified;
-	public const WICPngFilterOption WICPngFilterNone = WICPngFilterOption.WICPngFilterNone;
-	public const WICPngFilterOption WICPngFilterSub = WICPngFilterOption.WICPngFilterSub;
-	public const WICPngFilterOption WICPngFilterUp = WICPngFilterOption.WICPngFilterUp;
-	public const WICPngFilterOption WICPngFilterAverage = WICPngFilterOption.WICPngFilterAverage;
-	public const WICPngFilterOption WICPngFilterPaeth = WICPngFilterOption.WICPngFilterPaeth;
-	public const WICPngFilterOption WICPngFilterAdaptive = WICPngFilterOption.WICPngFilterAdaptive;
-	public const WICNamedWhitePoint WICWhitePointDefault = WICNamedWhitePoint.WICWhitePointDefault;
-	public const WICNamedWhitePoint WICWhitePointDaylight = WICNamedWhitePoint.WICWhitePointDaylight;
-	public const WICNamedWhitePoint WICWhitePointCloudy = WICNamedWhitePoint.WICWhitePointCloudy;
-	public const WICNamedWhitePoint WICWhitePointShade = WICNamedWhitePoint.WICWhitePointShade;
-	public const WICNamedWhitePoint WICWhitePointTungsten = WICNamedWhitePoint.WICWhitePointTungsten;
-	public const WICNamedWhitePoint WICWhitePointFluorescent = WICNamedWhitePoint.WICWhitePointFluorescent;
-	public const WICNamedWhitePoint WICWhitePointFlash = WICNamedWhitePoint.WICWhitePointFlash;
-	public const WICNamedWhitePoint WICWhitePointUnderwater = WICNamedWhitePoint.WICWhitePointUnderwater;
-	public const WICNamedWhitePoint WICWhitePointCustom = WICNamedWhitePoint.WICWhitePointCustom;
-	public const WICNamedWhitePoint WICWhitePointAutoWhiteBalance = WICNamedWhitePoint.WICWhitePointAutoWhiteBalance;
-	public const WICNamedWhitePoint WICWhitePointAsShot = WICNamedWhitePoint.WICWhitePointAsShot;
-	public const WICRawCapabilities WICRawCapabilityNotSupported = WICRawCapabilities.WICRawCapabilityNotSupported;
-	public const WICRawCapabilities WICRawCapabilityGetSupported = WICRawCapabilities.WICRawCapabilityGetSupported;
-	public const WICRawCapabilities WICRawCapabilityFullySupported = WICRawCapabilities.WICRawCapabilityFullySupported;
-	public const WICRawRotationCapabilities WICRawRotationCapabilityNotSupported = WICRawRotationCapabilities.WICRawRotationCapabilityNotSupported;
-	public const WICRawRotationCapabilities WICRawRotationCapabilityGetSupported = WICRawRotationCapabilities.WICRawRotationCapabilityGetSupported;
-	public const WICRawRotationCapabilities WICRawRotationCapabilityNinetyDegreesSupported = WICRawRotationCapabilities.WICRawRotationCapabilityNinetyDegreesSupported;
-	public const WICRawRotationCapabilities WICRawRotationCapabilityFullySupported = WICRawRotationCapabilities.WICRawRotationCapabilityFullySupported;
-	public const WICRawParameterSet WICAsShotParameterSet = WICRawParameterSet.WICAsShotParameterSet;
-	public const WICRawParameterSet WICUserAdjustedParameterSet = WICRawParameterSet.WICUserAdjustedParameterSet;
-	public const WICRawParameterSet WICAutoAdjustedParameterSet = WICRawParameterSet.WICAutoAdjustedParameterSet;
-	public const WICRawRenderMode WICRawRenderModeDraft = WICRawRenderMode.WICRawRenderModeDraft;
-	public const WICRawRenderMode WICRawRenderModeNormal = WICRawRenderMode.WICRawRenderModeNormal;
-	public const WICRawRenderMode WICRawRenderModeBestQuality = WICRawRenderMode.WICRawRenderModeBestQuality;
-	public const WICDdsDimension WICDdsTexture1D = WICDdsDimension.WICDdsTexture1D;
-	public const WICDdsDimension WICDdsTexture2D = WICDdsDimension.WICDdsTexture2D;
-	public const WICDdsDimension WICDdsTexture3D = WICDdsDimension.WICDdsTexture3D;
-	public const WICDdsDimension WICDdsTextureCube = WICDdsDimension.WICDdsTextureCube;
-	public const WICDdsAlphaMode WICDdsAlphaModeUnknown = WICDdsAlphaMode.WICDdsAlphaModeUnknown;
-	public const WICDdsAlphaMode WICDdsAlphaModeStraight = WICDdsAlphaMode.WICDdsAlphaModeStraight;
-	public const WICDdsAlphaMode WICDdsAlphaModePremultiplied = WICDdsAlphaMode.WICDdsAlphaModePremultiplied;
-	public const WICDdsAlphaMode WICDdsAlphaModeOpaque = WICDdsAlphaMode.WICDdsAlphaModeOpaque;
-	public const WICDdsAlphaMode WICDdsAlphaModeCustom = WICDdsAlphaMode.WICDdsAlphaModeCustom;
-	public const WICMetadataCreationOptions WICMetadataCreationDefault = WICMetadataCreationOptions.WICMetadataCreationDefault;
-	public const WICMetadataCreationOptions WICMetadataCreationAllowUnknown = WICMetadataCreationOptions.WICMetadataCreationAllowUnknown;
-	public const WICMetadataCreationOptions WICMetadataCreationFailUnknown = WICMetadataCreationOptions.WICMetadataCreationFailUnknown;
-	public const WICMetadataCreationOptions WICMetadataCreationMask = WICMetadataCreationOptions.WICMetadataCreationMask;
+	public const WICJpegIndexingOptions WICJpegIndexingOptionsGenerateOnDemand = WICJpegIndexingOptions.GenerateOnDemand;
+	public const WICJpegIndexingOptions WICJpegIndexingOptionsGenerateOnLoad = WICJpegIndexingOptions.GenerateOnLoad;
+	public const WICJpegTransferMatrix WICJpegTransferMatrixIdentity = WICJpegTransferMatrix.Identity;
+	public const WICJpegTransferMatrix WICJpegTransferMatrixBT601 = WICJpegTransferMatrix.BT601;
+	public const WICJpegScanType WICJpegScanTypeInterleaved = WICJpegScanType.Interleaved;
+	public const WICJpegScanType WICJpegScanTypePlanarComponents = WICJpegScanType.PlanarComponents;
+	public const WICJpegScanType WICJpegScanTypeProgressive = WICJpegScanType.Progressive;
+	public const WICTiffCompressionOption WICTiffCompressionDontCare = WICTiffCompressionOption.DontCare;
+	public const WICTiffCompressionOption WICTiffCompressionNone = WICTiffCompressionOption.None;
+	public const WICTiffCompressionOption WICTiffCompressionCCITT3 = WICTiffCompressionOption.CCITT3;
+	public const WICTiffCompressionOption WICTiffCompressionCCITT4 = WICTiffCompressionOption.CCITT4;
+	public const WICTiffCompressionOption WICTiffCompressionLZW = WICTiffCompressionOption.LZW;
+	public const WICTiffCompressionOption WICTiffCompressionRLE = WICTiffCompressionOption.RLE;
+	public const WICTiffCompressionOption WICTiffCompressionZIP = WICTiffCompressionOption.ZIP;
+	public const WICTiffCompressionOption WICTiffCompressionLZWHDifferencing = WICTiffCompressionOption.LZWHDifferencing;
+	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsamplingDefault = WICJpegYCrCbSubsamplingOption.SubsamplingDefault;
+	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling420 = WICJpegYCrCbSubsamplingOption.Subsampling420;
+	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling422 = WICJpegYCrCbSubsamplingOption.Subsampling422;
+	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling444 = WICJpegYCrCbSubsamplingOption.Subsampling444;
+	public const WICJpegYCrCbSubsamplingOption WICJpegYCrCbSubsampling440 = WICJpegYCrCbSubsamplingOption.Subsampling440;
+	public const WICPngFilterOption WICPngFilterUnspecified = WICPngFilterOption.Unspecified;
+	public const WICPngFilterOption WICPngFilterNone = WICPngFilterOption.None;
+	public const WICPngFilterOption WICPngFilterSub = WICPngFilterOption.Sub;
+	public const WICPngFilterOption WICPngFilterUp = WICPngFilterOption.Up;
+	public const WICPngFilterOption WICPngFilterAverage = WICPngFilterOption.Average;
+	public const WICPngFilterOption WICPngFilterPaeth = WICPngFilterOption.Paeth;
+	public const WICPngFilterOption WICPngFilterAdaptive = WICPngFilterOption.Adaptive;
+	public const WICNamedWhitePoint WICWhitePointDefault = WICNamedWhitePoint.Default;
+	public const WICNamedWhitePoint WICWhitePointDaylight = WICNamedWhitePoint.Daylight;
+	public const WICNamedWhitePoint WICWhitePointCloudy = WICNamedWhitePoint.Cloudy;
+	public const WICNamedWhitePoint WICWhitePointShade = WICNamedWhitePoint.Shade;
+	public const WICNamedWhitePoint WICWhitePointTungsten = WICNamedWhitePoint.Tungsten;
+	public const WICNamedWhitePoint WICWhitePointFluorescent = WICNamedWhitePoint.Fluorescent;
+	public const WICNamedWhitePoint WICWhitePointFlash = WICNamedWhitePoint.Flash;
+	public const WICNamedWhitePoint WICWhitePointUnderwater = WICNamedWhitePoint.Underwater;
+	public const WICNamedWhitePoint WICWhitePointCustom = WICNamedWhitePoint.Custom;
+	public const WICNamedWhitePoint WICWhitePointAutoWhiteBalance = WICNamedWhitePoint.AutoWhiteBalance;
+	public const WICNamedWhitePoint WICWhitePointAsShot = WICNamedWhitePoint.AsShot;
+	public const WICRawCapabilities WICRawCapabilityNotSupported = WICRawCapabilities.NotSupported;
+	public const WICRawCapabilities WICRawCapabilityGetSupported = WICRawCapabilities.GetSupported;
+	public const WICRawCapabilities WICRawCapabilityFullySupported = WICRawCapabilities.FullySupported;
+	public const WICRawRotationCapabilities WICRawRotationCapabilityNotSupported = WICRawRotationCapabilities.NotSupported;
+	public const WICRawRotationCapabilities WICRawRotationCapabilityGetSupported = WICRawRotationCapabilities.GetSupported;
+	public const WICRawRotationCapabilities WICRawRotationCapabilityNinetyDegreesSupported = WICRawRotationCapabilities.NinetyDegreesSupported;
+	public const WICRawRotationCapabilities WICRawRotationCapabilityFullySupported = WICRawRotationCapabilities.FullySupported;
+	public const WICRawParameterSet WICAsShotParameterSet = WICRawParameterSet.AsShot;
+	public const WICRawParameterSet WICUserAdjustedParameterSet = WICRawParameterSet.UserAdjusted;
+	public const WICRawParameterSet WICAutoAdjustedParameterSet = WICRawParameterSet.AutoAdjusted;
+	public const WICRawRenderMode WICRawRenderModeDraft = WICRawRenderMode.Draft;
+	public const WICRawRenderMode WICRawRenderModeNormal = WICRawRenderMode.Normal;
+	public const WICRawRenderMode WICRawRenderModeBestQuality = WICRawRenderMode.BestQuality;
+	public const WICDdsDimension WICDdsTexture1D = WICDdsDimension.Texture1D;
+	public const WICDdsDimension WICDdsTexture2D = WICDdsDimension.Texture2D;
+	public const WICDdsDimension WICDdsTexture3D = WICDdsDimension.Texture3D;
+	public const WICDdsDimension WICDdsTextureCube = WICDdsDimension.TextureCube;
+	public const WICDdsAlphaMode WICDdsAlphaModeUnknown = WICDdsAlphaMode.Unknown;
+	public const WICDdsAlphaMode WICDdsAlphaModeStraight = WICDdsAlphaMode.Straight;
+	public const WICDdsAlphaMode WICDdsAlphaModePremultiplied = WICDdsAlphaMode.Premultiplied;
+	public const WICDdsAlphaMode WICDdsAlphaModeOpaque = WICDdsAlphaMode.Opaque;
+	public const WICDdsAlphaMode WICDdsAlphaModeCustom = WICDdsAlphaMode.Custom;
+	public const WICMetadataCreationOptions WICMetadataCreationDefault = WICMetadataCreationOptions.Default;
+	public const WICMetadataCreationOptions WICMetadataCreationAllowUnknown = WICMetadataCreationOptions.AllowUnknown;
+	public const WICMetadataCreationOptions WICMetadataCreationFailUnknown = WICMetadataCreationOptions.FailUnknown;
+	public const WICMetadataCreationOptions WICMetadataCreationMask = WICMetadataCreationOptions.Mask;
 	public const WICPersistOptions WICPersistOptionDefault = WICPersistOptions.Default;
 	public const WICPersistOptions WICPersistOptionLittleEndian = WICPersistOptions.LittleEndian;
 	public const WICPersistOptions WICPersistOptionBigEndian = WICPersistOptions.BigEndian;
diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Enums.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Enums.cs
index 19e3c6d..454d89e 100644
--- a/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Enums.cs
+++ b/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Enums.cs
@@ -350,31 +350,31 @@ public enum WICGifLogicalScreenDescriptorProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenSignature"]/*' />
 	/// <unmanaged>WICGifLogicalScreenSignature</unmanaged>
-	WICGifLogicalScreenSignature = 1,
+	Signature = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorWidth"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorWidth</unmanaged>
-	WICGifLogicalScreenDescriptorWidth = 2,
+	DescriptorWidth = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorHeight"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorHeight</unmanaged>
-	WICGifLogicalScreenDescriptorHeight = 3,
+	DescriptorHeight = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorGlobalColorTableFlag"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorGlobalColorTableFlag</unmanaged>
-	WICGifLogicalScreenDescriptorGlobalColorTableFlag = 4,
+	DescriptorGlobalColorTableFlag = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorColorResolution"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorColorResolution</unmanaged>
-	WICGifLogicalScreenDescriptorColorResolution = 5,
+	DescriptorColorResolution = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorSortFlag"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorSortFlag</unmanaged>
-	WICGifLogicalScreenDescriptorSortFlag = 6,
+	DescriptorSortFlag = 6,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorGlobalColorTableSize"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorGlobalColorTableSize</unmanaged>
-	WICGifLogicalScreenDescriptorGlobalColorTableSize = 7,
+	DescriptorGlobalColorTableSize = 7,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorBackgroundColorIndex"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorBackgroundColorIndex</unmanaged>
-	WICGifLogicalScreenDescriptorBackgroundColorIndex = 8,
+	DescriptorBackgroundColorIndex = 8,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifLogicalScreenDescriptorProperties::WICGifLogicalScreenDescriptorPixelAspectRatio"]/*' />
 	/// <unmanaged>WICGifLogicalScreenDescriptorPixelAspectRatio</unmanaged>
-	WICGifLogicalScreenDescriptorPixelAspectRatio = 9,
+	DescriptorPixelAspectRatio = 9,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties"]/*' />
@@ -383,28 +383,28 @@ public enum WICGifImageDescriptorProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorLeft"]/*' />
 	/// <unmanaged>WICGifImageDescriptorLeft</unmanaged>
-	WICGifImageDescriptorLeft = 1,
+	Left = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorTop"]/*' />
 	/// <unmanaged>WICGifImageDescriptorTop</unmanaged>
-	WICGifImageDescriptorTop = 2,
+	Top = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorWidth"]/*' />
 	/// <unmanaged>WICGifImageDescriptorWidth</unmanaged>
-	WICGifImageDescriptorWidth = 3,
+	Width = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorHeight"]/*' />
 	/// <unmanaged>WICGifImageDescriptorHeight</unmanaged>
-	WICGifImageDescriptorHeight = 4,
+	Height = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorLocalColorTableFlag"]/*' />
 	/// <unmanaged>WICGifImageDescriptorLocalColorTableFlag</unmanaged>
-	WICGifImageDescriptorLocalColorTableFlag = 5,
+	LocalColorTableFlag = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorInterlaceFlag"]/*' />
 	/// <unmanaged>WICGifImageDescriptorInterlaceFlag</unmanaged>
-	WICGifImageDescriptorInterlaceFlag = 6,
+	InterlaceFlag = 6,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorSortFlag"]/*' />
 	/// <unmanaged>WICGifImageDescriptorSortFlag</unmanaged>
-	WICGifImageDescriptorSortFlag = 7,
+	SortFlag = 7,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifImageDescriptorProperties::WICGifImageDescriptorLocalColorTableSize"]/*' />
 	/// <unmanaged>WICGifImageDescriptorLocalColorTableSize</unmanaged>
-	WICGifImageDescriptorLocalColorTableSize = 8,
+	LocalColorTableSize = 8,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICGifGraphicControlExtensionProperties"]/*' />
@@ -413,19 +413,19 @@ public enum WICGifGraphicControlExtensionProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifGraphicControlExtensionProperties::WICGifGraphicControlExtensionDisposal"]/*' />
 	/// <unmanaged>WICGifGraphicControlExtensionDisposal</unmanaged>
-	WICGifGraphicControlExtensionDisposal = 1,
+	Disposal = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifGraphicControlExtensionProperties::WICGifGraphicControlExtensionUserInputFlag"]/*' />
 	/// <unmanaged>WICGifGraphicControlExtensionUserInputFlag</unmanaged>
-	WICGifGraphicControlExtensionUserInputFlag = 2,
+	UserInputFlag = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifGraphicControlExtensionProperties::WICGifGraphicControlExtensionTransparencyFlag"]/*' />
 	/// <unmanaged>WICGifGraphicControlExtensionTransparencyFlag</unmanaged>
-	WICGifGraphicControlExtensionTransparencyFlag = 3,
+	TransparencyFlag = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifGraphicControlExtensionProperties::WICGifGraphicControlExtensionDelay"]/*' />
 	/// <unmanaged>WICGifGraphicControlExtensionDelay</unmanaged>
-	WICGifGraphicControlExtensionDelay = 4,
+	Delay = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifGraphicControlExtensionProperties::WICGifGraphicControlExtensionTransparentColorIndex"]/*' />
 	/// <unmanaged>WICGifGraphicControlExtensionTransparentColorIndex</unmanaged>
-	WICGifGraphicControlExtensionTransparentColorIndex = 5,
+	TransparentColorIndex = 5,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICGifApplicationExtensionProperties"]/*' />
@@ -434,10 +434,10 @@ public enum WICGifApplicationExtensionProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifApplicationExtensionProperties::WICGifApplicationExtensionApplication"]/*' />
 	/// <unmanaged>WICGifApplicationExtensionApplication</unmanaged>
-	WICGifApplicationExtensionApplication = 1,
+	Application = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifApplicationExtensionProperties::WICGifApplicationExtensionData"]/*' />
 	/// <unmanaged>WICGifApplicationExtensionData</unmanaged>
-	WICGifApplicationExtensionData = 2,
+	Data = 2,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICGifCommentExtensionProperties"]/*' />
@@ -446,7 +446,7 @@ public enum WICGifCommentExtensionProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICGifCommentExtensionProperties::WICGifCommentExtensionText"]/*' />
 	/// <unmanaged>WICGifCommentExtensionText</unmanaged>
-	WICGifCommentExtensionText = 1,
+	Text = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICJpegCommentProperties"]/*' />
@@ -455,7 +455,7 @@ public enum WICJpegCommentProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegCommentProperties::WICJpegCommentText"]/*' />
 	/// <unmanaged>WICJpegCommentText</unmanaged>
-	WICJpegCommentText = 1,
+	Text = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICJpegLuminanceProperties"]/*' />
@@ -464,7 +464,7 @@ public enum WICJpegLuminanceProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegLuminanceProperties::WICJpegLuminanceTable"]/*' />
 	/// <unmanaged>WICJpegLuminanceTable</unmanaged>
-	WICJpegLuminanceTable = 1,
+	Table = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICJpegChrominanceProperties"]/*' />
@@ -473,7 +473,7 @@ public enum WICJpegChrominanceProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegChrominanceProperties::WICJpegChrominanceTable"]/*' />
 	/// <unmanaged>WICJpegChrominanceTable</unmanaged>
-	WICJpegChrominanceTable = 1,
+	Table = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMIptcProperties"]/*' />
@@ -482,10 +482,10 @@ public enum WIC8BIMIptcProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMIptcProperties::WIC8BIMIptcPString"]/*' />
 	/// <unmanaged>WIC8BIMIptcPString</unmanaged>
-	WIC8BIMIptcPString = 0,
+	PString = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMIptcProperties::WIC8BIMIptcEmbeddedIPTC"]/*' />
 	/// <unmanaged>WIC8BIMIptcEmbeddedIPTC</unmanaged>
-	WIC8BIMIptcEmbeddedIPTC = 1,
+	EmbeddedIPTC = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties"]/*' />
@@ -494,25 +494,25 @@ public enum WIC8BIMResolutionInfoProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoPString"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoPString</unmanaged>
-	WIC8BIMResolutionInfoPString = 1,
+	PString = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoHResolution"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoHResolution</unmanaged>
-	WIC8BIMResolutionInfoHResolution = 2,
+	HResolution = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoHResolutionUnit"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoHResolutionUnit</unmanaged>
-	WIC8BIMResolutionInfoHResolutionUnit = 3,
+	HResolutionUnit = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoWidthUnit"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoWidthUnit</unmanaged>
-	WIC8BIMResolutionInfoWidthUnit = 4,
+	WidthUnit = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoVResolution"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoVResolution</unmanaged>
-	WIC8BIMResolutionInfoVResolution = 5,
+	VResolution = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoVResolutionUnit"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoVResolutionUnit</unmanaged>
-	WIC8BIMResolutionInfoVResolutionUnit = 6,
+	VResolutionUnit = 6,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMResolutionInfoProperties::WIC8BIMResolutionInfoHeightUnit"]/*' />
 	/// <unmanaged>WIC8BIMResolutionInfoHeightUnit</unmanaged>
-	WIC8BIMResolutionInfoHeightUnit = 7,
+	HeightUnit = 7,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMIptcDigestProperties"]/*' />
@@ -521,10 +521,10 @@ public enum WIC8BIMIptcDigestProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMIptcDigestProperties::WIC8BIMIptcDigestPString"]/*' />
 	/// <unmanaged>WIC8BIMIptcDigestPString</unmanaged>
-	WIC8BIMIptcDigestPString = 1,
+	PString = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WIC8BIMIptcDigestProperties::WIC8BIMIptcDigestIptcDigest"]/*' />
 	/// <unmanaged>WIC8BIMIptcDigestIptcDigest</unmanaged>
-	WIC8BIMIptcDigestIptcDigest = 2,
+	IptcDigest = 2,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngGamaProperties"]/*' />
@@ -533,7 +533,7 @@ public enum WICPngGamaProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngGamaProperties::WICPngGamaGamma"]/*' />
 	/// <unmanaged>WICPngGamaGamma</unmanaged>
-	WICPngGamaGamma = 1,
+	Gamma = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngBkgdProperties"]/*' />
@@ -542,7 +542,7 @@ public enum WICPngBkgdProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngBkgdProperties::WICPngBkgdBackgroundColor"]/*' />
 	/// <unmanaged>WICPngBkgdBackgroundColor</unmanaged>
-	WICPngBkgdBackgroundColor = 1,
+	BackgroundColor = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngItxtProperties"]/*' />
@@ -551,19 +551,19 @@ public enum WICPngItxtProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngItxtProperties::WICPngItxtKeyword"]/*' />
 	/// <unmanaged>WICPngItxtKeyword</unmanaged>
-	WICPngItxtKeyword = 1,
+	Keyword = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngItxtProperties::WICPngItxtCompressionFlag"]/*' />
 	/// <unmanaged>WICPngItxtCompressionFlag</unmanaged>
-	WICPngItxtCompressionFlag = 2,
+	CompressionFlag = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngItxtProperties::WICPngItxtLanguageTag"]/*' />
 	/// <unmanaged>WICPngItxtLanguageTag</unmanaged>
-	WICPngItxtLanguageTag = 3,
+	LanguageTag = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngItxtProperties::WICPngItxtTranslatedKeyword"]/*' />
 	/// <unmanaged>WICPngItxtTranslatedKeyword</unmanaged>
-	WICPngItxtTranslatedKeyword = 4,
+	TranslatedKeyword = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngItxtProperties::WICPngItxtText"]/*' />
 	/// <unmanaged>WICPngItxtText</unmanaged>
-	WICPngItxtText = 5,
+	Text = 5,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties"]/*' />
@@ -572,28 +572,28 @@ public enum WICPngChrmProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmWhitePointX"]/*' />
 	/// <unmanaged>WICPngChrmWhitePointX</unmanaged>
-	WICPngChrmWhitePointX = 1,
+	WhitePointX = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmWhitePointY"]/*' />
 	/// <unmanaged>WICPngChrmWhitePointY</unmanaged>
-	WICPngChrmWhitePointY = 2,
+	WhitePointY = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmRedX"]/*' />
 	/// <unmanaged>WICPngChrmRedX</unmanaged>
-	WICPngChrmRedX = 3,
+	RedX = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmRedY"]/*' />
 	/// <unmanaged>WICPngChrmRedY</unmanaged>
-	WICPngChrmRedY = 4,
+	RedY = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmGreenX"]/*' />
 	/// <unmanaged>WICPngChrmGreenX</unmanaged>
-	WICPngChrmGreenX = 5,
+	GreenX = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmGreenY"]/*' />
 	/// <unmanaged>WICPngChrmGreenY</unmanaged>
-	WICPngChrmGreenY = 6,
+	GreenY = 6,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmBlueX"]/*' />
 	/// <unmanaged>WICPngChrmBlueX</unmanaged>
-	WICPngChrmBlueX = 7,
+	BlueX = 7,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngChrmProperties::WICPngChrmBlueY"]/*' />
 	/// <unmanaged>WICPngChrmBlueY</unmanaged>
-	WICPngChrmBlueY = 8,
+	BlueY = 8,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngHistProperties"]/*' />
@@ -602,7 +602,7 @@ public enum WICPngHistProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngHistProperties::WICPngHistFrequencies"]/*' />
 	/// <unmanaged>WICPngHistFrequencies</unmanaged>
-	WICPngHistFrequencies = 1,
+	Frequencies = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngIccpProperties"]/*' />
@@ -611,10 +611,10 @@ public enum WICPngIccpProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngIccpProperties::WICPngIccpProfileName"]/*' />
 	/// <unmanaged>WICPngIccpProfileName</unmanaged>
-	WICPngIccpProfileName = 1,
+	ProfileName = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngIccpProperties::WICPngIccpProfileData"]/*' />
 	/// <unmanaged>WICPngIccpProfileData</unmanaged>
-	WICPngIccpProfileData = 2,
+	ProfileData = 2,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngSrgbProperties"]/*' />
@@ -623,7 +623,7 @@ public enum WICPngSrgbProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngSrgbProperties::WICPngSrgbRenderingIntent"]/*' />
 	/// <unmanaged>WICPngSrgbRenderingIntent</unmanaged>
-	WICPngSrgbRenderingIntent = 1,
+	RenderingIntent = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties"]/*' />
@@ -632,22 +632,22 @@ public enum WICPngTimeProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties::WICPngTimeYear"]/*' />
 	/// <unmanaged>WICPngTimeYear</unmanaged>
-	WICPngTimeYear = 1,
+	Year = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties::WICPngTimeMonth"]/*' />
 	/// <unmanaged>WICPngTimeMonth</unmanaged>
-	WICPngTimeMonth = 2,
+	Month = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties::WICPngTimeDay"]/*' />
 	/// <unmanaged>WICPngTimeDay</unmanaged>
-	WICPngTimeDay = 3,
+	Day = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties::WICPngTimeHour"]/*' />
 	/// <unmanaged>WICPngTimeHour</unmanaged>
-	WICPngTimeHour = 4,
+	Hour = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties::WICPngTimeMinute"]/*' />
 	/// <unmanaged>WICPngTimeMinute</unmanaged>
-	WICPngTimeMinute = 5,
+	Minute = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngTimeProperties::WICPngTimeSecond"]/*' />
 	/// <unmanaged>WICPngTimeSecond</unmanaged>
-	WICPngTimeSecond = 6,
+	Second = 6,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICHeifProperties"]/*' />
@@ -656,7 +656,7 @@ public enum WICHeifProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICHeifProperties::WICHeifOrientation"]/*' />
 	/// <unmanaged>WICHeifOrientation</unmanaged>
-	WICHeifOrientation = 1,
+	Orientation = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICHeifHdrProperties"]/*' />
@@ -665,19 +665,19 @@ public enum WICHeifHdrProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICHeifHdrProperties::WICHeifHdrMaximumLuminanceLevel"]/*' />
 	/// <unmanaged>WICHeifHdrMaximumLuminanceLevel</unmanaged>
-	WICHeifHdrMaximumLuminanceLevel = 1,
+	MaximumLuminanceLevel = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICHeifHdrProperties::WICHeifHdrMaximumFrameAverageLuminanceLevel"]/*' />
 	/// <unmanaged>WICHeifHdrMaximumFrameAverageLuminanceLevel</unmanaged>
-	WICHeifHdrMaximumFrameAverageLuminanceLevel = 2,
+	MaximumFrameAverageLuminanceLevel = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICHeifHdrProperties::WICHeifHdrMinimumMasteringDisplayLuminanceLevel"]/*' />
 	/// <unmanaged>WICHeifHdrMinimumMasteringDisplayLuminanceLevel</unmanaged>
-	WICHeifHdrMinimumMasteringDisplayLuminanceLevel = 3,
+	MinimumMasteringDisplayLuminanceLevel = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICHeifHdrProperties::WICHeifHdrMaximumMasteringDisplayLuminanceLevel"]/*' />
 	/// <unmanaged>WICHeifHdrMaximumMasteringDisplayLuminanceLevel</unmanaged>
-	WICHeifHdrMaximumMasteringDisplayLuminanceLevel = 4,
+	MaximumMasteringDisplayLuminanceLevel = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICHeifHdrProperties::WICHeifHdrCustomVideoPrimaries"]/*' />
 	/// <unmanaged>WICHeifHdrCustomVideoPrimaries</unmanaged>
-	WICHeifHdrCustomVideoPrimaries = 5,
+	CustomVideoPrimaries = 5,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICWebpAnimProperties"]/*' />
@@ -686,7 +686,7 @@ public enum WICWebpAnimProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICWebpAnimProperties::WICWebpAnimLoopCount"]/*' />
 	/// <unmanaged>WICWebpAnimLoopCount</unmanaged>
-	WICWebpAnimLoopCount = 1,
+	LoopCount = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICWebpAnmfProperties"]/*' />
@@ -695,7 +695,7 @@ public enum WICWebpAnmfProperties
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICWebpAnmfProperties::WICWebpAnmfFrameDuration"]/*' />
 	/// <unmanaged>WICWebpAnmfFrameDuration</unmanaged>
-	WICWebpAnmfFrameDuration = 1,
+	FrameDuration = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICSectionAccessLevel"]/*' />
@@ -704,10 +704,10 @@ public enum WICSectionAccessLevel
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICSectionAccessLevel::WICSectionAccessLevelRead"]/*' />
 	/// <unmanaged>WICSectionAccessLevelRead</unmanaged>
-	WICSectionAccessLevelRead = 1,
+	Read = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICSectionAccessLevel::WICSectionAccessLevelReadWrite"]/*' />
 	/// <unmanaged>WICSectionAccessLevelReadWrite</unmanaged>
-	WICSectionAccessLevelReadWrite = 3,
+	ReadWrite = 3,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPixelFormatNumericRepresentation"]/*' />
@@ -752,10 +752,10 @@ public enum WICJpegIndexingOptions
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegIndexingOptions::WICJpegIndexingOptionsGenerateOnDemand"]/*' />
 	/// <unmanaged>WICJpegIndexingOptionsGenerateOnDemand</unmanaged>
-	WICJpegIndexingOptionsGenerateOnDemand = 0,
+	GenerateOnDemand = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegIndexingOptions::WICJpegIndexingOptionsGenerateOnLoad"]/*' />
 	/// <unmanaged>WICJpegIndexingOptionsGenerateOnLoad</unmanaged>
-	WICJpegIndexingOptionsGenerateOnLoad = 1,
+	GenerateOnLoad = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICJpegTransferMatrix"]/*' />
@@ -764,10 +764,10 @@ public enum WICJpegTransferMatrix
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegTransferMatrix::WICJpegTransferMatrixIdentity"]/*' />
 	/// <unmanaged>WICJpegTransferMatrixIdentity</unmanaged>
-	WICJpegTransferMatrixIdentity = 0,
+	Identity = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegTransferMatrix::WICJpegTransferMatrixBT601"]/*' />
 	/// <unmanaged>WICJpegTransferMatrixBT601</unmanaged>
-	WICJpegTransferMatrixBT601 = 1,
+	BT601 = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICJpegScanType"]/*' />
@@ -776,13 +776,13 @@ public enum WICJpegScanType
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegScanType::WICJpegScanTypeInterleaved"]/*' />
 	/// <unmanaged>WICJpegScanTypeInterleaved</unmanaged>
-	WICJpegScanTypeInterleaved = 0,
+	Interleaved = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegScanType::WICJpegScanTypePlanarComponents"]/*' />
 	/// <unmanaged>WICJpegScanTypePlanarComponents</unmanaged>
-	WICJpegScanTypePlanarComponents = 1,
+	PlanarComponents = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegScanType::WICJpegScanTypeProgressive"]/*' />
 	/// <unmanaged>WICJpegScanTypeProgressive</unmanaged>
-	WICJpegScanTypeProgressive = 2,
+	Progressive = 2,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption"]/*' />
@@ -791,28 +791,28 @@ public enum WICTiffCompressionOption
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionDontCare"]/*' />
 	/// <unmanaged>WICTiffCompressionDontCare</unmanaged>
-	WICTiffCompressionDontCare = 0,
+	DontCare = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionNone"]/*' />
 	/// <unmanaged>WICTiffCompressionNone</unmanaged>
-	WICTiffCompressionNone = 1,
+	None = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionCCITT3"]/*' />
 	/// <unmanaged>WICTiffCompressionCCITT3</unmanaged>
-	WICTiffCompressionCCITT3 = 2,
+	CCITT3 = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionCCITT4"]/*' />
 	/// <unmanaged>WICTiffCompressionCCITT4</unmanaged>
-	WICTiffCompressionCCITT4 = 3,
+	CCITT4 = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionLZW"]/*' />
 	/// <unmanaged>WICTiffCompressionLZW</unmanaged>
-	WICTiffCompressionLZW = 4,
+	LZW = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionRLE"]/*' />
 	/// <unmanaged>WICTiffCompressionRLE</unmanaged>
-	WICTiffCompressionRLE = 5,
+	RLE = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionZIP"]/*' />
 	/// <unmanaged>WICTiffCompressionZIP</unmanaged>
-	WICTiffCompressionZIP = 6,
+	ZIP = 6,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICTiffCompressionOption::WICTiffCompressionLZWHDifferencing"]/*' />
 	/// <unmanaged>WICTiffCompressionLZWHDifferencing</unmanaged>
-	WICTiffCompressionLZWHDifferencing = 7,
+	LZWHDifferencing = 7,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICJpegYCrCbSubsamplingOption"]/*' />
@@ -821,19 +821,19 @@ public enum WICJpegYCrCbSubsamplingOption
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegYCrCbSubsamplingOption::WICJpegYCrCbSubsamplingDefault"]/*' />
 	/// <unmanaged>WICJpegYCrCbSubsamplingDefault</unmanaged>
-	WICJpegYCrCbSubsamplingDefault = 0,
+	SubsamplingDefault = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegYCrCbSubsamplingOption::WICJpegYCrCbSubsampling420"]/*' />
 	/// <unmanaged>WICJpegYCrCbSubsampling420</unmanaged>
-	WICJpegYCrCbSubsampling420 = 1,
+	Subsampling420 = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegYCrCbSubsamplingOption::WICJpegYCrCbSubsampling422"]/*' />
 	/// <unmanaged>WICJpegYCrCbSubsampling422</unmanaged>
-	WICJpegYCrCbSubsampling422 = 2,
+	Subsampling422 = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegYCrCbSubsamplingOption::WICJpegYCrCbSubsampling444"]/*' />
 	/// <unmanaged>WICJpegYCrCbSubsampling444</unmanaged>
-	WICJpegYCrCbSubsampling444 = 3,
+	Subsampling444 = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICJpegYCrCbSubsamplingOption::WICJpegYCrCbSubsampling440"]/*' />
 	/// <unmanaged>WICJpegYCrCbSubsampling440</unmanaged>
-	WICJpegYCrCbSubsampling440 = 4,
+	Subsampling440 = 4,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption"]/*' />
@@ -842,25 +842,25 @@ public enum WICPngFilterOption
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterUnspecified"]/*' />
 	/// <unmanaged>WICPngFilterUnspecified</unmanaged>
-	WICPngFilterUnspecified = 0,
+	Unspecified = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterNone"]/*' />
 	/// <unmanaged>WICPngFilterNone</unmanaged>
-	WICPngFilterNone = 1,
+	None = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterSub"]/*' />
 	/// <unmanaged>WICPngFilterSub</unmanaged>
-	WICPngFilterSub = 2,
+	Sub = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterUp"]/*' />
 	/// <unmanaged>WICPngFilterUp</unmanaged>
-	WICPngFilterUp = 3,
+	Up = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterAverage"]/*' />
 	/// <unmanaged>WICPngFilterAverage</unmanaged>
-	WICPngFilterAverage = 4,
+	Average = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterPaeth"]/*' />
 	/// <unmanaged>WICPngFilterPaeth</unmanaged>
-	WICPngFilterPaeth = 5,
+	Paeth = 5,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICPngFilterOption::WICPngFilterAdaptive"]/*' />
 	/// <unmanaged>WICPngFilterAdaptive</unmanaged>
-	WICPngFilterAdaptive = 6,
+	Adaptive = 6,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint"]/*' />
@@ -869,37 +869,37 @@ public enum WICNamedWhitePoint
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointDefault"]/*' />
 	/// <unmanaged>WICWhitePointDefault</unmanaged>
-	WICWhitePointDefault = 1,
+	Default = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointDaylight"]/*' />
 	/// <unmanaged>WICWhitePointDaylight</unmanaged>
-	WICWhitePointDaylight = 2,
+	Daylight = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointCloudy"]/*' />
 	/// <unmanaged>WICWhitePointCloudy</unmanaged>
-	WICWhitePointCloudy = 4,
+	Cloudy = 4,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointShade"]/*' />
 	/// <unmanaged>WICWhitePointShade</unmanaged>
-	WICWhitePointShade = 8,
+	Shade = 8,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointTungsten"]/*' />
 	/// <unmanaged>WICWhitePointTungsten</unmanaged>
-	WICWhitePointTungsten = 16,
+	Tungsten = 16,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointFluorescent"]/*' />
 	/// <unmanaged>WICWhitePointFluorescent</unmanaged>
-	WICWhitePointFluorescent = 32,
+	Fluorescent = 32,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointFlash"]/*' />
 	/// <unmanaged>WICWhitePointFlash</unmanaged>
-	WICWhitePointFlash = 64,
+	Flash = 64,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointUnderwater"]/*' />
 	/// <unmanaged>WICWhitePointUnderwater</unmanaged>
-	WICWhitePointUnderwater = 128,
+	Underwater = 128,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointCustom"]/*' />
 	/// <unmanaged>WICWhitePointCustom</unmanaged>
-	WICWhitePointCustom = 256,
+	Custom = 256,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointAutoWhiteBalance"]/*' />
 	/// <unmanaged>WICWhitePointAutoWhiteBalance</unmanaged>
-	WICWhitePointAutoWhiteBalance = 512,
+	AutoWhiteBalance = 512,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICNamedWhitePoint::WICWhitePointAsShot"]/*' />
 	/// <unmanaged>WICWhitePointAsShot</unmanaged>
-	WICWhitePointAsShot = 1,
+	AsShot = 1,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICRawCapabilities"]/*' />
@@ -908,13 +908,13 @@ public enum WICRawCapabilities
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawCapabilities::WICRawCapabilityNotSupported"]/*' />
 	/// <unmanaged>WICRawCapabilityNotSupported</unmanaged>
-	WICRawCapabilityNotSupported = 0,
+	NotSupported = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawCapabilities::WICRawCapabilityGetSupported"]/*' />
 	/// <unmanaged>WICRawCapabilityGetSupported</unmanaged>
-	WICRawCapabilityGetSupported = 1,
+	GetSupported = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawCapabilities::WICRawCapabilityFullySupported"]/*' />
 	/// <unmanaged>WICRawCapabilityFullySupported</unmanaged>
-	WICRawCapabilityFullySupported = 2,
+	FullySupported = 2,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICRawRotationCapabilities"]/*' />
@@ -923,16 +923,16 @@ public enum WICRawRotationCapabilities
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRotationCapabilities::WICRawRotationCapabilityNotSupported"]/*' />
 	/// <unmanaged>WICRawRotationCapabilityNotSupported</unmanaged>
-	WICRawRotationCapabilityNotSupported = 0,
+	NotSupported = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRotationCapabilities::WICRawRotationCapabilityGetSupported"]/*' />
 	/// <unmanaged>WICRawRotationCapabilityGetSupported</unmanaged>
-	WICRawRotationCapabilityGetSupported = 1,
+	GetSupported = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRotationCapabilities::WICRawRotationCapabilityNinetyDegreesSupported"]/*' />
 	/// <unmanaged>WICRawRotationCapabilityNinetyDegreesSupported</unmanaged>
-	WICRawRotationCapabilityNinetyDegreesSupported = 2,
+	NinetyDegreesSupported = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRotationCapabilities::WICRawRotationCapabilityFullySupported"]/*' />
 	/// <unmanaged>WICRawRotationCapabilityFullySupported</unmanaged>
-	WICRawRotationCapabilityFullySupported = 3,
+	FullySupported = 3,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICRawParameterSet"]/*' />
@@ -941,13 +941,13 @@ public enum WICRawParameterSet
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawParameterSet::WICAsShotParameterSet"]/*' />
 	/// <unmanaged>WICAsShotParameterSet</unmanaged>
-	WICAsShotParameterSet = 1,
+	AsShot = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawParameterSet::WICUserAdjustedParameterSet"]/*' />
 	/// <unmanaged>WICUserAdjustedParameterSet</unmanaged>
-	WICUserAdjustedParameterSet = 2,
+	UserAdjusted = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawParameterSet::WICAutoAdjustedParameterSet"]/*' />
 	/// <unmanaged>WICAutoAdjustedParameterSet</unmanaged>
-	WICAutoAdjustedParameterSet = 3,
+	AutoAdjusted = 3,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICRawRenderMode"]/*' />
@@ -956,13 +956,13 @@ public enum WICRawRenderMode
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRenderMode::WICRawRenderModeDraft"]/*' />
 	/// <unmanaged>WICRawRenderModeDraft</unmanaged>
-	WICRawRenderModeDraft = 1,
+	Draft = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRenderMode::WICRawRenderModeNormal"]/*' />
 	/// <unmanaged>WICRawRenderModeNormal</unmanaged>
-	WICRawRenderModeNormal = 2,
+	Normal = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICRawRenderMode::WICRawRenderModeBestQuality"]/*' />
 	/// <unmanaged>WICRawRenderModeBestQuality</unmanaged>
-	WICRawRenderModeBestQuality = 3,
+	BestQuality = 3,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICDdsDimension"]/*' />
@@ -971,16 +971,16 @@ public enum WICDdsDimension
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsDimension::WICDdsTexture1D"]/*' />
 	/// <unmanaged>WICDdsTexture1D</unmanaged>
-	WICDdsTexture1D = 0,
+	Texture1D = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsDimension::WICDdsTexture2D"]/*' />
 	/// <unmanaged>WICDdsTexture2D</unmanaged>
-	WICDdsTexture2D = 1,
+	Texture2D = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsDimension::WICDdsTexture3D"]/*' />
 	/// <unmanaged>WICDdsTexture3D</unmanaged>
-	WICDdsTexture3D = 2,
+	Texture3D = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsDimension::WICDdsTextureCube"]/*' />
 	/// <unmanaged>WICDdsTextureCube</unmanaged>
-	WICDdsTextureCube = 3,
+	TextureCube = 3,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICDdsAlphaMode"]/*' />
@@ -989,19 +989,19 @@ public enum WICDdsAlphaMode
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsAlphaMode::WICDdsAlphaModeUnknown"]/*' />
 	/// <unmanaged>WICDdsAlphaModeUnknown</unmanaged>
-	WICDdsAlphaModeUnknown = 0,
+	Unknown = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsAlphaMode::WICDdsAlphaModeStraight"]/*' />
 	/// <unmanaged>WICDdsAlphaModeStraight</unmanaged>
-	WICDdsAlphaModeStraight = 1,
+	Straight = 1,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsAlphaMode::WICDdsAlphaModePremultiplied"]/*' />
 	/// <unmanaged>WICDdsAlphaModePremultiplied</unmanaged>
-	WICDdsAlphaModePremultiplied = 2,
+	Premultiplied = 2,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsAlphaMode::WICDdsAlphaModeOpaque"]/*' />
 	/// <unmanaged>WICDdsAlphaModeOpaque</unmanaged>
-	WICDdsAlphaModeOpaque = 3,
+	Opaque = 3,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICDdsAlphaMode::WICDdsAlphaModeCustom"]/*' />
 	/// <unmanaged>WICDdsAlphaModeCustom</unmanaged>
-	WICDdsAlphaModeCustom = 4,
+	Custom = 4,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICMetadataCreationOptions"]/*' />
@@ -1010,16 +1010,16 @@ public enum WICMetadataCreationOptions
 {
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICMetadataCreationOptions::WICMetadataCreationDefault"]/*' />
 	/// <unmanaged>WICMetadataCreationDefault</unmanaged>
-	WICMetadataCreationDefault = 0,
+	Default = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICMetadataCreationOptions::WICMetadataCreationAllowUnknown"]/*' />
 	/// <unmanaged>WICMetadataCreationAllowUnknown</unmanaged>
-	WICMetadataCreationAllowUnknown = 0,
+	AllowUnknown = 0,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICMetadataCreationOptions::WICMetadataCreationFailUnknown"]/*' />
 	/// <unmanaged>WICMetadataCreationFailUnknown</unmanaged>
-	WICMetadataCreationFailUnknown = 65536,
+	FailUnknown = 65536,
 	/// <include file='../Imaging.xml' path='doc/member[@name="WICMetadataCreationOptions::WICMetadataCreationMask"]/*' />
 	/// <unmanaged>WICMetadataCreationMask</unmanaged>
-	WICMetadataCreationMask = -65536,
+	Mask = -65536,
 }
 
 /// <include file='../Imaging.xml' path='doc/member[@name="WICPersistOptions"]/*' />