diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 969ed9ac..d5f8ee43 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -5032,8 +5032,8 @@
       <param name="target"><type>BufferTarget</type></param>
     </function>
     <function name="CopyBufferSubData">
-      <param name="readtarget"><type>BufferTarget</type></param>
-      <param name="writetarget"><type>BufferTarget</type></param>
+      <param name="readTarget"><type>BufferTarget</type></param>
+      <param name="writeTarget"><type>BufferTarget</type></param>
     </function>
     <function name="FlushMappedBufferRange">
       <param name="target"><type>BufferTarget</type></param>
@@ -5283,10 +5283,10 @@
       <param name="dfactor"><type>BlendingFactorDest</type></param>
     </function>
     <function name="BlendFuncSeparate">
-      <param name="srcRGB"><type>BlendingFactorSrc</type></param>
-      <param name="dstRGB"><type>BlendingFactorDest</type></param>
-      <param name="srcAlpha"><type>BlendingFactorSrc</type></param>
-      <param name="dstAlpha"><type>BlendingFactorDest</type></param>
+      <param name="sfactorRGB"><type>BlendingFactorSrc</type></param>
+      <param name="dfactorRGB"><type>BlendingFactorDest</type></param>
+      <param name="sfactorAlpha"><type>BlendingFactorSrc</type></param>
+      <param name="dfactorAlpha"><type>BlendingFactorDest</type></param>
     </function>
     
     <!-- Selecting a Buffer for Writing [4.2.1] -->
@@ -5424,6 +5424,18 @@
       <param name="name"><type>StringNameIndexed</type></param>
     </function>
     
+    <!-- KHR_debug -->
+    <function name="DebugMessageControl">
+      <param name="source"><type>DebugSourceControl</type></param>
+      <param name="type"><type>DebugTypeControl</type></param>
+      <param name="severity"><type>DebugSeverityControl</type></param>
+    </function>
+    <function name="DebugMessageInsert">
+      <param name="source"><type>DebugSourceExternal</type></param>
+      <param name="type"><type>DebugType</type></param>
+      <param name="severity"><type>DebugSeverity</type></param>
+    </function>
+    
    </replace>
   
   <add name="gles2" version="3.0">
@@ -5619,6 +5631,63 @@
       <use token="BACK" />
       <use token="FRONT_AND_BACK" />
     </enum>
+    <enum name="DebugSeverity">
+      <use token="DEBUG_SEVERITY_HIGH" />
+      <use token="DEBUG_SEVERITY_MEDIUM" />
+      <use token="DEBUG_SEVERITY_LOW" />
+      <use token="DEBUG_SEVERITY_NOTIFICATION" />
+    </enum>
+    <enum name="DebugSeverityControl">
+      <use token="DONT_CARE" />
+      <use token="DEBUG_SEVERITY_HIGH" />
+      <use token="DEBUG_SEVERITY_MEDIUM" />
+      <use token="DEBUG_SEVERITY_LOW" />
+      <use token="DEBUG_SEVERITY_NOTIFICATION" />
+    </enum>
+    <enum name="DebugSource">
+      <use token="DEBUG_SOURCE_API" />
+      <use token="DEBUG_SOURCE_SHADER_COMPILER" />
+      <use token="DEBUG_SOURCE_WINDOW_SYSTEM" />
+      <use token="DEBUG_SOURCE_THIRD_PARTY" />
+      <use token="DEBUG_SOURCE_APPLICATION" />
+      <use token="DEBUG_SOURCE_OTHER" />
+    </enum>
+    <enum name="DebugSourceControl">
+      <use token="DONT_CARE" />
+      <use token="DEBUG_SOURCE_API" />
+      <use token="DEBUG_SOURCE_SHADER_COMPILER" />
+      <use token="DEBUG_SOURCE_WINDOW_SYSTEM" />
+      <use token="DEBUG_SOURCE_THIRD_PARTY" />
+      <use token="DEBUG_SOURCE_APPLICATION" />
+      <use token="DEBUG_SOURCE_OTHER" />
+    </enum>
+    <enum name="DebugSourceExternal">
+      <use token="DEBUG_SOURCE_THIRD_PARTY" />
+      <use token="DEBUG_SOURCE_APPLICATION" />
+    </enum>
+    <enum name="DebugType">
+      <use token="DEBUG_TYPE_ERROR" />
+      <use token="DEBUG_TYPE_MARKER" />
+      <use token="DEBUG_TYPE_OTHER" />
+      <use token="DEBUG_TYPE_DEPRECATED_BEHAVIOR" />
+      <use token="DEBUG_TYPE_UNDEFINED_BEHAVIOR" />
+      <use token="DEBUG_TYPE_PERFORMANCE" />
+      <use token="DEBUG_TYPE_PORTABILITY" />
+      <use token="DEBUG_TYPE_PUSH_GROUP" />
+      <use token="DEBUG_TYPE_POP_GROUP" />
+    </enum>
+    <enum name="DebugTypeControl">
+      <use token="DONT_CARE" />
+      <use token="DEBUG_TYPE_ERROR" />
+      <use token="DEBUG_TYPE_MARKER" />
+      <use token="DEBUG_TYPE_OTHER" />
+      <use token="DEBUG_TYPE_DEPRECATED_BEHAVIOR" />
+      <use token="DEBUG_TYPE_UNDEFINED_BEHAVIOR" />
+      <use token="DEBUG_TYPE_PERFORMANCE" />
+      <use token="DEBUG_TYPE_PORTABILITY" />
+      <use token="DEBUG_TYPE_PUSH_GROUP" />
+      <use token="DEBUG_TYPE_POP_GROUP" />
+    </enum>
     <enum name="DepthFunction">
       <reuse enum="StencilFunction" />
     </enum>
diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index 07300c73..1dfb39cc 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -3215,13 +3215,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBlendFuncSeparate")]
         public static 
-        void BlendFuncSeparate(OpenTK.Graphics.ES30.All sfactorRGB, OpenTK.Graphics.ES30.All dfactorRGB, OpenTK.Graphics.ES30.All sfactorAlpha, OpenTK.Graphics.ES30.All dfactorAlpha)
+        void BlendFuncSeparate(OpenTK.Graphics.ES30.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.ES30.BlendingFactorDest dfactorRGB, OpenTK.Graphics.ES30.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.ES30.BlendingFactorDest dfactorAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES30.All)sfactorRGB, (OpenTK.Graphics.ES30.All)dfactorRGB, (OpenTK.Graphics.ES30.All)sfactorAlpha, (OpenTK.Graphics.ES30.All)dfactorAlpha);
+            Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES30.BlendingFactorSrc)sfactorRGB, (OpenTK.Graphics.ES30.BlendingFactorDest)dfactorRGB, (OpenTK.Graphics.ES30.BlendingFactorSrc)sfactorAlpha, (OpenTK.Graphics.ES30.BlendingFactorDest)dfactorAlpha);
             #if DEBUG
             }
             #endif
@@ -5886,13 +5886,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glCopyBufferSubData")]
         public static 
-        void CopyBufferSubData(OpenTK.Graphics.ES30.All readTarget, OpenTK.Graphics.ES30.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
+        void CopyBufferSubData(OpenTK.Graphics.ES30.BufferTarget readTarget, OpenTK.Graphics.ES30.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCopyBufferSubData((OpenTK.Graphics.ES30.All)readTarget, (OpenTK.Graphics.ES30.All)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
+            Delegates.glCopyBufferSubData((OpenTK.Graphics.ES30.BufferTarget)readTarget, (OpenTK.Graphics.ES30.BufferTarget)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
             #if DEBUG
             }
             #endif
@@ -6339,7 +6339,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, Int32[] ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, Int32[] ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6349,7 +6349,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* ids_ptr = ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -6393,7 +6393,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, ref Int32 ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, ref Int32 ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6403,7 +6403,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* ids_ptr = &ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -6448,13 +6448,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        unsafe void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, Int32* ids, bool enabled)
+        unsafe void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, Int32* ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+            Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
             #if DEBUG
             }
             #endif
@@ -6497,7 +6497,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32[] ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32[] ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6507,7 +6507,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (UInt32* ids_ptr = ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -6552,7 +6552,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, ref UInt32 ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, ref UInt32 ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6562,7 +6562,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (UInt32* ids_ptr = &ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -6607,13 +6607,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        unsafe void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32* ids, bool enabled)
+        unsafe void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+            Delegates.glDebugMessageControl((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
             #if DEBUG
             }
             #endif
@@ -6655,13 +6655,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsert")]
         public static 
-        void DebugMessageInsert(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, Int32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf)
+        void DebugMessageInsert(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, Int32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (UInt32)id, (OpenTK.Graphics.ES30.All)severity, (Int32)length, (String)buf);
+            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES30.DebugSourceExternal)source, (OpenTK.Graphics.ES30.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES30.DebugSeverity)severity, (Int32)length, (String)buf);
             #if DEBUG
             }
             #endif
