diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 7100b94f..5c88ec20 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -42,19 +42,16 @@
       </param>
     </function>
 
+    <function name="BlendFunc" extension="Core">
+      <param name="src"><type>BlendingFactorSrc</type></param>
+      <param name="src"><type>BlendingFactorDest</type></param>
+    </function>
+
     <function name="BlendFuncSeparate" extension="Core">
-      <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>
+      <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>
     </function>
 
     <function name="FogCoordPointer" extension="Core">
@@ -235,9 +232,7 @@
     </function>
 
     <function name="GetProgram" extension="Core">
-      <param name="pname">
-        <type>ProgramParameter</type>
-      </param>
+      <param name="pname"><type>GetProgramParameterName</type></param>
     </function>
 
     <function name="GetVertexAttrib" extension="Core">
@@ -504,6 +499,13 @@
         <type>PrimitiveType</type>
       </param>
     </function>
+
+    <function name="GetInteger64v" extension="Core">
+      <param name="target"><type>GetPName</type></param>
+    </function>
+    <function name="GetInteger64i_v" extension="Core">
+      <param name="target"><type>GetIndexedPName</type></param>
+    </function>
     
     <function name="MultiDrawElementsBaseVertex" extension="Core">
       <version>3.2</version>
@@ -560,15 +562,14 @@
     <!-- Version 3.3 -->
     
     <function name="SamplerParameter" extension="Core">
-      <param name="pname">
-        <type>SamplerParameter</type>
-      </param>
+      <param name="pname"><type>SamplerParameterName</type></param>
+    </function>
+    <function name="SamplerParameterI" extension="Core">
+      <param name="pname"><type>SamplerParameterName</type></param>
     </function>
 
     <function name="GetSamplerParameter" extension="Core">
-      <param name="pname">
-        <type>SamplerParameter</type>
-      </param>
+      <param name="pname"><type>SamplerParameterName</type></param>
     </function>
 
     <function name="QueryCounter" extension="Core">
@@ -714,6 +715,10 @@
       </param>
     </function>
 
+    <function name="BlendEquation">
+      <param name="mode"><type>BlendEquationMode</type></param>
+    </function>
+
     <function name="EndQueryIndexed" extension="Core">
       <param name="target">
         <type>QueryTarget</type>
@@ -856,7 +861,7 @@
     <!-- also found Arb and Ext flavors -->
     <function name="ProgramParameteri" extension="Core">
       <param name="pname">
-        <type>ProgramParameterPName</type>
+        <type>ProgramParameterName</type>
       </param>
     </function>
 
@@ -1051,15 +1056,9 @@
     </function>
     
     <function name="GetInternalformat" extension="Core">
-      <param name="target">
-        <type>ImageTarget</type>
-      </param>
-      <param name="internalformat">
-        <type>All</type>
-      </param>
-      <param name="pname">
-        <type>InternalFormatParameter</type>
-      </param>
+      <param name="target"><type>ImageTarget</type></param>
+      <param name="internalformat"><type>SizedInternalFormat</type></param>
+      <param name="pname"><type>InternalFormatParameter</type></param>
     </function>
     
     <function name="GetDebugMessageLog" extension="Core">
@@ -1640,7 +1639,43 @@
   </replace>
   
   <overload name="gl">
-    <!-- Khronos renamed a few enum types between GL 4.3 and GL4.4 -->
+    <!-- Khronos renamed a few enum types between GL 4.3 and GL4.4. We did the same. -->
+
+    <!-- ActiveAttribType <=> TransformFeedbackType -->
+    <function name="GetTransformFeedbackVarying">
+      <param name="type"><type>ActiveAttribType</type></param>
+    </function>
+
+    <!-- ArbDrawBuffersBlend <=> BlendEquationMode -->
+    <function name="BlendEquation">
+      <param name="mode"><type>ArbDrawBuffersBlend</type></param>
+    </function>
+    <function name="BlendEquationSeparate">
+      <param name="mode"><type>ArbDrawBuffersBlend</type></param>
+    </function>
+    <!-- ArbDrawBuffersBlend <=> BlendingFactorDest|Src -->
+    <function name="BlendFunc">
+      <param name="mode"><type>ArbDrawBuffersBlend</type></param>
+    </function>
+    <function name="BlendFuncSeparate">
+      <param name="mode"><type>ArbDrawBuffersBlend</type></param>
+    </function>
+
+    <!-- ArbSync <=> SyncCondition -->
+    <function name="FenceSync">
+      <param name="condition"><type>ArbSync</type></param>
+      <param name="flags"><type>uint</type></param>
+    </function>
+    <!-- ArbSync <=> SyncParametereName -->
+    <function name="GetSync">
+      <param name="pname"><type>ArbSync</type></param>
+    </function>
+
+    <!-- GetString <=> GetStringIndexed -->
+    <function name="GetStringi">
+      <param name="name"><type>StringName</type></param>
+    </function>
+
     <!-- PrimitiveType <=> BeginMode overloads for backwards compatibility -->
     <function name="Begin" obsolete="Use PrimitiveType overload instead">
       <param name="mode"><type>BeginMode</type></param>
@@ -1648,6 +1683,9 @@
     <function name="DrawArrays" obsolete="Use PrimitiveType overload instead">
       <param name="mode"><type>BeginMode</type></param>
     </function>
+    <function name="DrawArraysInstanced" obsolete="Use PrimitiveType overload instead">
+      <param name="mode"><type>BeginMode</type></param>
+    </function>
     <function name="DrawElements" obsolete="Use PrimitiveType overload instead">
       <param name="mode"><type>BeginMode</type></param>
     </function>
@@ -1672,6 +1710,27 @@
     <function name="MultiDrawElements" obsolete="Use PrimitiveType overload instead">
       <param name="mode"><type>BeginMode</type></param>
     </function>
+
+    <!-- BeginFeedbackMode <=> TransformFeedbackPrimitiveType -->
+    <function name="BeginTransformFeedback" obsolete="Use TransformFeedbackPrimitiveType overload instead">
+      <param name="mode"><type>BeginFeedbackMode</type></param>
+    </function>
+
+    <!-- BufferTarget <=> BufferRangeTarget -->
+    <function name="BindBufferBase" obsolete="Use BufferRangeTarget instead">
+      <param name="target"><type>BufferTarget</type></param>
+    </function>
+    <function name="BindBufferRange" obsolete="Use BufferRangeTarget instead">
+      <param name="target"><type>BufferTarget</type></param>
+    </function>
+
+    <!-- ProgramParameterPName <=> ProgramParameterName -->
+    <function name="GetProgram" extension="Core" obsolete="Use GetProgramParameterName instead">
+      <param name="pname"><type>ProgramParameter</type></param>
+    </function>
+    <function name="ProgramParameteri" extension="Core" obsolete="Use ProgramParameterName instead">
+      <param name="pname"><type>Version32</type></param>
+    </function>
     
     <!-- StencilFace <=> CullFaceMode -->
     <function name="StencilFuncSeparate" obsolete="Use StencilFace overload instead" extension="Core">
@@ -1688,7 +1747,25 @@
     <function name="StencilFuncSeparate" obsolete="Use StencilFace overload instead" extension="Core">
       <param name="face"><type>Version20</type></param>
     </function>
-    
+
+    <!-- Version32 <=> GetPName -->
+    <function name="GetInteger64" extension="Core">
+      <param name="target"><type>ArbSync</type></param>
+    </function>
+    <function name="GetInteger64i_v" extension="Core">
+      <param name="target"><type>Version32</type></param>
+    </function>
+
+    <!-- VertexAttribIPointerType <=> VertexAttribIntegerType -->
+    <function name="VertexAttribIPointer">
+      <param name="pname"><type>VertexAttribIPointerType</type></param>
+    </function>
+
+    <!-- WaitSync -->
+    <function name="WaitSync" extension="Core">
+      <param name="flags"><type>uint</type></param>
+    </function>
+
     <!--
     <function name="TexImage1D" category="VERSION_1_0" extension="Core" version="1.0">
       <param name="target" type="TextureTarget" flow="in" />
@@ -2031,19 +2108,29 @@
       <use enum="VERSION_3_3" token="ONE_MINUS_SRC1_ALPHA" />
       <use enum="VERSION_3_3" token="ONE_MINUS_SRC1_COLOR" />
     </enum>
+    <enum name="BlendingFactorDest">
+      <use token="ZERO" />
+      <use token="ONE" />
+      <use token="SRC_ALPHA_SATURATE" />
+      <use token="SRC_COLOR" />
+      <use token="SRC_ALPHA" />
+      <use token="SRC1_COLOR" />
+      <use token="SRC1_ALPHA" />
+      <use token="DST_COLOR" />
+      <use token="DST_ALPHA" />
+      <use token="CONSTANT_COLOR" />
+      <use token="CONSTANT_ALPHA" />
+      <use token="ONE_MINUS_SRC_COLOR" />
+      <use token="ONE_MINUS_SRC_ALPHA" />
+      <use token="ONE_MINUS_SRC1_COLOR" />
+      <use token="ONE_MINUS_SRC1_ALPHA" />
+      <use token="ONE_MINUS_DST_COLOR" />
+      <use token="ONE_MINUS_DST_ALPHA" />
+      <use token="ONE_MINUS_CONSTANT_COLOR" />
+      <use token="ONE_MINUS_CONSTANT_ALPHA" />
+    </enum>
     <enum name="BlendingFactorSrc">
-      <token name="CONSTANT_ALPHA" value="0x8003" />
-      <token name="CONSTANT_COLOR" value="0x8001" />
-      <token name="ONE_MINUS_CONSTANT_ALPHA" value="0x8004" />
-      <token name="ONE_MINUS_CONSTANT_COLOR" value="0x8002" />
-      <use enum="VERSION_1_1" token="SRC_COLOR" />
-      <use enum="VERSION_1_1" token="SRC_ALPHA" />
-      <use enum="VERSION_1_1" token="ONE_MINUS_SRC_ALPHA" />
-      <use enum="VERSION_1_1" token="ONE_MINUS_SRC_COLOR" />
-      <use enum="VERSION_3_3" token="SRC1_ALPHA" />
-      <use enum="VERSION_3_3" token="SRC1_COLOR" />
-      <use enum="VERSION_3_3" token="ONE_MINUS_SRC1_ALPHA" />
-      <use enum="VERSION_3_3" token="ONE_MINUS_SRC1_COLOR" />
+      <reuse enum="BlendingFactorDest" />
     </enum>
     <enum name="BlitFramebufferFilter">
       <use enum="TextureMagFilter" token="LINEAR" />
@@ -2809,6 +2896,9 @@
       <token name="FOG_COORD_ARRAY_POINTER" value="0x8456" />
       <token name="SECONDARY_COLOR_ARRAY_POINTER" value="0x845D" />
     </enum>
+    <enum name="GetProgramParameterName">
+      <reuse enum="ProgramParameter" />
+    </enum>
     <enum name="GetQueryObjectParam">
       <token name="QUERY_RESULT" value="0x8866" />
       <token name="QUERY_RESULT_AVAILABLE" value="0x8867" />
@@ -3392,6 +3482,9 @@
       <use enum="VERSION_4_1" token="PROGRAM_SEPARABLE" />
       <use enum="VERSION_4_1" token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
     </enum>
+    <enum name="ProgramParameterName">
+      <reuse enum="ProgramParameterPName" />
+    </enum>
     <enum name="ProgramPipelineParameter">
       <use enum="VERSION_4_1" token="ACTIVE_PROGRAM" />
       <use enum="VERSION_2_0" token="VALIDATE_STATUS" />
@@ -3601,6 +3694,9 @@
       <token name="TextureCompareFunc" value = "0x884D" />
       <token name="TextureMaxAnisotropyExt" value = "0x84FE" />
     </enum>
+    <enum name="SamplerParameterName">
+      <reuse enum="SamplerParameter" />
+    </enum>
     <enum name="SeparableTarget">
       <token name="SEPARABLE_2D" value="0x8012" />
     </enum>
@@ -4658,7 +4754,7 @@
     
     <!-- Program Queries [6.1.12] -->
     <function name="GetProgram">
-      <param name="pname"><type>ProgramParameter</type></param>
+      <param name="pname"><type>GetProgramParameterName</type></param>
     </function>
     
     <!-- Texturing [3.8] -->
@@ -4911,8 +5007,8 @@
       <param name="pname"><type>FramebufferParameterName</type></param>
     </function>
     <function name="GetInternalformat">
-      <param name="target"><type>RenderbufferTarget</type></param>
-      <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
+      <param name="target"><type>ImageTarget</type></param>
+      <param name="internalformat"><type>SizedInternalFormat</type></param>
       <param name="pname"><type>InternalFormatParameter</type></param>
     </function>
 
@@ -5451,7 +5547,7 @@
       <use token="VERTEX_ARRAY" />
     </enum>
     
-    <enum name="ProgramParameter">
+    <enum name="GetProgramParameterName">
       <use token="DELETE_STATUS" />
       <use token="LINK_STATUS" />
       <use token="VALIDATE_STATUS" />
@@ -5465,15 +5561,7 @@
     </enum>
      
     <enum name="ProgramParameterName">
-      <token name="DeleteStatus" value="0X8b80" />
-      <token name="LinkStatus" value="0X8b82" />
-      <token name="ValidateStatus" value="0X8b83" />
-      <token name="InfoLogLength" value="0X8b84" />
-      <token name="AttachedShaders" value="0X8b85" />
-      <token name="ActiveAttributes" value="0X8b89" />
-      <token name="ActiveAttributeMaxLength" value="0X8b8a" />
-      <token name="ActiveUniforms" value="0X8b86" />
-      <token name="ActiveUniformMaxLength" value="0X8b87" />
+      <use token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
     </enum>
      
     <enum name="ShaderParameter">
@@ -6327,6 +6415,9 @@
       <use token="COPY_READ_BUFFER_BINDING" />
       <use token="COPY_WRITE_BUFFER_BINDING" />
     </enum>
+    <enum name="GetProgramParameterName">
+      <use token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
+    </enum>
     <enum name="GetQueryObjectParam">
       <use token="QUERY_RESULT" />
       <use token="QUERY_RESULT_AVAILABLE" />
@@ -6348,6 +6439,9 @@
       <use token="GENERATE_MIPMAP_HINT" />
       <use token="FRAGMENT_SHADER_DERIVATIVE_HINT" />
     </enum>
+    <enum name="ImageTarget">
+      <use token="RENDERBUFFER" />
+    </enum>
     <enum name="InternalFormatParameter">
       <use token="NUM_SAMPLE_COUNTS" />
       <use token="SAMPLES" />
@@ -6412,7 +6506,7 @@
       <use token="UNSIGNED_INT_5_9_9_9_REV" />
       <use token="FLOAT_32_UNSIGNED_INT_24_8_REV" />
     </enum>
-    <enum name="ProgramParameter">
+    <enum name="ProgramParameterName">
       <use token="DELETE_STATUS" />
       <use token="LINK_STATUS" />
       <use token="VALIDATE_STATUS" />
diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs
index 968ec232..f4d052aa 100644
--- a/Source/OpenTK/Graphics/ES20/ES20.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20.cs
@@ -17197,7 +17197,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -17235,7 +17235,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -17271,7 +17271,7 @@ namespace OpenTK.Graphics.ES20
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -17297,7 +17297,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17307,7 +17307,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -17335,7 +17335,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17345,7 +17345,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -17375,13 +17375,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(Int32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -17419,7 +17419,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -17459,7 +17459,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -17496,7 +17496,7 @@ namespace OpenTK.Graphics.ES20
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -17523,7 +17523,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(UInt32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17533,7 +17533,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -17562,7 +17562,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(UInt32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17572,7 +17572,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -17602,13 +17602,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/ES20/ES20Core.cs b/Source/OpenTK/Graphics/ES20/ES20Core.cs
index 1861dabd..5f378294 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Core.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Core.cs
@@ -533,7 +533,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramiv", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramPipelineInfoLogEXT", ExactSpelling = true)]
             internal extern static unsafe void GetProgramPipelineInfoLogEXT(UInt32 pipeline, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
index f4447398..3d6b6fcb 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
@@ -531,7 +531,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
             internal unsafe static GetProgramInfoLog glGetProgramInfoLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.ES20.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramiv glGetProgramiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramPipelineInfoLogEXT(UInt32 pipeline, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Enums.cs b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
index 6e1608e4..222b01c3 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Enums.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
@@ -13940,6 +13940,53 @@ namespace OpenTK.Graphics.ES20
         InstrumentBufferPointerSgix = ((int)0x8180)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetProgram
+    /// </summary>
+    public enum GetProgramParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_DELETE_STATUS = 0x8B80
+        /// </summary>
+        DeleteStatus = ((int)0x8B80)        ,
+        /// <summary>
+        /// Original was GL_LINK_STATUS = 0x8B82
+        /// </summary>
+        LinkStatus = ((int)0x8B82)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_ATTACHED_SHADERS = 0x8B85
+        /// </summary>
+        AttachedShaders = ((int)0x8B85)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
+        /// </summary>
+        ActiveUniforms = ((int)0x8B86)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
+        /// </summary>
+        ActiveUniformMaxLength = ((int)0x8B87)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
+        /// </summary>
+        ActiveAttributes = ((int)0x8B89)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
+        /// </summary>
+        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
+    }
+
     /// <summary>
     /// Used in GL.Ext.GetQueryObject
     /// </summary>
@@ -18572,94 +18619,15 @@ namespace OpenTK.Graphics.ES20
         Patches = ((int)0x000E)        ,
     }
 
-    /// <summary>
-    /// Used in GL.GetProgram
-    /// </summary>
-    public enum ProgramParameter : int
-    {
-        /// <summary>
-        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
-        /// </summary>
-        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
-        /// <summary>
-        /// Original was GL_DELETE_STATUS = 0x8B80
-        /// </summary>
-        DeleteStatus = ((int)0x8B80)        ,
-        /// <summary>
-        /// Original was GL_LINK_STATUS = 0x8B82
-        /// </summary>
-        LinkStatus = ((int)0x8B82)        ,
-        /// <summary>
-        /// Original was GL_VALIDATE_STATUS = 0x8B83
-        /// </summary>
-        ValidateStatus = ((int)0x8B83)        ,
-        /// <summary>
-        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
-        /// </summary>
-        InfoLogLength = ((int)0x8B84)        ,
-        /// <summary>
-        /// Original was GL_ATTACHED_SHADERS = 0x8B85
-        /// </summary>
-        AttachedShaders = ((int)0x8B85)        ,
-        /// <summary>
-        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
-        /// </summary>
-        ActiveUniforms = ((int)0x8B86)        ,
-        /// <summary>
-        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
-        /// </summary>
-        ActiveUniformMaxLength = ((int)0x8B87)        ,
-        /// <summary>
-        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
-        /// </summary>
-        ActiveAttributes = ((int)0x8B89)        ,
-        /// <summary>
-        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
-        /// </summary>
-        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
-    }
-
     /// <summary>
     /// Used in GL.Ext.ProgramParameter
     /// </summary>
     public enum ProgramParameterName : int
     {
         /// <summary>
-        /// Original was GL_DeleteStatus = 0X8b80
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
         /// </summary>
-        DeleteStatus = ((int)0X8b80)        ,
-        /// <summary>
-        /// Original was GL_LinkStatus = 0X8b82
-        /// </summary>
-        LinkStatus = ((int)0X8b82)        ,
-        /// <summary>
-        /// Original was GL_ValidateStatus = 0X8b83
-        /// </summary>
-        ValidateStatus = ((int)0X8b83)        ,
-        /// <summary>
-        /// Original was GL_InfoLogLength = 0X8b84
-        /// </summary>
-        InfoLogLength = ((int)0X8b84)        ,
-        /// <summary>
-        /// Original was GL_AttachedShaders = 0X8b85
-        /// </summary>
-        AttachedShaders = ((int)0X8b85)        ,
-        /// <summary>
-        /// Original was GL_ActiveUniforms = 0X8b86
-        /// </summary>
-        ActiveUniforms = ((int)0X8b86)        ,
-        /// <summary>
-        /// Original was GL_ActiveUniformMaxLength = 0X8b87
-        /// </summary>
-        ActiveUniformMaxLength = ((int)0X8b87)        ,
-        /// <summary>
-        /// Original was GL_ActiveAttributes = 0X8b89
-        /// </summary>
-        ActiveAttributes = ((int)0X8b89)        ,
-        /// <summary>
-        /// Original was GL_ActiveAttributeMaxLength = 0X8b8a
-        /// </summary>
-        ActiveAttributeMaxLength = ((int)0X8b8a)        ,
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
     }
 
     /// <summary>
diff --git a/Source/OpenTK/Graphics/ES20/Helper.cs b/Source/OpenTK/Graphics/ES20/Helper.cs
index cb91f052..0b7e5198 100644
--- a/Source/OpenTK/Graphics/ES20/Helper.cs
+++ b/Source/OpenTK/Graphics/ES20/Helper.cs
@@ -180,7 +180,7 @@ namespace OpenTK.Graphics.ES20
         public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type)
         {
             int length;
-            GetProgram(program, ProgramParameter.ActiveAttributeMaxLength, out length);
+			GetProgram(program, GetProgramParameterName.ActiveAttributeMaxLength, out length);
             StringBuilder sb = new StringBuilder(length == 0 ? 1 : length * 2);
 
             GetActiveAttrib(program, index, sb.Capacity, out length, out size, out type, sb);
@@ -194,7 +194,7 @@ namespace OpenTK.Graphics.ES20
         public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type)
         {
             int length;
-            GetProgram(program, ProgramParameter.ActiveUniformMaxLength, out length);
+			GetProgram(program, GetProgramParameterName.ActiveUniformMaxLength, out length);
 
             StringBuilder sb = new StringBuilder(length == 0 ? 1 : length);
             GetActiveUniform(program, uniformIndex, sb.Capacity, out length, out size, out type, sb);
@@ -266,7 +266,7 @@ namespace OpenTK.Graphics.ES20
             unsafe
             {
                 int length;
-                GL.GetProgram(program, ProgramParameter.InfoLogLength, out length); if (length == 0)
+				GL.GetProgram(program, GetProgramParameterName.InfoLogLength, out length); if (length == 0)
                 {
                     info = String.Empty;
                     return;
diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index d2b096e0..fc5da233 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -24286,7 +24286,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.RenderbufferTarget)target, (OpenTK.Graphics.ES30.RenderbufferInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.ImageTarget)target, (OpenTK.Graphics.ES30.SizedInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -24335,7 +24335,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.RenderbufferTarget)target, (OpenTK.Graphics.ES30.RenderbufferInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.ImageTarget)target, (OpenTK.Graphics.ES30.SizedInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -24382,7 +24382,7 @@ namespace OpenTK.Graphics.ES30
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.RenderbufferTarget)target, (OpenTK.Graphics.ES30.RenderbufferInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
+            Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.ImageTarget)target, (OpenTK.Graphics.ES30.SizedInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -24418,7 +24418,7 @@ namespace OpenTK.Graphics.ES30
         /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
+        void GetInternalformat(OpenTK.Graphics.ES30.ImageTarget target, OpenTK.Graphics.ES30.SizedInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24428,7 +24428,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.RenderbufferTarget)target, (OpenTK.Graphics.ES30.RenderbufferInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.ImageTarget)target, (OpenTK.Graphics.ES30.SizedInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -24466,7 +24466,7 @@ namespace OpenTK.Graphics.ES30
         /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
+        void GetInternalformat(OpenTK.Graphics.ES30.ImageTarget target, OpenTK.Graphics.ES30.SizedInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24476,7 +24476,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.RenderbufferTarget)target, (OpenTK.Graphics.ES30.RenderbufferInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.ImageTarget)target, (OpenTK.Graphics.ES30.SizedInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -24516,13 +24516,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetInternalformativ")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.ES30.ImageTarget target, OpenTK.Graphics.ES30.SizedInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.RenderbufferTarget)target, (OpenTK.Graphics.ES30.RenderbufferInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
+            Delegates.glGetInternalformativ((OpenTK.Graphics.ES30.ImageTarget)target, (OpenTK.Graphics.ES30.SizedInternalFormat)internalformat, (OpenTK.Graphics.ES30.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -27468,7 +27468,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -27506,7 +27506,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -27542,7 +27542,7 @@ namespace OpenTK.Graphics.ES30
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -27568,7 +27568,7 @@ namespace OpenTK.Graphics.ES30
         /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -27578,7 +27578,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -27606,7 +27606,7 @@ namespace OpenTK.Graphics.ES30
         /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -27616,7 +27616,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -27646,13 +27646,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(Int32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -27690,7 +27690,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -27730,7 +27730,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -27767,7 +27767,7 @@ namespace OpenTK.Graphics.ES30
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -27794,7 +27794,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(UInt32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -27804,7 +27804,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -27833,7 +27833,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(UInt32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -27843,7 +27843,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -27873,13 +27873,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES30.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/ES30/ES30Core.cs b/Source/OpenTK/Graphics/ES30/ES30Core.cs
index a538d132..2fbe3cee 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Core.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Core.cs
@@ -614,7 +614,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static unsafe void GetIntegerv(OpenTK.Graphics.ES30.GetPName pname, [OutAttribute] Int32* data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformativ", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.ES30.ImageTarget target, OpenTK.Graphics.ES30.SizedInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetnUniformfvEXT", ExactSpelling = true)]
             internal extern static unsafe void GetnUniformfvEXT(UInt32 program, Int32 location, Int32 bufSize, [OutAttribute] Single* @params);
@@ -671,7 +671,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static unsafe void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramiv", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramPipelineInfoLogEXT", ExactSpelling = true)]
             internal extern static unsafe void GetProgramPipelineInfoLogEXT(UInt32 pipeline, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
index c89c280d..2a82b268 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
@@ -612,7 +612,7 @@ namespace OpenTK.Graphics.ES30
             internal unsafe delegate void GetIntegerv(OpenTK.Graphics.ES30.GetPName pname, [OutAttribute] Int32* data);
             internal unsafe static GetIntegerv glGetIntegerv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.ES30.ImageTarget target, OpenTK.Graphics.ES30.SizedInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             internal unsafe static GetInternalformativ glGetInternalformativ;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetnUniformfvEXT(UInt32 program, Int32 location, Int32 bufSize, [OutAttribute] Single* @params);
@@ -669,7 +669,7 @@ namespace OpenTK.Graphics.ES30
             internal unsafe delegate void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
             internal unsafe static GetProgramInfoLog glGetProgramInfoLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.ES30.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramiv glGetProgramiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramPipelineInfoLogEXT(UInt32 pipeline, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index df8931d1..385158c5 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -17241,6 +17241,53 @@ namespace OpenTK.Graphics.ES30
         InstrumentBufferPointerSgix = ((int)0x8180)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetProgram
+    /// </summary>
+    public enum GetProgramParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_DELETE_STATUS = 0x8B80
+        /// </summary>
+        DeleteStatus = ((int)0x8B80)        ,
+        /// <summary>
+        /// Original was GL_LINK_STATUS = 0x8B82
+        /// </summary>
+        LinkStatus = ((int)0x8B82)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_ATTACHED_SHADERS = 0x8B85
+        /// </summary>
+        AttachedShaders = ((int)0x8B85)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
+        /// </summary>
+        ActiveUniforms = ((int)0x8B86)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
+        /// </summary>
+        ActiveUniformMaxLength = ((int)0x8B87)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
+        /// </summary>
+        ActiveAttributes = ((int)0x8B89)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
+        /// </summary>
+        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetQueryObject, GL.Ext.GetQueryObject
     /// </summary>
@@ -17842,6 +17889,17 @@ namespace OpenTK.Graphics.ES30
         ProxyHistogramExt = ((int)0x8025)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetInternalformat
+    /// </summary>
+    public enum ImageTarget : int
+    {
+        /// <summary>
+        /// Original was GL_RENDERBUFFER = 0X8d41
+        /// </summary>
+        Renderbuffer = ((int)0X8d41)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -22009,9 +22067,9 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetProgram
+    /// Used in GL.ProgramParameter, GL.Ext.ProgramParameter
     /// </summary>
-    public enum ProgramParameter : int
+    public enum ProgramParameterName : int
     {
         /// <summary>
         /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
@@ -22075,49 +22133,6 @@ namespace OpenTK.Graphics.ES30
         TransformFeedbackVaryings = ((int)0x8C83)        ,
     }
 
-    /// <summary>
-    /// Used in GL.ProgramParameter, GL.Ext.ProgramParameter
-    /// </summary>
-    public enum ProgramParameterName : int
-    {
-        /// <summary>
-        /// Original was GL_DeleteStatus = 0X8b80
-        /// </summary>
-        DeleteStatus = ((int)0X8b80)        ,
-        /// <summary>
-        /// Original was GL_LinkStatus = 0X8b82
-        /// </summary>
-        LinkStatus = ((int)0X8b82)        ,
-        /// <summary>
-        /// Original was GL_ValidateStatus = 0X8b83
-        /// </summary>
-        ValidateStatus = ((int)0X8b83)        ,
-        /// <summary>
-        /// Original was GL_InfoLogLength = 0X8b84
-        /// </summary>
-        InfoLogLength = ((int)0X8b84)        ,
-        /// <summary>
-        /// Original was GL_AttachedShaders = 0X8b85
-        /// </summary>
-        AttachedShaders = ((int)0X8b85)        ,
-        /// <summary>
-        /// Original was GL_ActiveUniforms = 0X8b86
-        /// </summary>
-        ActiveUniforms = ((int)0X8b86)        ,
-        /// <summary>
-        /// Original was GL_ActiveUniformMaxLength = 0X8b87
-        /// </summary>
-        ActiveUniformMaxLength = ((int)0X8b87)        ,
-        /// <summary>
-        /// Original was GL_ActiveAttributes = 0X8b89
-        /// </summary>
-        ActiveAttributes = ((int)0X8b89)        ,
-        /// <summary>
-        /// Original was GL_ActiveAttributeMaxLength = 0X8b8a
-        /// </summary>
-        ActiveAttributeMaxLength = ((int)0X8b8a)        ,
-    }
-
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -22548,7 +22563,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 6 other functions
+    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 5 other functions
     /// </summary>
     public enum RenderbufferInternalFormat : int
     {
@@ -22822,7 +22837,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 9 other functions
+    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 8 other functions
     /// </summary>
     public enum RenderbufferTarget : int
     {
@@ -23298,7 +23313,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.TexStorage2D, GL.TexStorage3D and 2 other functions
+    /// Used in GL.GetInternalformat, GL.TexStorage2D and 3 other functions
     /// </summary>
     public enum SizedInternalFormat : int
     {
diff --git a/Source/OpenTK/Graphics/ES30/Helper.cs b/Source/OpenTK/Graphics/ES30/Helper.cs
index 07730e37..4973cca9 100644
--- a/Source/OpenTK/Graphics/ES30/Helper.cs
+++ b/Source/OpenTK/Graphics/ES30/Helper.cs
@@ -180,10 +180,10 @@ namespace OpenTK.Graphics.ES30
         public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type)
         {
             int length;
-            GetProgram(program, ES30.ProgramParameter.ActiveAttributeMaxLength, out length);
+			GetProgram(program, ES30.GetProgramParameterName.ActiveAttributeMaxLength, out length);
             StringBuilder sb = new StringBuilder(length == 0 ? 1 : length * 2);
 
-            GetActiveAttrib(program, index, sb.Capacity, out length, out size, out type, sb);
+			GetActiveAttrib(program, index, sb.Capacity, out length, out size, out type, sb);
             return sb.ToString();
         }
 
@@ -194,7 +194,7 @@ namespace OpenTK.Graphics.ES30
         public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type)
         {
             int length;
-            GetProgram(program, ES30.ProgramParameter.ActiveUniformMaxLength, out length);
+			GetProgram(program, ES30.GetProgramParameterName.ActiveUniformMaxLength, out length);
 
             StringBuilder sb = new StringBuilder(length == 0 ? 1 : length);
             GetActiveUniform(program, uniformIndex, sb.Capacity, out length, out size, out type, sb);
@@ -266,7 +266,7 @@ namespace OpenTK.Graphics.ES30
             unsafe
             {
                 int length;
-                GL.GetProgram(program, ES30.ProgramParameter.InfoLogLength, out length); if (length == 0)
+				GL.GetProgram(program, ES30.GetProgramParameterName.InfoLogLength, out length); if (length == 0)
                 {
                     info = String.Empty;
                     return;
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 277fb981..4fba5e2e 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -6135,7 +6135,34 @@ namespace OpenTK.Graphics.OpenGL
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend)mode);
+                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: ARB_draw_buffers_blend]
+            /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
+            /// </summary>
+            /// <param name="buf">
+            /// <para>
+            /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
+            /// </para>
+            /// </param>
+            /// <param name="mode">
+            /// <para>
+            /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
+            /// </para>
+            /// </param>
+            [AutoGenerated(Category = "ARB_draw_buffers_blend", Version = "", EntryPoint = "glBlendEquationiARB")]
+            public static 
+            void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
@@ -6163,7 +6190,35 @@ namespace OpenTK.Graphics.OpenGL
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend)mode);
+                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: ARB_draw_buffers_blend]
+            /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
+            /// </summary>
+            /// <param name="buf">
+            /// <para>
+            /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
+            /// </para>
+            /// </param>
+            /// <param name="mode">
+            /// <para>
+            /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
+            /// </para>
+            /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ARB_draw_buffers_blend", Version = "", EntryPoint = "glBlendEquationiARB")]
+            public static 
+            void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
@@ -10588,6 +10643,44 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: ARB_draw_instanced]
+            /// Draw multiple instances of a range of elements
+            /// </summary>
+            /// <param name="mode">
+            /// <para>
+            /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES GL_LINES_ADJACENCY, GL_LINE_STRIP_ADJACENCY, GL_TRIANGLES_ADJACENCY, GL_TRIANGLE_STRIP_ADJACENCY and GL_PATCHES are accepted.
+            /// </para>
+            /// </param>
+            /// <param name="first">
+            /// <para>
+            /// Specifies the starting index in the enabled arrays.
+            /// </para>
+            /// </param>
+            /// <param name="count">
+            /// <para>
+            /// Specifies the number of indices to be rendered.
+            /// </para>
+            /// </param>
+            /// <param name="primcount">
+            /// <para>
+            /// Specifies the number of instances of the specified range of indices to be rendered.
+            /// </para>
+            /// </param>
+            [Obsolete("Use PrimitiveType overload instead")]
+            [AutoGenerated(Category = "ARB_draw_instanced", Version = "", EntryPoint = "glDrawArraysInstancedARB")]
+            public static 
+            void DrawArraysInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 first, Int32 count, Int32 primcount)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDrawArraysInstancedARB((OpenTK.Graphics.OpenGL.PrimitiveType)mode, (Int32)first, (Int32)count, (Int32)primcount);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: ARB_draw_instanced]
             /// Draw multiple instances of a range of elements
             /// </summary>
@@ -37888,6 +37981,73 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Bind a buffer object to an indexed buffer target
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER or GL_SHADER_STORAGE_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// Specify the index of the binding point within the array specified by target.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// The name of a buffer object to bind to the specified binding point.
+        /// </para>
+        /// </param>
+        [Obsolete("Use BufferRangeTarget instead")]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glBindBufferBase")]
+        public static 
+        void BindBufferBase(OpenTK.Graphics.OpenGL.BufferTarget target, Int32 index, Int32 buffer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBindBufferBase((OpenTK.Graphics.OpenGL.BufferRangeTarget)target, (UInt32)index, (UInt32)buffer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.0]
+        /// Bind a buffer object to an indexed buffer target
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER or GL_SHADER_STORAGE_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// Specify the index of the binding point within the array specified by target.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// The name of a buffer object to bind to the specified binding point.
+        /// </para>
+        /// </param>
+        [Obsolete("Use BufferRangeTarget instead")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glBindBufferBase")]
+        public static 
+        void BindBufferBase(OpenTK.Graphics.OpenGL.BufferTarget target, UInt32 index, UInt32 buffer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBindBufferBase((OpenTK.Graphics.OpenGL.BufferRangeTarget)target, (UInt32)index, (UInt32)buffer);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.0]
         /// Bind a range within a buffer object to an indexed buffer target
         /// </summary>
@@ -37973,6 +38133,93 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Bind a range within a buffer object to an indexed buffer target
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER, or GL_SHADER_STORAGE_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// Specify the index of the binding point within the array specified by target.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// The name of a buffer object to bind to the specified binding point.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// The starting offset in basic machine units into the buffer object buffer.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// The amount of data in machine units that can be read from the buffet object while used as an indexed target.
+        /// </para>
+        /// </param>
+        [Obsolete("Use BufferRangeTarget instead")]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glBindBufferRange")]
+        public static 
+        void BindBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, Int32 index, Int32 buffer, IntPtr offset, IntPtr size)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBindBufferRange((OpenTK.Graphics.OpenGL.BufferRangeTarget)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.0]
+        /// Bind a range within a buffer object to an indexed buffer target
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER, or GL_SHADER_STORAGE_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// Specify the index of the binding point within the array specified by target.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// The name of a buffer object to bind to the specified binding point.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// The starting offset in basic machine units into the buffer object buffer.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// The amount of data in machine units that can be read from the buffet object while used as an indexed target.
+        /// </para>
+        /// </param>
+        [Obsolete("Use BufferRangeTarget instead")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glBindBufferRange")]
+        public static 
+        void BindBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBindBufferRange((OpenTK.Graphics.OpenGL.BufferRangeTarget)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v4.4 and ARB_multi_bind|VERSION_4_4]
         /// Bind one or more buffer objects to a sequence of indexed buffer targets
         /// </summary>
@@ -40260,6 +40507,33 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v1.4 and ARB_imaging|VERSION_1_4]
+        /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
+        /// </summary>
+        /// <param name="buf">
+        /// <para>
+        /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
+        /// </para>
+        /// </param>
+        /// <param name="mode">
+        /// <para>
+        /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "ARB_imaging|VERSION_1_4", Version = "1.4", EntryPoint = "glBlendEquation")]
+        public static 
+        void BlendEquation(OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend mode)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBlendEquation((OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v1.4 and ARB_imaging|VERSION_1_4]
         /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
         /// </summary>
@@ -40302,13 +40576,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendEquationi")]
         public static 
-        void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL.Version40 mode)
+        void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend mode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL.Version40)mode);
+            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v4.0]
+        /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
+        /// </summary>
+        /// <param name="buf">
+        /// <para>
+        /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
+        /// </para>
+        /// </param>
+        /// <param name="mode">
+        /// <para>
+        /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendEquationi")]
+        public static 
+        void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
             #if DEBUG
             }
             #endif