@@ -6704,13 +6704,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsert")]
         public static 
-        void DebugMessageInsert(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, UInt32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf)
+        void DebugMessageInsert(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, UInt32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (UInt32)id, (OpenTK.Graphics.ES30.All)severity, (Int32)length, (String)buf);
+            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES30.DebugSourceExternal)source, (OpenTK.Graphics.ES30.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES30.DebugSeverity)severity, (Int32)length, (String)buf);
             #if DEBUG
             }
             #endif
@@ -45643,7 +45643,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, Int32[] ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, Int32[] ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -45653,7 +45653,7 @@ namespace OpenTK.Graphics.ES30
                 {
                     fixed (Int32* ids_ptr = ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -45697,7 +45697,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, ref Int32 ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, ref Int32 ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -45707,7 +45707,7 @@ namespace OpenTK.Graphics.ES30
                 {
                     fixed (Int32* ids_ptr = &ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -45752,13 +45752,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            unsafe void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, Int32* ids, bool enabled)
+            unsafe void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, Int32* ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
                 #if DEBUG
                 }
                 #endif
@@ -45801,7 +45801,7 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32[] ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32[] ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -45811,7 +45811,7 @@ namespace OpenTK.Graphics.ES30
                 {
                     fixed (UInt32* ids_ptr = ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -45856,7 +45856,7 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, ref UInt32 ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, ref UInt32 ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -45866,7 +45866,7 @@ namespace OpenTK.Graphics.ES30
                 {
                     fixed (UInt32* ids_ptr = &ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -45911,13 +45911,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            unsafe void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32* ids, bool enabled)
+            unsafe void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (OpenTK.Graphics.ES30.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES30.DebugSourceControl)source, (OpenTK.Graphics.ES30.DebugTypeControl)type, (OpenTK.Graphics.ES30.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
                 #if DEBUG
                 }
                 #endif
@@ -45959,13 +45959,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsertKHR")]
             public static 
-            void DebugMessageInsert(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, Int32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf)
+            void DebugMessageInsert(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, Int32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (UInt32)id, (OpenTK.Graphics.ES30.All)severity, (Int32)length, (String)buf);
+                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES30.DebugSourceExternal)source, (OpenTK.Graphics.ES30.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES30.DebugSeverity)severity, (Int32)length, (String)buf);
                 #if DEBUG
                 }
                 #endif
@@ -46008,13 +46008,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsertKHR")]
             public static 
-            void DebugMessageInsert(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, UInt32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf)
+            void DebugMessageInsert(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, UInt32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES30.All)source, (OpenTK.Graphics.ES30.All)type, (UInt32)id, (OpenTK.Graphics.ES30.All)severity, (Int32)length, (String)buf);
+                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES30.DebugSourceExternal)source, (OpenTK.Graphics.ES30.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES30.DebugSeverity)severity, (Int32)length, (String)buf);
                 #if DEBUG
                 }
                 #endif
@@ -48052,13 +48052,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "NV_copy_buffer", Version = "", EntryPoint = "glCopyBufferSubDataNV")]
             public static 