@@ -40330,13 +40631,41 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendEquationi")]
         public static 
-        void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 mode)
+        void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend mode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL.Version40)mode);
+            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v4.0]
+        /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
+        /// </summary>
+        /// <param name="buf">
+        /// <para>
+        /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
+        /// </para>
+        /// </param>
+        /// <param name="mode">
+        /// <para>
+        /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendEquationi")]
+        public static 
+        void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
             #if DEBUG
             }
             #endif
@@ -40491,13 +40820,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFunci")]
         public static 
-        void BlendFunc(Int32 buf, OpenTK.Graphics.OpenGL.Version40 src, OpenTK.Graphics.OpenGL.Version40 dst)
+        void BlendFunc(Int32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc src, OpenTK.Graphics.OpenGL.Version40 dst)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL.Version40)src, (OpenTK.Graphics.OpenGL.Version40)dst);
+            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)src, (OpenTK.Graphics.OpenGL.Version40)dst);
             #if DEBUG
             }
             #endif
@@ -40524,13 +40853,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFunci")]
         public static 
-        void BlendFunc(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 src, OpenTK.Graphics.OpenGL.Version40 dst)
+        void BlendFunc(UInt32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc src, OpenTK.Graphics.OpenGL.Version40 dst)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL.Version40)src, (OpenTK.Graphics.OpenGL.Version40)dst);
+            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)src, (OpenTK.Graphics.OpenGL.Version40)dst);
             #if DEBUG
             }
             #endif
@@ -40566,13 +40895,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_1_4", Version = "1.4", EntryPoint = "glBlendFuncSeparate")]
         public static 
-        void BlendFuncSeparate(OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactorRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactorAlpha)
+        void BlendFuncSeparate(OpenTK.Graphics.OpenGL.Version14 sfactorRGB, OpenTK.Graphics.OpenGL.Version14 dfactorRGB, OpenTK.Graphics.OpenGL.Version14 sfactorAlpha, OpenTK.Graphics.OpenGL.Version14 dfactorAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparate((OpenTK.Graphics.OpenGL.BlendingFactorSrc)sfactorRGB, (OpenTK.Graphics.OpenGL.BlendingFactorDest)dfactorRGB, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)sfactorAlpha, (OpenTK.Graphics.OpenGL.BlendingFactorDest)dfactorAlpha);
+            Delegates.glBlendFuncSeparate((OpenTK.Graphics.OpenGL.Version14)sfactorRGB, (OpenTK.Graphics.OpenGL.Version14)dfactorRGB, (OpenTK.Graphics.OpenGL.Version14)sfactorAlpha, (OpenTK.Graphics.OpenGL.Version14)dfactorAlpha);
             #if DEBUG
             }
             #endif
@@ -40608,13 +40937,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFuncSeparatei")]
         public static 
-        void BlendFuncSeparate(Int32 buf, OpenTK.Graphics.OpenGL.Version40 srcRGB, OpenTK.Graphics.OpenGL.Version40 dstRGB, OpenTK.Graphics.OpenGL.Version40 srcAlpha, OpenTK.Graphics.OpenGL.Version40 dstAlpha)
+        void BlendFuncSeparate(Int32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dstAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL.Version40)srcRGB, (OpenTK.Graphics.OpenGL.Version40)dstRGB, (OpenTK.Graphics.OpenGL.Version40)srcAlpha, (OpenTK.Graphics.OpenGL.Version40)dstAlpha);
+            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.OpenGL.BlendingFactorDest)dstRGB, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.OpenGL.BlendingFactorDest)dstAlpha);
             #if DEBUG
             }
             #endif
@@ -40651,13 +40980,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFuncSeparatei")]
         public static 
-        void BlendFuncSeparate(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 srcRGB, OpenTK.Graphics.OpenGL.Version40 dstRGB, OpenTK.Graphics.OpenGL.Version40 srcAlpha, OpenTK.Graphics.OpenGL.Version40 dstAlpha)
+        void BlendFuncSeparate(UInt32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dstAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL.Version40)srcRGB, (OpenTK.Graphics.OpenGL.Version40)dstRGB, (OpenTK.Graphics.OpenGL.Version40)srcAlpha, (OpenTK.Graphics.OpenGL.Version40)dstAlpha);
+            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.OpenGL.BlendingFactorDest)dstRGB, (OpenTK.Graphics.OpenGL.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.OpenGL.BlendingFactorDest)dstAlpha);
             #if DEBUG
             }
             #endif
@@ -54956,6 +55285,44 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.1]
+        /// Draw multiple instances of a range of elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES GL_LINES_ADJACENCY, GL_LINE_STRIP_ADJACENCY, GL_TRIANGLES_ADJACENCY, GL_TRIANGLE_STRIP_ADJACENCY and GL_PATCHES are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="first">
+        /// <para>
+        /// Specifies the starting index in the enabled arrays.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of indices to be rendered.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the number of instances of the specified range of indices to be rendered.
+        /// </para>
+        /// </param>
+        [Obsolete("Use PrimitiveType overload instead")]
+        [AutoGenerated(Category = "VERSION_3_1", Version = "3.1", EntryPoint = "glDrawArraysInstanced")]
+        public static 
+        void DrawArraysInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 first, Int32 count, Int32 instancecount)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawArraysInstanced((OpenTK.Graphics.OpenGL.PrimitiveType)mode, (Int32)first, (Int32)count, (Int32)instancecount);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.1]
         /// Draw multiple instances of a range of elements
         /// </summary>
@@ -62404,6 +62771,61 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Create a new sync object and insert it into the GL command stream
+        /// </summary>
+        /// <param name="condition">
+        /// <para>
+        /// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
+        /// </para>
+        /// </param>
+        /// <param name="flags">
+        /// <para>
+        /// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glFenceSync")]
+        public static 
+        IntPtr FenceSync(OpenTK.Graphics.OpenGL.ArbSync condition, Int32 flags)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            return Delegates.glFenceSync((OpenTK.Graphics.OpenGL.SyncCondition)condition, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Create a new sync object and insert it into the GL command stream
+        /// </summary>
+        /// <param name="condition">
+        /// <para>
+        /// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
+        /// </para>
+        /// </param>
+        /// <param name="flags">
+        /// <para>
+        /// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glFenceSync")]
+        public static 
+        IntPtr FenceSync(OpenTK.Graphics.OpenGL.ArbSync condition, uint flags)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            return Delegates.glFenceSync((OpenTK.Graphics.OpenGL.SyncCondition)condition, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
         /// Create a new sync object and insert it into the GL command stream
         /// </summary>
@@ -71850,6 +72272,126 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.2]</summary>
+        [AutoGenerated(Category = "VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        public static 
+        void GetInteger(OpenTK.Graphics.OpenGL.Version32 target, Int32 index, [OutAttribute] Int64[] data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int64* data_ptr = data)
+                {
+                    Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int64*)data_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2]</summary>
+        [AutoGenerated(Category = "VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        public static 
+        void GetInteger(OpenTK.Graphics.OpenGL.Version32 target, Int32 index, [OutAttribute] out Int64 data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int64* data_ptr = &data)
+                {
+                    Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int64*)data_ptr);
+                    data = *data_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2]</summary>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        public static 
+        unsafe void GetInteger(OpenTK.Graphics.OpenGL.Version32 target, Int32 index, [OutAttribute] Int64* data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int64*)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2]</summary>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        public static 
+        void GetInteger(OpenTK.Graphics.OpenGL.Version32 target, UInt32 index, [OutAttribute] Int64[] data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int64* data_ptr = data)
+                {
+                    Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int64*)data_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2]</summary>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        public static 
+        void GetInteger(OpenTK.Graphics.OpenGL.Version32 target, UInt32 index, [OutAttribute] out Int64 data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int64* data_ptr = &data)
+                {
+                    Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int64*)data_ptr);
+                    data = *data_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2]</summary>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        public static 
+        unsafe void GetInteger(OpenTK.Graphics.OpenGL.Version32 target, UInt32 index, [OutAttribute] Int64* data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int64*)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]</summary>
         [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetInteger64v")]
         public static 
@@ -72133,7 +72675,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_internalformat_query2|VERSION_4_3]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query2|VERSION_4_3", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64[] @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -72143,7 +72685,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int64* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
+                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -72154,7 +72696,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_internalformat_query2|VERSION_4_3]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query2|VERSION_4_3", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int64 @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int64 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -72164,7 +72706,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int64* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
+                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -72177,13 +72719,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_internalformat_query2|VERSION_4_3", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params);
+            Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params);
             #if DEBUG
             }
             #endif
@@ -72219,7 +72761,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_internalformat_query|VERSION_4_2", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -72229,7 +72771,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -72267,7 +72809,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_internalformat_query|VERSION_4_2", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -72277,7 +72819,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -72317,13 +72859,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_internalformat_query|VERSION_4_2", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
+            Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -77187,7 +77729,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -77197,7 +77739,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -77225,7 +77767,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -77235,7 +77777,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -77265,13 +77807,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -77295,6 +77837,232 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested object parameter.
         /// </para>
         /// </param>
+        [Obsolete("Use GetProgramParameterName instead")]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        public static 
+        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* @params_ptr = @params)
+                {
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_BLOCKS, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, GL_ACTIVE_UNIFORM_MAX_LENGTH, GL_COMPUTE_WORK_GROUP_SIZE GL_PROGRAM_BINARY_LENGTH, GL_TRANSFORM_FEEDBACK_BUFFER_MODE, GL_TRANSFORM_FEEDBACK_VARYINGS, GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, GL_GEOMETRY_VERTICES_OUT, GL_GEOMETRY_INPUT_TYPE, and GL_GEOMETRY_OUTPUT_TYPE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
+        [Obsolete("Use GetProgramParameterName instead")]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        public static 
+        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* @params_ptr = &@params)
+                {
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
+                    @params = *@params_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_BLOCKS, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, GL_ACTIVE_UNIFORM_MAX_LENGTH, GL_COMPUTE_WORK_GROUP_SIZE GL_PROGRAM_BINARY_LENGTH, GL_TRANSFORM_FEEDBACK_BUFFER_MODE, GL_TRANSFORM_FEEDBACK_VARYINGS, GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, GL_GEOMETRY_VERTICES_OUT, GL_GEOMETRY_INPUT_TYPE, and GL_GEOMETRY_OUTPUT_TYPE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
+        [Obsolete("Use GetProgramParameterName instead")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        public static 
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_BLOCKS, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, GL_ACTIVE_UNIFORM_MAX_LENGTH, GL_COMPUTE_WORK_GROUP_SIZE GL_PROGRAM_BINARY_LENGTH, GL_TRANSFORM_FEEDBACK_BUFFER_MODE, GL_TRANSFORM_FEEDBACK_VARYINGS, GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, GL_GEOMETRY_VERTICES_OUT, GL_GEOMETRY_INPUT_TYPE, and GL_GEOMETRY_OUTPUT_TYPE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        public static 
+        void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* @params_ptr = @params)
+                {
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_BLOCKS, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, GL_ACTIVE_UNIFORM_MAX_LENGTH, GL_COMPUTE_WORK_GROUP_SIZE GL_PROGRAM_BINARY_LENGTH, GL_TRANSFORM_FEEDBACK_BUFFER_MODE, GL_TRANSFORM_FEEDBACK_VARYINGS, GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, GL_GEOMETRY_VERTICES_OUT, GL_GEOMETRY_INPUT_TYPE, and GL_GEOMETRY_OUTPUT_TYPE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        public static 
+        void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* @params_ptr = &@params)
+                {
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
+                    @params = *@params_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_BLOCKS, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, GL_ACTIVE_UNIFORM_MAX_LENGTH, GL_COMPUTE_WORK_GROUP_SIZE GL_PROGRAM_BINARY_LENGTH, GL_TRANSFORM_FEEDBACK_BUFFER_MODE, GL_TRANSFORM_FEEDBACK_VARYINGS, GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, GL_GEOMETRY_VERTICES_OUT, GL_GEOMETRY_INPUT_TYPE, and GL_GEOMETRY_OUTPUT_TYPE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        public static 
+        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATOMIC_COUNTER_BUFFERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_BLOCKS, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, GL_ACTIVE_UNIFORM_MAX_LENGTH, GL_COMPUTE_WORK_GROUP_SIZE GL_PROGRAM_BINARY_LENGTH, GL_TRANSFORM_FEEDBACK_BUFFER_MODE, GL_TRANSFORM_FEEDBACK_VARYINGS, GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, GL_GEOMETRY_VERTICES_OUT, GL_GEOMETRY_INPUT_TYPE, and GL_GEOMETRY_OUTPUT_TYPE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
+        [Obsolete("Use GetProgramParameterName instead")]
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
@@ -77308,7 +78076,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -77334,6 +78102,7 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested object parameter.
         /// </para>
         /// </param>
+        [Obsolete("Use GetProgramParameterName instead")]
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
@@ -77347,7 +78116,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -77374,6 +78143,7 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested object parameter.
         /// </para>
         /// </param>
+        [Obsolete("Use GetProgramParameterName instead")]
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
@@ -77383,7 +78153,7 @@ namespace OpenTK.Graphics.OpenGL
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -79810,7 +80580,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Single[] @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79820,7 +80590,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -79848,7 +80618,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] out Single @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79858,7 +80628,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -79888,13 +80658,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Single* @params)
+        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)@params);
+            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -79921,7 +80691,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Single[] @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79931,7 +80701,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -79960,7 +80730,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] out Single @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79970,7 +80740,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -80000,13 +80770,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Single* @params)
+        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)@params);
+            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -80213,7 +80983,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Int32[] @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80223,7 +80993,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -80251,7 +81021,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] out Int32 @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80261,7 +81031,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -80291,13 +81061,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)@params);
+            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -80324,7 +81094,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Int32[] @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80334,7 +81104,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -80363,7 +81133,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] out Int32 @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80373,7 +81143,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -80403,13 +81173,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)@params);
+            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -81420,6 +82190,61 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Return a string describing the current GL connection
+        /// </summary>
+        /// <param name="name">
+        /// <para>
+        /// Specifies a symbolic constant, one of GL_VENDOR, GL_RENDERER, GL_VERSION, or GL_SHADING_LANGUAGE_VERSION. Additionally, glGetStringi accepts the GL_EXTENSIONS token.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// For glGetStringi, specifies the index of the string to return.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetStringi")]
+        public static 
+        String GetString(OpenTK.Graphics.OpenGL.StringName name, Int32 index)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe { return new string((sbyte*)Delegates.glGetStringi((OpenTK.Graphics.OpenGL.StringNameIndexed)name, (UInt32)index)); }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.0]
+        /// Return a string describing the current GL connection
+        /// </summary>
+        /// <param name="name">
+        /// <para>
+        /// Specifies a symbolic constant, one of GL_VENDOR, GL_RENDERER, GL_VERSION, or GL_SHADING_LANGUAGE_VERSION. Additionally, glGetStringi accepts the GL_EXTENSIONS token.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// For glGetStringi, specifies the index of the string to return.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetStringi")]
+        public static 
+        String GetString(OpenTK.Graphics.OpenGL.StringName name, UInt32 index)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe { return new string((sbyte*)Delegates.glGetStringi((OpenTK.Graphics.OpenGL.StringNameIndexed)name, (UInt32)index)); }
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.0]
         /// Return a string describing the current GL connection
         /// </summary>
@@ -81605,6 +82430,150 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Query the properties of a sync object
+        /// </summary>
+        /// <param name="sync">
+        /// <para>
+        /// Specifies the sync object whose properties to query.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the parameter whose value to retrieve from the sync object specified in sync.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the size of the buffer whose address is given in values.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Specifies the address of an variable to receive the number of integers placed in values.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies the address of an array to receive the values of the queried parameter.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
+        public static 
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* length_ptr = &length)
+                fixed (Int32* values_ptr = values)
+                {
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    length = *length_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Query the properties of a sync object
+        /// </summary>
+        /// <param name="sync">
+        /// <para>
+        /// Specifies the sync object whose properties to query.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the parameter whose value to retrieve from the sync object specified in sync.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the size of the buffer whose address is given in values.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Specifies the address of an variable to receive the number of integers placed in values.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies the address of an array to receive the values of the queried parameter.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
+        public static 
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* length_ptr = &length)
+                fixed (Int32* values_ptr = &values)
+                {
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    length = *length_ptr;
+                    values = *values_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Query the properties of a sync object
+        /// </summary>
+        /// <param name="sync">
+        /// <para>
+        /// Specifies the sync object whose properties to query.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the parameter whose value to retrieve from the sync object specified in sync.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the size of the buffer whose address is given in values.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Specifies the address of an variable to receive the number of integers placed in values.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies the address of an array to receive the values of the queried parameter.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
+        public static 
+        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameterName)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
         /// Query the properties of a sync object
         /// </summary>
@@ -83136,6 +84105,69 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Retrieve information about varying variables selected for transform feedback
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// The name of the target program object.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// The index of the varying variable whose information to retrieve.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// The maximum number of characters, including the null terminator, that may be written into name.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// The address of a variable that will receive the size of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The address of a variable that will recieve the type of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// The address of a buffer into which will be written the name of the varying.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
+        public static 
+        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.ActiveAttribType type, [OutAttribute] StringBuilder name)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* length_ptr = &length)
+                fixed (Int32* size_ptr = &size)
+                fixed (OpenTK.Graphics.OpenGL.ActiveAttribType* type_ptr = &type)
+                {
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type_ptr, (StringBuilder)name);
+                    length = *length_ptr;
+                    size = *size_ptr;
+                    type = *type_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.0]
         /// Retrieve information about varying variables selected for transform feedback
         /// </summary>
@@ -83199,6 +84231,59 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Retrieve information about varying variables selected for transform feedback
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// The name of the target program object.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// The index of the varying variable whose information to retrieve.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// The maximum number of characters, including the null terminator, that may be written into name.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// The address of a variable that will receive the size of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The address of a variable that will recieve the type of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// The address of a buffer into which will be written the name of the varying.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
+        public static 
+        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type, (StringBuilder)name);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.0]
         /// Retrieve information about varying variables selected for transform feedback
         /// </summary>
@@ -83252,6 +84337,70 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Retrieve information about varying variables selected for transform feedback
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// The name of the target program object.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// The index of the varying variable whose information to retrieve.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// The maximum number of characters, including the null terminator, that may be written into name.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// The address of a variable that will receive the size of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The address of a variable that will recieve the type of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// The address of a buffer into which will be written the name of the varying.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
+        public static 
+        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.ActiveAttribType type, [OutAttribute] StringBuilder name)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* length_ptr = &length)
+                fixed (Int32* size_ptr = &size)
+                fixed (OpenTK.Graphics.OpenGL.ActiveAttribType* type_ptr = &type)
+                {
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type_ptr, (StringBuilder)name);
+                    length = *length_ptr;
+                    size = *size_ptr;
+                    type = *type_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.0]
         /// Retrieve information about varying variables selected for transform feedback
         /// </summary>
@@ -83316,6 +84465,59 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.0]
+        /// Retrieve information about varying variables selected for transform feedback
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// The name of the target program object.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// The index of the varying variable whose information to retrieve.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// The maximum number of characters, including the null terminator, that may be written into name.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// The address of a variable that will receive the size of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The address of a variable that will recieve the type of the varying.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// The address of a buffer into which will be written the name of the varying.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
+        public static 
+        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type, (StringBuilder)name);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.0]
         /// Retrieve information about varying variables selected for transform feedback
         /// </summary>
@@ -98914,13 +100116,46 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_get_program_binary|VERSION_4_1", Version = "4.1", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value)
+        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameterName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterPName)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterName)pname, (Int32)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v4.1 and ARB_get_program_binary|VERSION_4_1]
+        /// Specify a parameter for a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the name of a program object whose parameter to modify.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the name of the parameter to modify.
+        /// </para>
+        /// </param>
+        /// <param name="value">
+        /// <para>
+        /// Specifies the new value of the parameter specified by pname for program.
+        /// </para>
+        /// </param>
+        [Obsolete("Use ProgramParameterName instead")]
+        [AutoGenerated(Category = "ARB_get_program_binary|VERSION_4_1", Version = "4.1", EntryPoint = "glProgramParameteri")]
+        public static 
+        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.Version32 pname, Int32 value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -98947,13 +100182,47 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_get_program_binary|VERSION_4_1", Version = "4.1", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value)
+        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterPName)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterName)pname, (Int32)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v4.1 and ARB_get_program_binary|VERSION_4_1]
+        /// Specify a parameter for a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the name of a program object whose parameter to modify.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the name of the parameter to modify.
+        /// </para>
+        /// </param>
+        /// <param name="value">
+        /// <para>
+        /// Specifies the new value of the parameter specified by pname for program.
+        /// </para>
+        /// </param>
+        [Obsolete("Use ProgramParameterName instead")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ARB_get_program_binary|VERSION_4_1", Version = "4.1", EntryPoint = "glProgramParameteri")]
+        public static 
+        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL.Version32 pname, Int32 value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameterName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -109145,13 +110414,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterf")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single)param);
+            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -109183,13 +110452,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterf")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single)param);
+            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -109220,7 +110489,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single[] param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109230,7 +110499,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)param_ptr);
+                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109264,13 +110533,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single* param)
+        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)param);
+            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)param);
             #if DEBUG
             }
             #endif
@@ -109302,7 +110571,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single[] param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109312,7 +110581,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)param_ptr);
+                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109346,13 +110615,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single* param)
+        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Single*)param);
+            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Single*)param);
             #if DEBUG
             }
             #endif
@@ -109383,13 +110652,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteri")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32 param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32)param);
+            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -109421,13 +110690,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteri")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32 param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32)param);
+            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -109436,7 +110705,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v3.3 and ARB_sampler_objects|VERSION_3_3]</summary>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL.All pname, Int32[] param)
+        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109446,7 +110715,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109457,7 +110726,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v3.3 and ARB_sampler_objects|VERSION_3_3]</summary>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL.All pname, ref Int32 param)
+        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, ref Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109467,7 +110736,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* param_ptr = &param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109479,13 +110748,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        unsafe void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL.All pname, Int32* param)
+        unsafe void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (Int32*)param);
+            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -109495,7 +110764,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, Int32[] param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109505,7 +110774,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109517,7 +110786,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, ref Int32 param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, ref Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109527,7 +110796,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* param_ptr = &param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109539,13 +110808,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, Int32* param)
+        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (Int32*)param);
+            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -109555,7 +110824,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIuiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, UInt32[] param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, UInt32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109565,7 +110834,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (UInt32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (UInt32*)param_ptr);
+                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (UInt32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109577,7 +110846,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIuiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, ref UInt32 param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, ref UInt32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109587,7 +110856,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (UInt32* param_ptr = &param)
                 {
-                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (UInt32*)param_ptr);
+                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (UInt32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109599,13 +110868,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIuiv")]
         public static 
-        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, UInt32* param)
+        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, UInt32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.All)pname, (UInt32*)param);
+            Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (UInt32*)param);
             #if DEBUG
             }
             #endif
@@ -109636,7 +110905,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32[] param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109646,7 +110915,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109680,13 +110949,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32* param)
+        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)param);
+            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -109718,7 +110987,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32[] param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -109728,7 +110997,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -109762,13 +111031,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32* param)
+        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameter)pname, (Int32*)param);
+            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -135961,6 +137230,71 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Instruct the GL server to block until the specified sync object becomes signaled
+        /// </summary>
+        /// <param name="sync">
+        /// <para>
+        /// Specifies the sync object whose status to wait on.
+        /// </para>
+        /// </param>
+        /// <param name="flags">
+        /// <para>
+        /// A bitfield controlling the command flushing behavior. flags may be zero.
+        /// </para>
+        /// </param>
+        /// <param name="timeout">
+        /// <para>
+        /// Specifies the timeout that the server should wait before continuing. timeout must be GL_TIMEOUT_IGNORED.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glWaitSync")]
+        public static 
+        OpenTK.Graphics.OpenGL.WaitSyncStatus WaitSync(IntPtr sync, Int32 flags, Int64 timeout)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            return Delegates.glWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags, (UInt64)timeout);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
+        /// Instruct the GL server to block until the specified sync object becomes signaled
+        /// </summary>
+        /// <param name="sync">
+        /// <para>
+        /// Specifies the sync object whose status to wait on.
+        /// </para>
+        /// </param>
+        /// <param name="flags">
+        /// <para>
+        /// A bitfield controlling the command flushing behavior. flags may be zero.
+        /// </para>
+        /// </param>
+        /// <param name="timeout">
+        /// <para>
+        /// Specifies the timeout that the server should wait before continuing. timeout must be GL_TIMEOUT_IGNORED.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glWaitSync")]
+        public static 
+        OpenTK.Graphics.OpenGL.WaitSyncStatus WaitSync(IntPtr sync, uint flags, UInt64 timeout)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            return Delegates.glWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags, (UInt64)timeout);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
         /// Instruct the GL server to block until the specified sync object becomes signaled
         /// </summary>