-            void CopyBufferSubData(OpenTK.Graphics.ES30.All readTarget, OpenTK.Graphics.ES30.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
+            void CopyBufferSubData(OpenTK.Graphics.ES30.BufferTarget readTarget, OpenTK.Graphics.ES30.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCopyBufferSubDataNV((OpenTK.Graphics.ES30.All)readTarget, (OpenTK.Graphics.ES30.All)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
+                Delegates.glCopyBufferSubDataNV((OpenTK.Graphics.ES30.BufferTarget)readTarget, (OpenTK.Graphics.ES30.BufferTarget)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
index e964ac86..24dba021 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
@@ -120,7 +120,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate void BlendFunc(OpenTK.Graphics.ES30.BlendingFactorSrc sfactor, OpenTK.Graphics.ES30.BlendingFactorDest dfactor);
             internal static BlendFunc glBlendFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES30.All sfactorRGB, OpenTK.Graphics.ES30.All dfactorRGB, OpenTK.Graphics.ES30.All sfactorAlpha, OpenTK.Graphics.ES30.All dfactorAlpha);
+            internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES30.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.ES30.BlendingFactorDest dfactorRGB, OpenTK.Graphics.ES30.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.ES30.BlendingFactorDest dfactorAlpha);
             internal static BlendFuncSeparate glBlendFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendParameteriNV(OpenTK.Graphics.ES30.All pname, Int32 value);
@@ -198,10 +198,10 @@ namespace OpenTK.Graphics.ES30
             internal delegate void CompressedTexSubImage3DOES(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES30.All format, Int32 imageSize, IntPtr data);
             internal static CompressedTexSubImage3DOES glCompressedTexSubImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyBufferSubData(OpenTK.Graphics.ES30.All readTarget, OpenTK.Graphics.ES30.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal delegate void CopyBufferSubData(OpenTK.Graphics.ES30.BufferTarget readTarget, OpenTK.Graphics.ES30.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             internal static CopyBufferSubData glCopyBufferSubData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyBufferSubDataNV(OpenTK.Graphics.ES30.All readTarget, OpenTK.Graphics.ES30.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal delegate void CopyBufferSubDataNV(OpenTK.Graphics.ES30.BufferTarget readTarget, OpenTK.Graphics.ES30.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             internal static CopyBufferSubDataNV glCopyBufferSubDataNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void CopyTexImage2D(OpenTK.Graphics.ES30.TextureTarget2d target, Int32 level, OpenTK.Graphics.ES30.TextureCopyComponentCount internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border);
@@ -246,16 +246,16 @@ namespace OpenTK.Graphics.ES30
             internal delegate void DebugMessageCallbackKHR(DebugProcKhr callback, IntPtr userParam);
             internal static DebugMessageCallbackKHR glDebugMessageCallbackKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal unsafe delegate void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             internal unsafe static DebugMessageControl glDebugMessageControl;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DebugMessageControlKHR(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal unsafe delegate void DebugMessageControlKHR(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             internal unsafe static DebugMessageControlKHR glDebugMessageControlKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DebugMessageInsert(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, UInt32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf);
+            internal delegate void DebugMessageInsert(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, UInt32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf);
             internal static DebugMessageInsert glDebugMessageInsert;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DebugMessageInsertKHR(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, UInt32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf);
+            internal delegate void DebugMessageInsertKHR(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, UInt32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf);
             internal static DebugMessageInsertKHR glDebugMessageInsertKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void DeleteBuffers(Int32 n, UInt32* buffers);
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index 153ce7ad..136612d1 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 62 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 55 other functions
     /// </summary>
     public enum All : int
     {
@@ -9285,7 +9285,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BlendFunc
+    /// Used in GL.BlendFunc, GL.BlendFuncSeparate
     /// </summary>
     public enum BlendingFactorDest : int
     {
@@ -9368,7 +9368,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BlendFunc
+    /// Used in GL.BlendFunc, GL.BlendFuncSeparate
     /// </summary>
     public enum BlendingFactorSrc : int
     {
@@ -9570,7 +9570,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BindBuffer, GL.BufferData and 10 other functions
+    /// Used in GL.BindBuffer, GL.BufferData and 12 other functions
     /// </summary>
     public enum BufferTarget : int
     {
@@ -10180,7 +10180,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageInsert, GL.Khr.DebugMessageInsert
     /// </summary>
     public enum DebugSeverity : int
     {
@@ -10203,7 +10203,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageControl, GL.Khr.DebugMessageControl
     /// </summary>
     public enum DebugSeverityControl : int
     {
@@ -10261,7 +10261,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageControl, GL.Khr.DebugMessageControl
     /// </summary>
     public enum DebugSourceControl : int
     {
@@ -10296,7 +10296,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageInsert, GL.Khr.DebugMessageInsert
     /// </summary>
     public enum DebugSourceExternal : int
     {
@@ -10311,7 +10311,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageInsert, GL.Khr.DebugMessageInsert
     /// </summary>
     public enum DebugType : int
     {
@@ -10354,7 +10354,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageControl, GL.Khr.DebugMessageControl
     /// </summary>
     public enum DebugTypeControl : int
     {
diff --git a/Source/OpenTK/Graphics/ES30/ES3Core.cs b/Source/OpenTK/Graphics/ES30/ES3Core.cs
index c12fd0e7..f4433ae1 100644
--- a/Source/OpenTK/Graphics/ES30/ES3Core.cs
+++ b/Source/OpenTK/Graphics/ES30/ES3Core.cs
@@ -122,7 +122,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static void BlendFunc(OpenTK.Graphics.ES30.BlendingFactorSrc sfactor, OpenTK.Graphics.ES30.BlendingFactorDest dfactor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparate", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES30.All sfactorRGB, OpenTK.Graphics.ES30.All dfactorRGB, OpenTK.Graphics.ES30.All sfactorAlpha, OpenTK.Graphics.ES30.All dfactorAlpha);
+            internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES30.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.ES30.BlendingFactorDest dfactorRGB, OpenTK.Graphics.ES30.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.ES30.BlendingFactorDest dfactorAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendParameteriNV", ExactSpelling = true)]
             internal extern static void BlendParameteriNV(OpenTK.Graphics.ES30.All pname, Int32 value);
@@ -200,10 +200,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static void CompressedTexSubImage3DOES(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES30.All format, Int32 imageSize, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyBufferSubData", ExactSpelling = true)]
-            internal extern static void CopyBufferSubData(OpenTK.Graphics.ES30.All readTarget, OpenTK.Graphics.ES30.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal extern static void CopyBufferSubData(OpenTK.Graphics.ES30.BufferTarget readTarget, OpenTK.Graphics.ES30.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyBufferSubDataNV", ExactSpelling = true)]
-            internal extern static void CopyBufferSubDataNV(OpenTK.Graphics.ES30.All readTarget, OpenTK.Graphics.ES30.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal extern static void CopyBufferSubDataNV(OpenTK.Graphics.ES30.BufferTarget readTarget, OpenTK.Graphics.ES30.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyTexImage2D", ExactSpelling = true)]
             internal extern static void CopyTexImage2D(OpenTK.Graphics.ES30.TextureTarget2d target, Int32 level, OpenTK.Graphics.ES30.TextureCopyComponentCount internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border);
@@ -248,16 +248,16 @@ namespace OpenTK.Graphics.ES30
             internal extern static void DebugMessageCallbackKHR(DebugProcKhr callback, IntPtr userParam);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageControl", ExactSpelling = true)]
-            internal extern static unsafe void DebugMessageControl(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal extern static unsafe void DebugMessageControl(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageControlKHR", ExactSpelling = true)]
-            internal extern static unsafe void DebugMessageControlKHR(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, OpenTK.Graphics.ES30.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal extern static unsafe void DebugMessageControlKHR(OpenTK.Graphics.ES30.DebugSourceControl source, OpenTK.Graphics.ES30.DebugTypeControl type, OpenTK.Graphics.ES30.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageInsert", ExactSpelling = true)]
-            internal extern static void DebugMessageInsert(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, UInt32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf);
+            internal extern static void DebugMessageInsert(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, UInt32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageInsertKHR", ExactSpelling = true)]
-            internal extern static void DebugMessageInsertKHR(OpenTK.Graphics.ES30.All source, OpenTK.Graphics.ES30.All type, UInt32 id, OpenTK.Graphics.ES30.All severity, Int32 length, String buf);
+            internal extern static void DebugMessageInsertKHR(OpenTK.Graphics.ES30.DebugSourceExternal source, OpenTK.Graphics.ES30.DebugType type, UInt32 id, OpenTK.Graphics.ES30.DebugSeverity severity, Int32 length, String buf);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDeleteBuffers", ExactSpelling = true)]
             internal extern static unsafe void DeleteBuffers(Int32 n, UInt32* buffers);