@@ -137239,6 +138573,73 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Bind a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glBindBufferBaseEXT")]
+            public static 
+            void BindBufferBase(OpenTK.Graphics.OpenGL.BufferTarget target, Int32 index, Int32 buffer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferBaseEXT((OpenTK.Graphics.OpenGL.ExtTransformFeedback)target, (UInt32)index, (UInt32)buffer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Bind a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glBindBufferBaseEXT")]
+            public static 
+            void BindBufferBase(OpenTK.Graphics.OpenGL.BufferTarget target, UInt32 index, UInt32 buffer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferBaseEXT((OpenTK.Graphics.OpenGL.ExtTransformFeedback)target, (UInt32)index, (UInt32)buffer);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_transform_feedback]
             /// Bind a buffer object to an indexed buffer target
             /// </summary>
@@ -137335,6 +138736,93 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Bind a range within a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER, or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            /// <param name="offset">
+            /// <para>
+            /// The starting offset in basic machine units into the buffer object buffer.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The amount of data in machine units that can be read from the buffet object while used as an indexed target.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glBindBufferRangeEXT")]
+            public static 
+            void BindBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, Int32 index, Int32 buffer, IntPtr offset, IntPtr size)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferRangeEXT((OpenTK.Graphics.OpenGL.ExtTransformFeedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Bind a range within a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER, or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            /// <param name="offset">
+            /// <para>
+            /// The starting offset in basic machine units into the buffer object buffer.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The amount of data in machine units that can be read from the buffet object while used as an indexed target.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glBindBufferRangeEXT")]
+            public static 
+            void BindBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferRangeEXT((OpenTK.Graphics.OpenGL.ExtTransformFeedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_transform_feedback]
             /// Bind a range within a buffer object to an indexed buffer target
             /// </summary>
@@ -138527,13 +140015,40 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_blend_minmax", Version = "", EntryPoint = "glBlendEquationEXT")]
             public static 
-            void BlendEquation(OpenTK.Graphics.OpenGL.ExtBlendMinmax mode)
+            void BlendEquation(OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend mode)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationEXT((OpenTK.Graphics.OpenGL.ExtBlendMinmax)mode);
+                Delegates.glBlendEquationEXT((OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: EXT_blend_minmax]
+            /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
+            /// </summary>
+            /// <param name="buf">
+            /// <para>
+            /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
+            /// </para>
+            /// </param>
+            /// <param name="mode">
+            /// <para>
+            /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
+            /// </para>
+            /// </param>
+            [AutoGenerated(Category = "EXT_blend_minmax", Version = "", EntryPoint = "glBlendEquationEXT")]
+            public static 
+            void BlendEquation(OpenTK.Graphics.OpenGL.BlendEquationMode mode)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBlendEquationEXT((OpenTK.Graphics.OpenGL.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
@@ -144842,6 +146357,44 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_draw_instanced]
+            /// Draw multiple instances of a range of elements
+            /// </summary>
+            /// <param name="mode">
+            /// <para>
+            /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES GL_LINES_ADJACENCY, GL_LINE_STRIP_ADJACENCY, GL_TRIANGLES_ADJACENCY, GL_TRIANGLE_STRIP_ADJACENCY and GL_PATCHES are accepted.
+            /// </para>
+            /// </param>
+            /// <param name="first">
+            /// <para>
+            /// Specifies the starting index in the enabled arrays.
+            /// </para>
+            /// </param>
+            /// <param name="count">
+            /// <para>
+            /// Specifies the number of indices to be rendered.
+            /// </para>
+            /// </param>
+            /// <param name="primcount">
+            /// <para>
+            /// Specifies the number of instances of the specified range of indices to be rendered.
+            /// </para>
+            /// </param>
+            [Obsolete("Use PrimitiveType overload instead")]
+            [AutoGenerated(Category = "EXT_draw_instanced", Version = "", EntryPoint = "glDrawArraysInstancedEXT")]
+            public static 
+            void DrawArraysInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 count, Int32 primcount)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDrawArraysInstancedEXT((OpenTK.Graphics.OpenGL.PrimitiveType)mode, (Int32)start, (Int32)count, (Int32)primcount);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_draw_instanced]
             /// Draw multiple instances of a range of elements
             /// </summary>
@@ -158373,6 +159926,69 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Retrieve information about varying variables selected for transform feedback
+            /// </summary>
+            /// <param name="program">
+            /// <para>
+            /// The name of the target program object.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// The index of the varying variable whose information to retrieve.
+            /// </para>
+            /// </param>
+            /// <param name="bufSize">
+            /// <para>
+            /// The maximum number of characters, including the null terminator, that may be written into name.
+            /// </para>
+            /// </param>
+            /// <param name="length">
+            /// <para>
+            /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The address of a variable that will receive the size of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="type">
+            /// <para>
+            /// The address of a variable that will recieve the type of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="name">
+            /// <para>
+            /// The address of a buffer into which will be written the name of the varying.
+            /// </para>
+            /// </param>
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
+            public static 
+            void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.ActiveAttribType type, [OutAttribute] StringBuilder name)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* length_ptr = &length)
+                    fixed (Int32* size_ptr = &size)
+                    fixed (OpenTK.Graphics.OpenGL.ActiveAttribType* type_ptr = &type)
+                    {
+                        Delegates.glGetTransformFeedbackVaryingEXT((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.ExtTransformFeedback*)type_ptr, (StringBuilder)name);
+                        length = *length_ptr;
+                        size = *size_ptr;
+                        type = *type_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_transform_feedback]
             /// Retrieve information about varying variables selected for transform feedback
             /// </summary>
@@ -158436,6 +160052,59 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Retrieve information about varying variables selected for transform feedback
+            /// </summary>
+            /// <param name="program">
+            /// <para>
+            /// The name of the target program object.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// The index of the varying variable whose information to retrieve.
+            /// </para>
+            /// </param>
+            /// <param name="bufSize">
+            /// <para>
+            /// The maximum number of characters, including the null terminator, that may be written into name.
+            /// </para>
+            /// </param>
+            /// <param name="length">
+            /// <para>
+            /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The address of a variable that will receive the size of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="type">
+            /// <para>
+            /// The address of a variable that will recieve the type of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="name">
+            /// <para>
+            /// The address of a buffer into which will be written the name of the varying.
+            /// </para>
+            /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
+            public static 
+            unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTransformFeedbackVaryingEXT((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ExtTransformFeedback*)type, (StringBuilder)name);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_transform_feedback]
             /// Retrieve information about varying variables selected for transform feedback
             /// </summary>
@@ -158489,6 +160158,70 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Retrieve information about varying variables selected for transform feedback
+            /// </summary>
+            /// <param name="program">
+            /// <para>
+            /// The name of the target program object.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// The index of the varying variable whose information to retrieve.
+            /// </para>
+            /// </param>
+            /// <param name="bufSize">
+            /// <para>
+            /// The maximum number of characters, including the null terminator, that may be written into name.
+            /// </para>
+            /// </param>
+            /// <param name="length">
+            /// <para>
+            /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The address of a variable that will receive the size of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="type">
+            /// <para>
+            /// The address of a variable that will recieve the type of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="name">
+            /// <para>
+            /// The address of a buffer into which will be written the name of the varying.
+            /// </para>
+            /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
+            public static 
+            void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.ActiveAttribType type, [OutAttribute] StringBuilder name)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* length_ptr = &length)
+                    fixed (Int32* size_ptr = &size)
+                    fixed (OpenTK.Graphics.OpenGL.ActiveAttribType* type_ptr = &type)
+                    {
+                        Delegates.glGetTransformFeedbackVaryingEXT((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.ExtTransformFeedback*)type_ptr, (StringBuilder)name);
+                        length = *length_ptr;
+                        size = *size_ptr;
+                        type = *type_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_transform_feedback]
             /// Retrieve information about varying variables selected for transform feedback
             /// </summary>
@@ -158553,6 +160286,59 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: EXT_transform_feedback]
+            /// Retrieve information about varying variables selected for transform feedback
+            /// </summary>
+            /// <param name="program">
+            /// <para>
+            /// The name of the target program object.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// The index of the varying variable whose information to retrieve.
+            /// </para>
+            /// </param>
+            /// <param name="bufSize">
+            /// <para>
+            /// The maximum number of characters, including the null terminator, that may be written into name.
+            /// </para>
+            /// </param>
+            /// <param name="length">
+            /// <para>
+            /// The address of a variable which will receive the number of characters written into name, excluding the null-terminator. If length is NULL no length is returned.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The address of a variable that will receive the size of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="type">
+            /// <para>
+            /// The address of a variable that will recieve the type of the varying.
+            /// </para>
+            /// </param>
+            /// <param name="name">
+            /// <para>
+            /// The address of a buffer into which will be written the name of the varying.
+            /// </para>
+            /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "EXT_transform_feedback", Version = "", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
+            public static 
+            unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTransformFeedbackVaryingEXT((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ExtTransformFeedback*)type, (StringBuilder)name);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: EXT_transform_feedback]
             /// Retrieve information about varying variables selected for transform feedback
             /// </summary>
@@ -195376,6 +197162,73 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: NV_transform_feedback]
+            /// Bind a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [AutoGenerated(Category = "NV_transform_feedback", Version = "", EntryPoint = "glBindBufferBaseNV")]
+            public static 
+            void BindBufferBase(OpenTK.Graphics.OpenGL.BufferTarget target, Int32 index, Int32 buffer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferBaseNV((OpenTK.Graphics.OpenGL.NvTransformFeedback)target, (UInt32)index, (UInt32)buffer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: NV_transform_feedback]
+            /// Bind a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NV_transform_feedback", Version = "", EntryPoint = "glBindBufferBaseNV")]
+            public static 
+            void BindBufferBase(OpenTK.Graphics.OpenGL.BufferTarget target, UInt32 index, UInt32 buffer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferBaseNV((OpenTK.Graphics.OpenGL.NvTransformFeedback)target, (UInt32)index, (UInt32)buffer);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: NV_transform_feedback]
             /// Bind a buffer object to an indexed buffer target
             /// </summary>
@@ -195472,6 +197325,93 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            /// <summary>[requires: NV_transform_feedback]
+            /// Bind a range within a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER, or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            /// <param name="offset">
+            /// <para>
+            /// The starting offset in basic machine units into the buffer object buffer.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The amount of data in machine units that can be read from the buffet object while used as an indexed target.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [AutoGenerated(Category = "NV_transform_feedback", Version = "", EntryPoint = "glBindBufferRangeNV")]
+            public static 
+            void BindBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, Int32 index, Int32 buffer, IntPtr offset, IntPtr size)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferRangeNV((OpenTK.Graphics.OpenGL.NvTransformFeedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            /// <summary>[requires: NV_transform_feedback]
+            /// Bind a range within a buffer object to an indexed buffer target
+            /// </summary>
+            /// <param name="target">
+            /// <para>
+            /// Specify the target of the bind operation. target must be one of GL_ATOMIC_COUNTER_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER, or GL_SHADER_STORAGE_BUFFER.
+            /// </para>
+            /// </param>
+            /// <param name="index">
+            /// <para>
+            /// Specify the index of the binding point within the array specified by target.
+            /// </para>
+            /// </param>
+            /// <param name="buffer">
+            /// <para>
+            /// The name of a buffer object to bind to the specified binding point.
+            /// </para>
+            /// </param>
+            /// <param name="offset">
+            /// <para>
+            /// The starting offset in basic machine units into the buffer object buffer.
+            /// </para>
+            /// </param>
+            /// <param name="size">
+            /// <para>
+            /// The amount of data in machine units that can be read from the buffet object while used as an indexed target.
+            /// </para>
+            /// </param>
+            [Obsolete("Use BufferRangeTarget instead")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NV_transform_feedback", Version = "", EntryPoint = "glBindBufferRangeNV")]
+            public static 
+            void BindBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBindBufferRangeNV((OpenTK.Graphics.OpenGL.NvTransformFeedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size);
+                #if DEBUG
+                }
+                #endif
+            }
+
             /// <summary>[requires: NV_transform_feedback]
             /// Bind a range within a buffer object to an indexed buffer target
             /// </summary>
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index 7cf484cc..e796a6ee 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -359,13 +359,13 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void BlendEquation(OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationEXT", ExactSpelling = true)]
-            internal extern static void BlendEquationEXT(OpenTK.Graphics.OpenGL.ExtBlendMinmax mode);
+            internal extern static void BlendEquationEXT(OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationi", ExactSpelling = true)]
-            internal extern static void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 mode);
+            internal extern static void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationiARB", ExactSpelling = true)]
-            internal extern static void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend mode);
+            internal extern static void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationIndexedAMD", ExactSpelling = true)]
             internal extern static void BlendEquationIndexedAMD(UInt32 buf, OpenTK.Graphics.OpenGL.AmdDrawBuffersBlend mode);
@@ -389,7 +389,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void BlendFunc(OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactor, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFunci", ExactSpelling = true)]
-            internal extern static void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 src, OpenTK.Graphics.OpenGL.Version40 dst);
+            internal extern static void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc src, OpenTK.Graphics.OpenGL.Version40 dst);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFunciARB", ExactSpelling = true)]
             internal extern static void BlendFunciARB(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend src, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend dst);
@@ -398,13 +398,13 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void BlendFuncIndexedAMD(UInt32 buf, OpenTK.Graphics.OpenGL.AmdDrawBuffersBlend src, OpenTK.Graphics.OpenGL.AmdDrawBuffersBlend dst);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparate", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparate(OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactorRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactorAlpha);
+            internal extern static void BlendFuncSeparate(OpenTK.Graphics.OpenGL.Version14 sfactorRGB, OpenTK.Graphics.OpenGL.Version14 dfactorRGB, OpenTK.Graphics.OpenGL.Version14 sfactorAlpha, OpenTK.Graphics.OpenGL.Version14 dfactorAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparateEXT", ExactSpelling = true)]
             internal extern static void BlendFuncSeparateEXT(OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate sfactorRGB, OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate dfactorRGB, OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate sfactorAlpha, OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate dfactorAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparatei", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 srcRGB, OpenTK.Graphics.OpenGL.Version40 dstRGB, OpenTK.Graphics.OpenGL.Version40 srcAlpha, OpenTK.Graphics.OpenGL.Version40 dstAlpha);
+            internal extern static void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dstAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparateiARB", ExactSpelling = true)]
             internal extern static void BlendFuncSeparateiARB(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend srcRGB, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend dstRGB, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend srcAlpha, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend dstAlpha);
@@ -2249,10 +2249,10 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetIntegerv(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Int32* data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformati64v", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformati64v(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetInternalformati64v(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformativ", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInvariantBooleanvEXT", ExactSpelling = true)]
             internal extern static unsafe void GetInvariantBooleanvEXT(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data);
@@ -2645,7 +2645,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramiv", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramivARB", ExactSpelling = true)]
             internal extern static unsafe void GetProgramivARB(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params);
@@ -2756,7 +2756,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetRenderbufferParameterivEXT(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameterfv", ExactSpelling = true)]
-            internal extern static unsafe void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Single* @params);
+            internal extern static unsafe void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Single* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameterIiv", ExactSpelling = true)]
             internal extern static unsafe void GetSamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, [OutAttribute] Int32* @params);
@@ -2765,7 +2765,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetSamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, [OutAttribute] UInt32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSeparableFilter", ExactSpelling = true)]
             internal extern static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span);
@@ -4727,7 +4727,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void ProgramParameter4fvNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single* v);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteri", ExactSpelling = true)]
-            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value);
+            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteriARB", ExactSpelling = true)]
             internal extern static void ProgramParameteriARB(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value);
@@ -5444,22 +5444,22 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void SamplePatternSGIS(OpenTK.Graphics.OpenGL.SgisMultisample pattern);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterf", ExactSpelling = true)]
-            internal extern static void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single param);
+            internal extern static void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterfv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single* param);
+            internal extern static unsafe void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameteri", ExactSpelling = true)]
-            internal extern static void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32 param);
+            internal extern static void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32 param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterIiv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, Int32* param);
+            internal extern static unsafe void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterIuiv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, UInt32* param);
+            internal extern static unsafe void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, UInt32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32* param);
+            internal extern static unsafe void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glScaled", ExactSpelling = true)]
             internal extern static void Scaled(Double x, Double y, Double z);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index 3cf65dde..81042735 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -357,13 +357,13 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void BlendEquation(OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             internal static BlendEquation glBlendEquation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationEXT(OpenTK.Graphics.OpenGL.ExtBlendMinmax mode);
+            internal delegate void BlendEquationEXT(OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             internal static BlendEquationEXT glBlendEquationEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 mode);
+            internal delegate void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             internal static BlendEquationi glBlendEquationi;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend mode);
+            internal delegate void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL.BlendEquationMode mode);
             internal static BlendEquationiARB glBlendEquationiARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendEquationIndexedAMD(UInt32 buf, OpenTK.Graphics.OpenGL.AmdDrawBuffersBlend mode);
@@ -387,7 +387,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void BlendFunc(OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactor, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactor);
             internal static BlendFunc glBlendFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 src, OpenTK.Graphics.OpenGL.Version40 dst);
+            internal delegate void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc src, OpenTK.Graphics.OpenGL.Version40 dst);
             internal static BlendFunci glBlendFunci;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendFunciARB(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend src, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend dst);
@@ -396,13 +396,13 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void BlendFuncIndexedAMD(UInt32 buf, OpenTK.Graphics.OpenGL.AmdDrawBuffersBlend src, OpenTK.Graphics.OpenGL.AmdDrawBuffersBlend dst);
             internal static BlendFuncIndexedAMD glBlendFuncIndexedAMD;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparate(OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactorRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dfactorAlpha);
+            internal delegate void BlendFuncSeparate(OpenTK.Graphics.OpenGL.Version14 sfactorRGB, OpenTK.Graphics.OpenGL.Version14 dfactorRGB, OpenTK.Graphics.OpenGL.Version14 sfactorAlpha, OpenTK.Graphics.OpenGL.Version14 dfactorAlpha);
             internal static BlendFuncSeparate glBlendFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendFuncSeparateEXT(OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate sfactorRGB, OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate dfactorRGB, OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate sfactorAlpha, OpenTK.Graphics.OpenGL.ExtBlendFuncSeparate dfactorAlpha);
             internal static BlendFuncSeparateEXT glBlendFuncSeparateEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL.Version40 srcRGB, OpenTK.Graphics.OpenGL.Version40 dstRGB, OpenTK.Graphics.OpenGL.Version40 srcAlpha, OpenTK.Graphics.OpenGL.Version40 dstAlpha);
+            internal delegate void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL.BlendingFactorDest dstAlpha);
             internal static BlendFuncSeparatei glBlendFuncSeparatei;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendFuncSeparateiARB(UInt32 buf, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend srcRGB, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend dstRGB, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend srcAlpha, OpenTK.Graphics.OpenGL.ArbDrawBuffersBlend dstAlpha);
@@ -2247,10 +2247,10 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetIntegerv(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Int32* data);
             internal unsafe static GetIntegerv glGetIntegerv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformati64v(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetInternalformati64v(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
             internal unsafe static GetInternalformati64v glGetInternalformati64v;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             internal unsafe static GetInternalformativ glGetInternalformativ;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetInvariantBooleanvEXT(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data);
@@ -2643,7 +2643,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, OpenTK.Graphics.OpenGL.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramInterfaceiv glGetProgramInterfaceiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramiv glGetProgramiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramivARB(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params);
@@ -2754,7 +2754,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetRenderbufferParameterivEXT(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetRenderbufferParameterivEXT glGetRenderbufferParameterivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Single* @params);
+            internal unsafe delegate void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Single* @params);
             internal unsafe static GetSamplerParameterfv glGetSamplerParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetSamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, [OutAttribute] Int32* @params);
@@ -2763,7 +2763,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetSamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, [OutAttribute] UInt32* @params);
             internal unsafe static GetSamplerParameterIuiv glGetSamplerParameterIuiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetSamplerParameteriv glGetSamplerParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span);
@@ -4725,7 +4725,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void ProgramParameter4fvNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single* v);
             internal unsafe static ProgramParameter4fvNV glProgramParameter4fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterPName pname, Int32 value);
+            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameterName pname, Int32 value);
             internal static ProgramParameteri glProgramParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramParameteriARB(UInt32 program, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, Int32 value);
@@ -5442,22 +5442,22 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void SamplePatternSGIS(OpenTK.Graphics.OpenGL.SgisMultisample pattern);
             internal static SamplePatternSGIS glSamplePatternSGIS;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single param);
+            internal delegate void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single param);
             internal static SamplerParameterf glSamplerParameterf;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Single* param);
+            internal unsafe delegate void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Single* param);
             internal unsafe static SamplerParameterfv glSamplerParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32 param);
+            internal delegate void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32 param);
             internal static SamplerParameteri glSamplerParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, Int32* param);
+            internal unsafe delegate void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param);
             internal unsafe static SamplerParameterIiv glSamplerParameterIiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL.All pname, UInt32* param);
+            internal unsafe delegate void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, UInt32* param);
             internal unsafe static SamplerParameterIuiv glSamplerParameterIuiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameter pname, Int32* param);
+            internal unsafe delegate void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL.SamplerParameterName pname, Int32* param);
             internal unsafe static SamplerParameteriv glSamplerParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Scaled(Double x, Double y, Double z);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index 903eaf99..a6550ba7 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -57,7 +57,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetActiveAttrib
+    /// Used in GL.GetActiveAttrib, GL.GetTransformFeedbackVarying and 1 other function
     /// </summary>
     public enum ActiveAttribType : int
     {
@@ -736,7 +736,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.GetProgramEnvParameter, GL.Arb.GetProgramLocalParameter and 10 other functions
+    /// Used in GL.Arb.GetProgramEnvParameter, GL.Arb.GetProgramLocalParameter and 8 other functions
     /// </summary>
     public enum All : int
     {
@@ -20810,7 +20810,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.BlendEquation, GL.Arb.BlendEquationSeparate and 2 other functions
+    /// Used in GL.Arb.BlendEquation, GL.Arb.BlendEquationSeparate and 4 other functions
     /// </summary>
     public enum ArbDrawBuffersBlend : int
     {
@@ -24426,7 +24426,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.FenceSync, GL.GetSync
     /// </summary>
     public enum ArbSync : int
     {
@@ -27958,7 +27958,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.DrawElementsInstanced, GL.Begin and 14 other functions
+    /// Used in GL.Arb.DrawArraysInstanced, GL.Arb.DrawElementsInstanced and 17 other functions
     /// </summary>
     public enum BeginMode : int
     {
@@ -28032,7 +28032,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.BlendEquation, GL.BlendEquationSeparate
+    /// Used in GL.Arb.BlendEquation, GL.BlendEquation and 2 other functions
     /// </summary>
     public enum BlendEquationMode : int
     {
@@ -28131,6 +28131,18 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         OneMinusDstAlpha = ((int)0x0305)        ,
         /// <summary>
+        /// Original was GL_DST_COLOR = 0x0306
+        /// </summary>
+        DstColor = ((int)0x0306)        ,
+        /// <summary>
+        /// Original was GL_ONE_MINUS_DST_COLOR = 0x0307
+        /// </summary>
+        OneMinusDstColor = ((int)0x0307)        ,
+        /// <summary>
+        /// Original was GL_SRC_ALPHA_SATURATE = 0x0308
+        /// </summary>
+        SrcAlphaSaturate = ((int)0x0308)        ,
+        /// <summary>
         /// Original was GL_CONSTANT_COLOR = 0x8001
         /// </summary>
         ConstantColor = ((int)0x8001)        ,
@@ -28545,7 +28557,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Apple.BufferParameter, GL.Apple.FlushMappedBufferRange and 14 other functions
+    /// Used in GL.Apple.BufferParameter, GL.Apple.FlushMappedBufferRange and 20 other functions
     /// </summary>
     public enum BufferTarget : int
     {
@@ -30670,7 +30682,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Ext.BlendEquation
+    /// Not used directly.
     /// </summary>
     public enum ExtBlendMinmax : int
     {
@@ -38053,6 +38065,121 @@ namespace OpenTK.Graphics.OpenGL
         SecondaryColorArrayPointer = ((int)0x845D)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetProgram
+    /// </summary>
+    public enum GetProgramParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_SEPARABLE = 0x8258
+        /// </summary>
+        ProgramSeparable = ((int)0x8258)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F
+        /// </summary>
+        GeometryShaderInvocations = ((int)0x887F)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_VERTICES_OUT = 0x8916
+        /// </summary>
+        GeometryVerticesOut = ((int)0x8916)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_INPUT_TYPE = 0x8917
+        /// </summary>
+        GeometryInputType = ((int)0x8917)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_OUTPUT_TYPE = 0x8918
+        /// </summary>
+        GeometryOutputType = ((int)0x8918)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35
+        /// </summary>
+        ActiveUniformBlockMaxNameLength = ((int)0x8A35)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36
+        /// </summary>
+        ActiveUniformBlocks = ((int)0x8A36)        ,
+        /// <summary>
+        /// Original was GL_DELETE_STATUS = 0x8B80
+        /// </summary>
+        DeleteStatus = ((int)0x8B80)        ,
+        /// <summary>
+        /// Original was GL_LINK_STATUS = 0x8B82
+        /// </summary>
+        LinkStatus = ((int)0x8B82)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_ATTACHED_SHADERS = 0x8B85
+        /// </summary>
+        AttachedShaders = ((int)0x8B85)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
+        /// </summary>
+        ActiveUniforms = ((int)0x8B86)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
+        /// </summary>
+        ActiveUniformMaxLength = ((int)0x8B87)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
+        /// </summary>
+        ActiveAttributes = ((int)0x8B89)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
+        /// </summary>
+        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
+        /// </summary>
+        TransformFeedbackVaryingMaxLength = ((int)0x8C76)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
+        /// </summary>
+        TransformFeedbackBufferMode = ((int)0x8C7F)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83
+        /// </summary>
+        TransformFeedbackVaryings = ((int)0x8C83)        ,
+        /// <summary>
+        /// Original was GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75
+        /// </summary>
+        TessControlOutputVertices = ((int)0x8E75)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_MODE = 0x8E76
+        /// </summary>
+        TessGenMode = ((int)0x8E76)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_SPACING = 0x8E77
+        /// </summary>
+        TessGenSpacing = ((int)0x8E77)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_VERTEX_ORDER = 0x8E78
+        /// </summary>
+        TessGenVertexOrder = ((int)0x8E78)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_POINT_MODE = 0x8E79
+        /// </summary>
+        TessGenPointMode = ((int)0x8E79)        ,
+        /// <summary>
+        /// Original was GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF
+        /// </summary>
+        MaxComputeWorkGroupSize = ((int)0x91BF)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9
+        /// </summary>
+        ActiveAtomicCounterBuffers = ((int)0x92D9)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetQueryObject
     /// </summary>
@@ -47334,6 +47461,21 @@ namespace OpenTK.Graphics.OpenGL
     /// <summary>
     /// Used in GL.ProgramParameter
     /// </summary>
+    public enum ProgramParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_SEPARABLE = 0x8258
+        /// </summary>
+        ProgramSeparable = ((int)0x8258)        ,
+    }
+
+    /// <summary>
+    /// Not used directly.
+    /// </summary>
     public enum ProgramParameterPName : int
     {
         /// <summary>
@@ -48281,7 +48423,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetSamplerParameter, GL.SamplerParameter
+    /// Not used directly.
     /// </summary>
     public enum SamplerParameter : int
     {
@@ -48335,6 +48477,61 @@ namespace OpenTK.Graphics.OpenGL
         TextureCompareFunc = ((int)0x884D)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetSamplerParameter, GL.SamplerParameter and 1 other function
+    /// </summary>
+    public enum SamplerParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_TextureBorderColor = 0x1004
+        /// </summary>
+        TextureBorderColor = ((int)0x1004)        ,
+        /// <summary>
+        /// Original was GL_TextureMagFilter = 0x2800
+        /// </summary>
+        TextureMagFilter = ((int)0x2800)        ,
+        /// <summary>
+        /// Original was GL_TextureMinFilter = 0x2801
+        /// </summary>
+        TextureMinFilter = ((int)0x2801)        ,
+        /// <summary>
+        /// Original was GL_TextureWrapS = 0x2802
+        /// </summary>
+        TextureWrapS = ((int)0x2802)        ,
+        /// <summary>
+        /// Original was GL_TextureWrapT = 0x2803
+        /// </summary>
+        TextureWrapT = ((int)0x2803)        ,
+        /// <summary>
+        /// Original was GL_TextureWrapR = 0x8072
+        /// </summary>
+        TextureWrapR = ((int)0x8072)        ,
+        /// <summary>
+        /// Original was GL_TextureMinLod = 0x813A
+        /// </summary>
+        TextureMinLod = ((int)0x813A)        ,
+        /// <summary>
+        /// Original was GL_TextureMaxLod = 0x813B
+        /// </summary>
+        TextureMaxLod = ((int)0x813B)        ,
+        /// <summary>
+        /// Original was GL_TextureMaxAnisotropyExt = 0x84FE
+        /// </summary>
+        TextureMaxAnisotropyExt = ((int)0x84FE)        ,
+        /// <summary>
+        /// Original was GL_TextureLodBias = 0x8501
+        /// </summary>
+        TextureLodBias = ((int)0x8501)        ,
+        /// <summary>
+        /// Original was GL_TextureCompareMode = 0x884C
+        /// </summary>
+        TextureCompareMode = ((int)0x884C)        ,
+        /// <summary>
+        /// Original was GL_TextureCompareFunc = 0x884D
+        /// </summary>
+        TextureCompareFunc = ((int)0x884D)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetSeparableFilter, GL.SeparableFilter2D
     /// </summary>
@@ -49862,7 +50059,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.BindImageTexture, GL.TexBuffer and 6 other functions
+    /// Used in GL.BindImageTexture, GL.GetInternalformat and 7 other functions
     /// </summary>
     public enum SizedInternalFormat : int
     {
@@ -54670,7 +54867,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.BlendFuncSeparate
     /// </summary>
     public enum Version14 : int
     {
@@ -56648,7 +56845,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.GetInteger, GL.ProgramParameter
     /// </summary>
     public enum Version32 : int
     {
@@ -56982,7 +57179,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.BlendEquation, GL.BlendFunc and 1 other function
+    /// Used in GL.BlendFunc
     /// </summary>
     public enum Version40 : int
     {
diff --git a/Source/OpenTK/Graphics/OpenGL/GLHelper.cs b/Source/OpenTK/Graphics/OpenGL/GLHelper.cs
index e59732ee..49fdafeb 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLHelper.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLHelper.cs
@@ -1175,6 +1175,24 @@ namespace OpenTK.Graphics.OpenGL
             GetActiveUniforms(program, uniformCount, uniformIndices, (ActiveUniformParameter)pname, @params);
         }
 
+		[Obsolete("Use strongly-typed overload instead")]
+		void GetBufferParameteri64(Version32 target, Version32 pname, [OutAttribute] Int64[] @params)
+		{
+			GL.GetBufferParameter((BufferTarget)target, (BufferParameterName)pname, @params);
+		}
+
+		[Obsolete("Use strongly-typed overload instead")]
+		void GetBufferParameteri64(Version32 target, Version32 pname, out Int64 @params)
+		{
+			GL.GetBufferParameter((BufferTarget)target, (BufferParameterName)pname, out @params);
+		}
+
+		[Obsolete("Use strongly-typed overload instead")]
+		unsafe void GetBufferParameteri64(Version32 target, Version32 pname, [OutAttribute] Int64* @params)
+		{
+			GL.GetBufferParameter((BufferTarget)target, (BufferParameterName)pname, @params);
+		}
+
         public static partial class Arb
         {
             [AutoGenerated(Category = "ArbGeometryShader4", Version = "3.0", EntryPoint = "glProgramParameteriARB")]
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4.cs b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
index 2cebdee4..46535d49 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
@@ -55,13 +55,13 @@ namespace OpenTK.Graphics.OpenGL4
             /// </param>
             [AutoGenerated(Category = "ARB_draw_buffers_blend", Version = "", EntryPoint = "glBlendEquationiARB")]
             public static 
-            void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL4.All mode)
+            void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)mode);
+                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
@@ -83,13 +83,13 @@ namespace OpenTK.Graphics.OpenGL4
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ARB_draw_buffers_blend", Version = "", EntryPoint = "glBlendEquationiARB")]
             public static 
-            void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL4.All mode)
+            void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)mode);
+                Delegates.glBlendEquationiARB((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
@@ -7397,13 +7397,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendEquationi")]
         public static 
-        void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL4.All mode)
+        void BlendEquation(Int32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)mode);
+            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendEquationMode)mode);
             #if DEBUG
             }
             #endif
@@ -7425,13 +7425,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendEquationi")]
         public static 
-        void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL4.All mode)
+        void BlendEquation(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)mode);
+            Delegates.glBlendEquationi((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendEquationMode)mode);
             #if DEBUG
             }
             #endif
@@ -7586,13 +7586,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFunci")]
         public static 
-        void BlendFunc(Int32 buf, OpenTK.Graphics.OpenGL4.All src, OpenTK.Graphics.OpenGL4.All dst)
+        void BlendFunc(Int32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc src, OpenTK.Graphics.OpenGL4.All dst)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)src, (OpenTK.Graphics.OpenGL4.All)dst);
+            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)src, (OpenTK.Graphics.OpenGL4.All)dst);
             #if DEBUG
             }
             #endif
@@ -7619,13 +7619,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFunci")]
         public static 
-        void BlendFunc(UInt32 buf, OpenTK.Graphics.OpenGL4.All src, OpenTK.Graphics.OpenGL4.All dst)
+        void BlendFunc(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc src, OpenTK.Graphics.OpenGL4.All dst)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)src, (OpenTK.Graphics.OpenGL4.All)dst);
+            Delegates.glBlendFunci((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)src, (OpenTK.Graphics.OpenGL4.All)dst);
             #if DEBUG
             }
             #endif
@@ -7661,13 +7661,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "VERSION_1_4", Version = "1.4", EntryPoint = "glBlendFuncSeparate")]
         public static 
-        void BlendFuncSeparate(OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactorRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactorAlpha)
+        void BlendFuncSeparate(OpenTK.Graphics.OpenGL4.All sfactorRGB, OpenTK.Graphics.OpenGL4.All dfactorRGB, OpenTK.Graphics.OpenGL4.All sfactorAlpha, OpenTK.Graphics.OpenGL4.All dfactorAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparate((OpenTK.Graphics.OpenGL4.BlendingFactorSrc)sfactorRGB, (OpenTK.Graphics.OpenGL4.BlendingFactorDest)dfactorRGB, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)sfactorAlpha, (OpenTK.Graphics.OpenGL4.BlendingFactorDest)dfactorAlpha);
+            Delegates.glBlendFuncSeparate((OpenTK.Graphics.OpenGL4.All)sfactorRGB, (OpenTK.Graphics.OpenGL4.All)dfactorRGB, (OpenTK.Graphics.OpenGL4.All)sfactorAlpha, (OpenTK.Graphics.OpenGL4.All)dfactorAlpha);
             #if DEBUG
             }
             #endif
@@ -7703,13 +7703,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFuncSeparatei")]
         public static 
-        void BlendFuncSeparate(Int32 buf, OpenTK.Graphics.OpenGL4.All srcRGB, OpenTK.Graphics.OpenGL4.All dstRGB, OpenTK.Graphics.OpenGL4.All srcAlpha, OpenTK.Graphics.OpenGL4.All dstAlpha)
+        void BlendFuncSeparate(Int32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)srcRGB, (OpenTK.Graphics.OpenGL4.All)dstRGB, (OpenTK.Graphics.OpenGL4.All)srcAlpha, (OpenTK.Graphics.OpenGL4.All)dstAlpha);
+            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.OpenGL4.BlendingFactorDest)dstRGB, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.OpenGL4.BlendingFactorDest)dstAlpha);
             #if DEBUG
             }
             #endif
@@ -7746,13 +7746,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_4_0", Version = "4.0", EntryPoint = "glBlendFuncSeparatei")]
         public static 
-        void BlendFuncSeparate(UInt32 buf, OpenTK.Graphics.OpenGL4.All srcRGB, OpenTK.Graphics.OpenGL4.All dstRGB, OpenTK.Graphics.OpenGL4.All srcAlpha, OpenTK.Graphics.OpenGL4.All dstAlpha)
+        void BlendFuncSeparate(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL4.All)srcRGB, (OpenTK.Graphics.OpenGL4.All)dstRGB, (OpenTK.Graphics.OpenGL4.All)srcAlpha, (OpenTK.Graphics.OpenGL4.All)dstAlpha);
+            Delegates.glBlendFuncSeparatei((UInt32)buf, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.OpenGL4.BlendingFactorDest)dstRGB, (OpenTK.Graphics.OpenGL4.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.OpenGL4.BlendingFactorDest)dstAlpha);
             #if DEBUG
             }
             #endif
@@ -32610,7 +32610,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <summary>[requires: v4.3 and ARB_internalformat_query2|VERSION_4_3]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query2|VERSION_4_3", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64[] @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32620,7 +32620,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int64* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.All)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
+                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -32631,7 +32631,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <summary>[requires: v4.3 and ARB_internalformat_query2|VERSION_4_3]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query2|VERSION_4_3", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int64 @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int64 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32641,7 +32641,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int64* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.All)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
+                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -32654,13 +32654,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_internalformat_query2|VERSION_4_3", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.All)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params);
+            Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params);
             #if DEBUG
             }
             #endif
@@ -32696,7 +32696,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_internalformat_query|VERSION_4_2", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32706,7 +32706,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.All)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -32744,7 +32744,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_internalformat_query|VERSION_4_2", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32754,7 +32754,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.All)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -32794,13 +32794,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_internalformat_query|VERSION_4_2", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.All)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
+            Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL4.ImageTarget)target, (OpenTK.Graphics.OpenGL4.SizedInternalFormat)internalformat, (OpenTK.Graphics.OpenGL4.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -36215,7 +36215,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -36225,7 +36225,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -36253,7 +36253,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(Int32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -36263,7 +36263,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -36293,13 +36293,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -36326,7 +36326,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] Int32[] @params)
+        void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -36336,7 +36336,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.GetProgramParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -36365,7 +36365,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] out Int32 @params)
+        void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -36375,7 +36375,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.GetProgramParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -36405,13 +36405,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL4.GetProgramParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -38838,7 +38838,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Single[] @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -38848,7 +38848,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -38876,7 +38876,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] out Single @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -38886,7 +38886,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -38916,13 +38916,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Single* @params)
+        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)@params);
+            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -38949,7 +38949,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Single[] @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -38959,7 +38959,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -38988,7 +38988,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] out Single @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -38998,7 +38998,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -39028,13 +39028,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Single* @params)
+        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)@params);
+            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -39241,7 +39241,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Int32[] @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -39251,7 +39251,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -39279,7 +39279,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] out Int32 @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -39289,7 +39289,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -39319,13 +39319,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)@params);
+            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -39352,7 +39352,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Int32[] @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -39362,7 +39362,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -39391,7 +39391,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] out Int32 @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -39401,7 +39401,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -39431,13 +39431,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)@params);
+            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -49787,13 +49787,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_get_program_binary|VERSION_4_1", Version = "4.1", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL4.ProgramParameterPName pname, Int32 value)
+        void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL4.ProgramParameterName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameterPName)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameterName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -49820,13 +49820,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_get_program_binary|VERSION_4_1", Version = "4.1", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameterPName pname, Int32 value)
+        void ProgramParameter(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameterName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameterPName)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.OpenGL4.ProgramParameterName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -58144,13 +58144,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterf")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single)param);
+            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -58182,13 +58182,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterf")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single)param);
+            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -58219,7 +58219,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single[] param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58229,7 +58229,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Single* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)param_ptr);
+                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58263,13 +58263,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single* param)
+        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)param);
+            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)param);
             #if DEBUG
             }
             #endif
@@ -58301,7 +58301,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single[] param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58311,7 +58311,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Single* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)param_ptr);
+                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58345,13 +58345,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterfv")]
         public static 
-        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single* param)
+        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Single*)param);
+            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Single*)param);
             #if DEBUG
             }
             #endif
@@ -58382,13 +58382,13 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteri")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32 param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32)param);
+            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -58420,13 +58420,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteri")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32 param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32)param);
+            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -58435,7 +58435,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <summary>[requires: v3.3 and ARB_sampler_objects|VERSION_3_3]</summary>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL4.All pname, Int32[] param)
+        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58445,7 +58445,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58456,7 +58456,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <summary>[requires: v3.3 and ARB_sampler_objects|VERSION_3_3]</summary>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL4.All pname, ref Int32 param)
+        void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, ref Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58466,7 +58466,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* param_ptr = &param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58478,13 +58478,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        unsafe void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL4.All pname, Int32* param)
+        unsafe void SamplerParameterI(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (Int32*)param);
+            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -58494,7 +58494,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, Int32[] param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58504,7 +58504,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58516,7 +58516,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, ref Int32 param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, ref Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58526,7 +58526,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* param_ptr = &param)
                 {
-                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58538,13 +58538,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIiv")]
         public static 
-        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, Int32* param)
+        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (Int32*)param);
+            Delegates.glSamplerParameterIiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -58554,7 +58554,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIuiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, UInt32[] param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, UInt32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58564,7 +58564,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (UInt32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (UInt32*)param_ptr);
+                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (UInt32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58576,7 +58576,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIuiv")]
         public static 
-        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, ref UInt32 param)
+        void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, ref UInt32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58586,7 +58586,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (UInt32* param_ptr = &param)
                 {
-                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (UInt32*)param_ptr);
+                    Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (UInt32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58598,13 +58598,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameterIuiv")]
         public static 
-        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, UInt32* param)
+        unsafe void SamplerParameterI(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, UInt32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.All)pname, (UInt32*)param);
+            Delegates.glSamplerParameterIuiv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (UInt32*)param);
             #if DEBUG
             }
             #endif
@@ -58635,7 +58635,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32[] param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58645,7 +58645,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58679,13 +58679,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32* param)
+        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)param);
+            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -58717,7 +58717,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32[] param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58727,7 +58727,7 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -58761,13 +58761,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glSamplerParameteriv")]
         public static 
-        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32* param)
+        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameter)pname, (Int32*)param);
+            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.OpenGL4.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
index abc80df7..741f3972 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
@@ -131,10 +131,10 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static void BlendEquation(OpenTK.Graphics.OpenGL4.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationi", ExactSpelling = true)]
-            internal extern static void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL4.All mode);
+            internal extern static void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationiARB", ExactSpelling = true)]
-            internal extern static void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL4.All mode);
+            internal extern static void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationSeparate", ExactSpelling = true)]
             internal extern static void BlendEquationSeparate(OpenTK.Graphics.OpenGL4.BlendEquationMode modeRGB, OpenTK.Graphics.OpenGL4.BlendEquationMode modeAlpha);
@@ -149,16 +149,16 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static void BlendFunc(OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactor, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFunci", ExactSpelling = true)]
-            internal extern static void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL4.All src, OpenTK.Graphics.OpenGL4.All dst);
+            internal extern static void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc src, OpenTK.Graphics.OpenGL4.All dst);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFunciARB", ExactSpelling = true)]
             internal extern static void BlendFunciARB(UInt32 buf, OpenTK.Graphics.OpenGL4.All src, OpenTK.Graphics.OpenGL4.All dst);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparate", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparate(OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactorRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactorAlpha);
+            internal extern static void BlendFuncSeparate(OpenTK.Graphics.OpenGL4.All sfactorRGB, OpenTK.Graphics.OpenGL4.All dfactorRGB, OpenTK.Graphics.OpenGL4.All sfactorAlpha, OpenTK.Graphics.OpenGL4.All dfactorAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparatei", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL4.All srcRGB, OpenTK.Graphics.OpenGL4.All dstRGB, OpenTK.Graphics.OpenGL4.All srcAlpha, OpenTK.Graphics.OpenGL4.All dstAlpha);
+            internal extern static void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparateiARB", ExactSpelling = true)]
             internal extern static void BlendFuncSeparateiARB(UInt32 buf, OpenTK.Graphics.OpenGL4.All srcRGB, OpenTK.Graphics.OpenGL4.All dstRGB, OpenTK.Graphics.OpenGL4.All srcAlpha, OpenTK.Graphics.OpenGL4.All dstAlpha);
@@ -731,10 +731,10 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static unsafe void GetIntegerv(OpenTK.Graphics.OpenGL4.GetPName pname, [OutAttribute] Int32* data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformati64v", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformati64v(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetInternalformati64v(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformativ", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMinmax", ExactSpelling = true)]
             internal extern static void GetMinmax(OpenTK.Graphics.OpenGL4.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [OutAttribute] IntPtr values);
@@ -836,7 +836,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static unsafe void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, OpenTK.Graphics.OpenGL4.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramiv", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramPipelineInfoLog", ExactSpelling = true)]
             internal extern static unsafe void GetProgramPipelineInfoLog(UInt32 pipeline, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
@@ -884,7 +884,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static unsafe void GetRenderbufferParameteriv(OpenTK.Graphics.OpenGL4.RenderbufferTarget target, OpenTK.Graphics.OpenGL4.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameterfv", ExactSpelling = true)]
-            internal extern static unsafe void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Single* @params);
+            internal extern static unsafe void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Single* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameterIiv", ExactSpelling = true)]
             internal extern static unsafe void GetSamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, [OutAttribute] Int32* @params);
@@ -893,7 +893,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static unsafe void GetSamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, [OutAttribute] UInt32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSeparableFilter", ExactSpelling = true)]
             internal extern static void GetSeparableFilter(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span);
@@ -1232,7 +1232,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static void ProgramBinary(UInt32 program, OpenTK.Graphics.OpenGL4.BinaryFormat binaryFormat, IntPtr binary, Int32 length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteri", ExactSpelling = true)]
-            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameterPName pname, Int32 value);
+            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameterName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramUniform1d", ExactSpelling = true)]
             internal extern static void ProgramUniform1d(UInt32 program, Int32 location, Double v0);
@@ -1436,22 +1436,22 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static void SampleMaski(UInt32 index, UInt32 mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterf", ExactSpelling = true)]
-            internal extern static void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single param);
+            internal extern static void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterfv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single* param);
+            internal extern static unsafe void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameteri", ExactSpelling = true)]
-            internal extern static void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32 param);
+            internal extern static void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32 param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterIiv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, Int32* param);
+            internal extern static unsafe void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterIuiv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, UInt32* param);
+            internal extern static unsafe void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, UInt32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32* param);
+            internal extern static unsafe void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glScissor", ExactSpelling = true)]
             internal extern static void Scissor(Int32 x, Int32 y, Int32 width, Int32 height);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
index 1d61c8fd..39e94780 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
@@ -129,10 +129,10 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate void BlendEquation(OpenTK.Graphics.OpenGL4.BlendEquationMode mode);
             internal static BlendEquation glBlendEquation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL4.All mode);
+            internal delegate void BlendEquationi(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode);
             internal static BlendEquationi glBlendEquationi;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL4.All mode);
+            internal delegate void BlendEquationiARB(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendEquationMode mode);
             internal static BlendEquationiARB glBlendEquationiARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendEquationSeparate(OpenTK.Graphics.OpenGL4.BlendEquationMode modeRGB, OpenTK.Graphics.OpenGL4.BlendEquationMode modeAlpha);
@@ -147,16 +147,16 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate void BlendFunc(OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactor, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactor);
             internal static BlendFunc glBlendFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL4.All src, OpenTK.Graphics.OpenGL4.All dst);
+            internal delegate void BlendFunci(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc src, OpenTK.Graphics.OpenGL4.All dst);
             internal static BlendFunci glBlendFunci;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendFunciARB(UInt32 buf, OpenTK.Graphics.OpenGL4.All src, OpenTK.Graphics.OpenGL4.All dst);
             internal static BlendFunciARB glBlendFunciARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparate(OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactorRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dfactorAlpha);
+            internal delegate void BlendFuncSeparate(OpenTK.Graphics.OpenGL4.All sfactorRGB, OpenTK.Graphics.OpenGL4.All dfactorRGB, OpenTK.Graphics.OpenGL4.All sfactorAlpha, OpenTK.Graphics.OpenGL4.All dfactorAlpha);
             internal static BlendFuncSeparate glBlendFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL4.All srcRGB, OpenTK.Graphics.OpenGL4.All dstRGB, OpenTK.Graphics.OpenGL4.All srcAlpha, OpenTK.Graphics.OpenGL4.All dstAlpha);
+            internal delegate void BlendFuncSeparatei(UInt32 buf, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcRGB, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstRGB, OpenTK.Graphics.OpenGL4.BlendingFactorSrc srcAlpha, OpenTK.Graphics.OpenGL4.BlendingFactorDest dstAlpha);
             internal static BlendFuncSeparatei glBlendFuncSeparatei;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendFuncSeparateiARB(UInt32 buf, OpenTK.Graphics.OpenGL4.All srcRGB, OpenTK.Graphics.OpenGL4.All dstRGB, OpenTK.Graphics.OpenGL4.All srcAlpha, OpenTK.Graphics.OpenGL4.All dstAlpha);
@@ -729,10 +729,10 @@ namespace OpenTK.Graphics.OpenGL4
             internal unsafe delegate void GetIntegerv(OpenTK.Graphics.OpenGL4.GetPName pname, [OutAttribute] Int32* data);
             internal unsafe static GetIntegerv glGetIntegerv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformati64v(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetInternalformati64v(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
             internal unsafe static GetInternalformati64v glGetInternalformati64v;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.All internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.OpenGL4.ImageTarget target, OpenTK.Graphics.OpenGL4.SizedInternalFormat internalformat, OpenTK.Graphics.OpenGL4.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             internal unsafe static GetInternalformativ glGetInternalformativ;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void GetMinmax(OpenTK.Graphics.OpenGL4.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [OutAttribute] IntPtr values);
@@ -834,7 +834,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal unsafe delegate void GetProgramInterfaceiv(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, OpenTK.Graphics.OpenGL4.ProgramInterfaceParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramInterfaceiv glGetProgramInterfaceiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.OpenGL4.GetProgramParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramiv glGetProgramiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramPipelineInfoLog(UInt32 pipeline, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
@@ -882,7 +882,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal unsafe delegate void GetRenderbufferParameteriv(OpenTK.Graphics.OpenGL4.RenderbufferTarget target, OpenTK.Graphics.OpenGL4.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetRenderbufferParameteriv glGetRenderbufferParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Single* @params);
+            internal unsafe delegate void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Single* @params);
             internal unsafe static GetSamplerParameterfv glGetSamplerParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetSamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, [OutAttribute] Int32* @params);
@@ -891,7 +891,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal unsafe delegate void GetSamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, [OutAttribute] UInt32* @params);
             internal unsafe static GetSamplerParameterIuiv glGetSamplerParameterIuiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetSamplerParameteriv glGetSamplerParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void GetSeparableFilter(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span);
@@ -1230,7 +1230,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate void ProgramBinary(UInt32 program, OpenTK.Graphics.OpenGL4.BinaryFormat binaryFormat, IntPtr binary, Int32 length);
             internal static ProgramBinary glProgramBinary;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameterPName pname, Int32 value);
+            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramParameterName pname, Int32 value);
             internal static ProgramParameteri glProgramParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramUniform1d(UInt32 program, Int32 location, Double v0);
@@ -1434,22 +1434,22 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate void SampleMaski(UInt32 index, UInt32 mask);
             internal static SampleMaski glSampleMaski;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single param);
+            internal delegate void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single param);
             internal static SamplerParameterf glSamplerParameterf;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Single* param);
+            internal unsafe delegate void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Single* param);
             internal unsafe static SamplerParameterfv glSamplerParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32 param);
+            internal delegate void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32 param);
             internal static SamplerParameteri glSamplerParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, Int32* param);
+            internal unsafe delegate void SamplerParameterIiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param);
             internal unsafe static SamplerParameterIiv glSamplerParameterIiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.All pname, UInt32* param);
+            internal unsafe delegate void SamplerParameterIuiv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, UInt32* param);
             internal unsafe static SamplerParameterIuiv glSamplerParameterIuiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameter pname, Int32* param);
+            internal unsafe delegate void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.OpenGL4.SamplerParameterName pname, Int32* param);
             internal unsafe static SamplerParameteriv glSamplerParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Scissor(Int32 x, Int32 y, Int32 width, Int32 height);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
index 70b5d01b..b7634a1b 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
@@ -716,7 +716,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.Arb.BlendEquation, GL.Arb.BlendEquationSeparate and 40 other functions
+    /// Used in GL.Arb.BlendEquationSeparate, GL.Arb.BlendFunc and 36 other functions
     /// </summary>
     public enum All : int
     {
@@ -14516,7 +14516,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.BlendEquation, GL.BlendEquationSeparate
+    /// Used in GL.Arb.BlendEquation, GL.BlendEquation and 1 other function
     /// </summary>
     public enum BlendEquationMode : int
     {
@@ -14611,6 +14611,18 @@ namespace OpenTK.Graphics.OpenGL4
         /// </summary>
         OneMinusDstAlpha = ((int)0x0305)        ,
         /// <summary>
+        /// Original was GL_DST_COLOR = 0x0306
+        /// </summary>
+        DstColor = ((int)0x0306)        ,
+        /// <summary>
+        /// Original was GL_ONE_MINUS_DST_COLOR = 0x0307
+        /// </summary>
+        OneMinusDstColor = ((int)0x0307)        ,
+        /// <summary>
+        /// Original was GL_SRC_ALPHA_SATURATE = 0x0308
+        /// </summary>
+        SrcAlphaSaturate = ((int)0x0308)        ,
+        /// <summary>
         /// Original was GL_CONSTANT_COLOR = 0x8001
         /// </summary>
         ConstantColor = ((int)0x8001)        ,
@@ -19788,6 +19800,121 @@ namespace OpenTK.Graphics.OpenGL4
         SecondaryColorArrayPointer = ((int)0x845D)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetProgram
+    /// </summary>
+    public enum GetProgramParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_SEPARABLE = 0x8258
+        /// </summary>
+        ProgramSeparable = ((int)0x8258)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F
+        /// </summary>
+        GeometryShaderInvocations = ((int)0x887F)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_VERTICES_OUT = 0x8916
+        /// </summary>
+        GeometryVerticesOut = ((int)0x8916)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_INPUT_TYPE = 0x8917
+        /// </summary>
+        GeometryInputType = ((int)0x8917)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_OUTPUT_TYPE = 0x8918
+        /// </summary>
+        GeometryOutputType = ((int)0x8918)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35
+        /// </summary>
+        ActiveUniformBlockMaxNameLength = ((int)0x8A35)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36
+        /// </summary>
+        ActiveUniformBlocks = ((int)0x8A36)        ,
+        /// <summary>
+        /// Original was GL_DELETE_STATUS = 0x8B80
+        /// </summary>
+        DeleteStatus = ((int)0x8B80)        ,
+        /// <summary>
+        /// Original was GL_LINK_STATUS = 0x8B82
+        /// </summary>
+        LinkStatus = ((int)0x8B82)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_ATTACHED_SHADERS = 0x8B85
+        /// </summary>
+        AttachedShaders = ((int)0x8B85)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
+        /// </summary>
+        ActiveUniforms = ((int)0x8B86)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
+        /// </summary>
+        ActiveUniformMaxLength = ((int)0x8B87)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
+        /// </summary>
+        ActiveAttributes = ((int)0x8B89)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
+        /// </summary>
+        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
+        /// </summary>
+        TransformFeedbackVaryingMaxLength = ((int)0x8C76)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
+        /// </summary>
+        TransformFeedbackBufferMode = ((int)0x8C7F)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83
+        /// </summary>
+        TransformFeedbackVaryings = ((int)0x8C83)        ,
+        /// <summary>
+        /// Original was GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75
+        /// </summary>
+        TessControlOutputVertices = ((int)0x8E75)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_MODE = 0x8E76
+        /// </summary>
+        TessGenMode = ((int)0x8E76)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_SPACING = 0x8E77
+        /// </summary>
+        TessGenSpacing = ((int)0x8E77)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_VERTEX_ORDER = 0x8E78
+        /// </summary>
+        TessGenVertexOrder = ((int)0x8E78)        ,
+        /// <summary>
+        /// Original was GL_TESS_GEN_POINT_MODE = 0x8E79
+        /// </summary>
+        TessGenPointMode = ((int)0x8E79)        ,
+        /// <summary>
+        /// Original was GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF
+        /// </summary>
+        MaxComputeWorkGroupSize = ((int)0x91BF)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9
+        /// </summary>
+        ActiveAtomicCounterBuffers = ((int)0x92D9)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetQueryObject
     /// </summary>
@@ -24329,7 +24456,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.GetProgram
+    /// Not used directly.
     /// </summary>
     public enum ProgramParameter : int
     {
@@ -24446,6 +24573,21 @@ namespace OpenTK.Graphics.OpenGL4
     /// <summary>
     /// Used in GL.ProgramParameter
     /// </summary>
+    public enum ProgramParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_SEPARABLE = 0x8258
+        /// </summary>
+        ProgramSeparable = ((int)0x8258)        ,
+    }
+
+    /// <summary>
+    /// Not used directly.
+    /// </summary>
     public enum ProgramParameterPName : int
     {
         /// <summary>
@@ -25319,7 +25461,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.GetSamplerParameter, GL.SamplerParameter
+    /// Not used directly.
     /// </summary>
     public enum SamplerParameter : int
     {
@@ -25373,6 +25515,61 @@ namespace OpenTK.Graphics.OpenGL4
         TextureCompareFunc = ((int)0x884D)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetSamplerParameter, GL.SamplerParameter and 1 other function
+    /// </summary>
+    public enum SamplerParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_TextureBorderColor = 0x1004
+        /// </summary>
+        TextureBorderColor = ((int)0x1004)        ,
+        /// <summary>
+        /// Original was GL_TextureMagFilter = 0x2800
+        /// </summary>
+        TextureMagFilter = ((int)0x2800)        ,
+        /// <summary>
+        /// Original was GL_TextureMinFilter = 0x2801
+        /// </summary>
+        TextureMinFilter = ((int)0x2801)        ,
+        /// <summary>
+        /// Original was GL_TextureWrapS = 0x2802
+        /// </summary>
+        TextureWrapS = ((int)0x2802)        ,
+        /// <summary>
+        /// Original was GL_TextureWrapT = 0x2803
+        /// </summary>
+        TextureWrapT = ((int)0x2803)        ,
+        /// <summary>
+        /// Original was GL_TextureWrapR = 0x8072
+        /// </summary>
+        TextureWrapR = ((int)0x8072)        ,
+        /// <summary>
+        /// Original was GL_TextureMinLod = 0x813A
+        /// </summary>
+        TextureMinLod = ((int)0x813A)        ,
+        /// <summary>
+        /// Original was GL_TextureMaxLod = 0x813B
+        /// </summary>
+        TextureMaxLod = ((int)0x813B)        ,
+        /// <summary>
+        /// Original was GL_TextureMaxAnisotropyExt = 0x84FE
+        /// </summary>
+        TextureMaxAnisotropyExt = ((int)0x84FE)        ,
+        /// <summary>
+        /// Original was GL_TextureLodBias = 0x8501
+        /// </summary>
+        TextureLodBias = ((int)0x8501)        ,
+        /// <summary>
+        /// Original was GL_TextureCompareMode = 0x884C
+        /// </summary>
+        TextureCompareMode = ((int)0x884C)        ,
+        /// <summary>
+        /// Original was GL_TextureCompareFunc = 0x884D
+        /// </summary>
+        TextureCompareFunc = ((int)0x884D)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetSeparableFilter, GL.SeparableFilter2D
     /// </summary>
@@ -25551,7 +25748,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.BindImageTexture, GL.TexBuffer and 6 other functions
+    /// Used in GL.BindImageTexture, GL.GetInternalformat and 7 other functions
     /// </summary>
     public enum SizedInternalFormat : int
     {
diff --git a/Source/OpenTK/Graphics/OpenGL4/Helper.cs b/Source/OpenTK/Graphics/OpenGL4/Helper.cs
index 58925714..f37fcf76 100644
--- a/Source/OpenTK/Graphics/OpenGL4/Helper.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/Helper.cs
@@ -180,7 +180,7 @@ namespace OpenTK.Graphics.OpenGL4
         public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type)
         {
             int length;
-            GetProgram(program, OpenGL4.ProgramParameter.ActiveAttributeMaxLength, out length);
+			GetProgram(program, OpenGL4.GetProgramParameterName.ActiveAttributeMaxLength, out length);
             StringBuilder sb = new StringBuilder(length == 0 ? 1 : length * 2);
 
             GetActiveAttrib(program, index, sb.Capacity, out length, out size, out type, sb);
@@ -194,7 +194,7 @@ namespace OpenTK.Graphics.OpenGL4
         public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type)
         {
             int length;
-            GetProgram(program, OpenGL4.ProgramParameter.ActiveUniformMaxLength, out length);
+			GetProgram(program, OpenGL4.GetProgramParameterName.ActiveUniformMaxLength, out length);
 
             StringBuilder sb = new StringBuilder(length == 0 ? 1 : length);
             GetActiveUniform(program, uniformIndex, sb.Capacity, out length, out size, out type, sb);
@@ -266,7 +266,7 @@ namespace OpenTK.Graphics.OpenGL4
             unsafe
             {
                 int length;
-                GL.GetProgram(program, OpenGL4.ProgramParameter.InfoLogLength, out length); if (length == 0)
+				GL.GetProgram(program, OpenGL4.GetProgramParameterName.InfoLogLength, out length); if (length == 0)
                 {
                     info = String.Empty;
                     return;