diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index eff7aec3..145a16c0 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -11380,7 +11380,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenTransformFeedbacks")]
         public static 
-        UInt32 GenTransformFeedbacks()
+        UInt32 GenTransformFeedback()
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12282,10 +12282,32 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Query information about an active uniform block
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the name of a program containing the uniform block.
+                /// </para>
+                /// </param>
+                /// <param name="uniformBlockIndex">
+                /// <para>
+                /// Specifies the index of the uniform block within program.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the name of the parameter to query.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of a variable to receive the result of the query.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        Int32 GetActiveUniformBlockiv(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname)
+        Int32 GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12302,11 +12324,33 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Query information about an active uniform block
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the name of a program containing the uniform block.
+                /// </para>
+                /// </param>
+                /// <param name="uniformBlockIndex">
+                /// <para>
+                /// Specifies the index of the uniform block within program.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the name of the parameter to query.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of a variable to receive the result of the query.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        Int32 GetActiveUniformBlockiv(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname)
+        Int32 GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12760,6 +12804,108 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Returns information about several active uniform variables for the specified program object
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="uniformCount">
+                /// <para>
+                /// Specifies both the number of elements in the array of indices uniformIndices and the number of parameters written to params upon successful return.
+                /// </para>
+                /// </param>
+                /// <param name="uniformIndices">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers containing the indices of uniforms within program whose parameter pname should be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the property of each uniform in uniformIndices that should be written into the corresponding element of params.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers which are to receive the value of pname for each uniform in uniformIndices.
+                /// </para>
+                /// </param>
+        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
+        public static 
+        Int32 GetActiveUniforms(Int32 program, Int32 uniformCount, Int32[] uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* uniformIndices_ptr = uniformIndices)
+                {
+                    Int32 @params;
+                    Int32* @params_ptr = @params;
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname);
+                    return @params;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Returns information about several active uniform variables for the specified program object
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="uniformCount">
+                /// <para>
+                /// Specifies both the number of elements in the array of indices uniformIndices and the number of parameters written to params upon successful return.
+                /// </para>
+                /// </param>
+                /// <param name="uniformIndices">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers containing the indices of uniforms within program whose parameter pname should be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the property of each uniform in uniformIndices that should be written into the corresponding element of params.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers which are to receive the value of pname for each uniform in uniformIndices.
+                /// </para>
+                /// </param>
+        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
+        public static 
+        Int32 GetActiveUniforms(Int32 program, Int32 uniformCount, ref Int32 uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* uniformIndices_ptr = &uniformIndices)
+                {
+                    Int32 @params;
+                    Int32* @params_ptr = @params;
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname);
+                    return @params;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
                 /// <summary>[requires: v3.0 and ES_VERSION_3_0]
                 /// Returns information about several active uniform variables for the specified program object
                 /// </summary>
@@ -12791,7 +12937,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        unsafe Int32 GetActiveUniformsiv(Int32 program, Int32 uniformCount, Int32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
+        unsafe Int32 GetActiveUniforms(Int32 program, Int32 uniformCount, Int32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12838,7 +12984,111 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        unsafe Int32 GetActiveUniformsiv(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
+        Int32 GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32[] uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* uniformIndices_ptr = uniformIndices)
+                {
+                    Int32 @params;
+                    Int32* @params_ptr = @params;
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname);
+                    return @params;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Returns information about several active uniform variables for the specified program object
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="uniformCount">
+                /// <para>
+                /// Specifies both the number of elements in the array of indices uniformIndices and the number of parameters written to params upon successful return.
+                /// </para>
+                /// </param>
+                /// <param name="uniformIndices">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers containing the indices of uniforms within program whose parameter pname should be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the property of each uniform in uniformIndices that should be written into the corresponding element of params.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers which are to receive the value of pname for each uniform in uniformIndices.
+                /// </para>
+                /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
+        public static 
+        Int32 GetActiveUniforms(UInt32 program, Int32 uniformCount, ref UInt32 uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* uniformIndices_ptr = &uniformIndices)
+                {
+                    Int32 @params;
+                    Int32* @params_ptr = @params;
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname);
+                    return @params;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Returns information about several active uniform variables for the specified program object
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="uniformCount">
+                /// <para>
+                /// Specifies both the number of elements in the array of indices uniformIndices and the number of parameters written to params upon successful return.
+                /// </para>
+                /// </param>
+                /// <param name="uniformIndices">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers containing the indices of uniforms within program whose parameter pname should be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the property of each uniform in uniformIndices that should be written into the corresponding element of params.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of an array of uniformCount integers which are to receive the value of pname for each uniform in uniformIndices.
+                /// </para>
+                /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
+        public static 
+        unsafe Int32 GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13166,6 +13416,55 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
         public static 
+        UInt32 GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] out Int32 count)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* count_ptr = &count)
+                {
+                    UInt32 shaders;
+                    UInt32* shaders_ptr = shaders;
+                    Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count_ptr);
+                    retval = shaders;
+                    count = *count_ptr;
+                    return retval;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Returns the handles of the shader objects attached to a program object
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="maxCount">
+                /// <para>
+                /// Specifies the size of the array for storing the returned object names.
+                /// </para>
+                /// </param>
+                /// <param name="count">
+                /// <para>
+                /// Returns the number of names actually returned in shaders.
+                /// </para>
+                /// </param>
+                /// <param name="shaders">
+                /// <para>
+                /// Specifies an array that is used to return the names of attached shader objects.
+                /// </para>
+                /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        public static 
         unsafe UInt32 GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] Int32* count)
         {
             #if DEBUG
@@ -13208,6 +13507,55 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
         public static 
+        UInt32 GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] out Int32 count)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* count_ptr = &count)
+                {
+                    UInt32 shaders;
+                    UInt32* shaders_ptr = shaders;
+                    Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count_ptr);
+                    retval = shaders;
+                    count = *count_ptr;
+                    return retval;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Returns the handles of the shader objects attached to a program object
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="maxCount">
+                /// <para>
+                /// Specifies the size of the array for storing the returned object names.
+                /// </para>
+                /// </param>
+                /// <param name="count">
+                /// <para>
+                /// Returns the number of names actually returned in shaders.
+                /// </para>
+                /// </param>
+                /// <param name="shaders">
+                /// <para>
+                /// Specifies an array that is used to return the names of attached shader objects.
+                /// </para>
+                /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        public static 
         unsafe UInt32 GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] Int32* count)
         {
             #if DEBUG
@@ -13542,7 +13890,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetBooleanv")]
         public static 
-        bool GetBooleanv(OpenTK.Graphics.ES30.GetPName pname)
+        bool GetBoolean(OpenTK.Graphics.ES30.GetPName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13618,10 +13966,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Return parameters of a buffer object
+                /// </summary>
+                /// <param name="target">
+                /// <para>
+                /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ATOMIC_COUNTER_BUFFER, GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, GL_DRAW_INDIRECT_BUFFER, GL_DISPATCH_INDIRECT_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, GL_PIXEL_UNPACK_BUFFER, GL_QUERY_BUFFER, GL_SHADER_STORAGE_BUFFER, GL_TEXTURE_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, or GL_UNIFORM_BUFFER.
+                /// </para>
+                /// </param>
+                /// <param name="value">
+                /// <para>
+                /// Specifies the symbolic name of a buffer object parameter. Accepted values are GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, or GL_BUFFER_USAGE.
+                /// </para>
+                /// </param>
+                /// <param name="data">
+                /// <para>
+                /// Returns the requested parameter.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetBufferParameteri64v")]
         public static 
-        Int64 GetBufferParameteri64v(OpenTK.Graphics.ES30.BufferTarget target, OpenTK.Graphics.ES30.BufferParameterName pname)
+        Int64 GetBufferParameter(OpenTK.Graphics.ES30.BufferTarget target, OpenTK.Graphics.ES30.BufferParameterName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13768,43 +14133,6 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetBufferParameteriv")]
         public static 
-        Int32 GetBufferParameteriv(OpenTK.Graphics.ES30.BufferTarget target, OpenTK.Graphics.ES30.BufferParameterName pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetBufferParameteriv((OpenTK.Graphics.ES30.BufferTarget)target, (OpenTK.Graphics.ES30.BufferParameterName)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
-                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
-                /// Return parameters of a buffer object
-                /// </summary>
-                /// <param name="target">
-                /// <para>
-                /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-                /// </para>
-                /// </param>
-                /// <param name="value">
-                /// <para>
-                /// Specifies the symbolic name of a buffer object parameter. Accepted values are GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, or GL_BUFFER_USAGE.
-                /// </para>
-                /// </param>
-                /// <param name="data">
-                /// <para>
-                /// Returns the requested parameter.
-                /// </para>
-                /// </param>
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetBufferParameteriv")]
-        public static 
         void GetBufferParameter(OpenTK.Graphics.ES30.BufferTarget target, OpenTK.Graphics.ES30.BufferParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
@@ -14503,7 +14831,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetFloatv")]
         public static 
-        Single GetFloatv(OpenTK.Graphics.ES30.GetPName pname)
+        Single GetFloat(OpenTK.Graphics.ES30.GetPName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14634,10 +14962,32 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Retrieve information about attachments of a bound framebuffer object
+                /// </summary>
+                /// <param name="target">
+                /// <para>
+                /// Specifies the target of the query operation.
+                /// </para>
+                /// </param>
+                /// <param name="attachment">
+                /// <para>
+                /// Specifies the attachment within target
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the parameter of attachment to query.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of a variable receive the value of pname for attachment.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
-        Int32 GetFramebufferAttachmentParameteriv(OpenTK.Graphics.ES30.FramebufferTarget target, OpenTK.Graphics.ES30.FramebufferAttachment attachment, OpenTK.Graphics.ES30.FramebufferParameterName pname)
+        Int32 GetFramebufferAttachmentParameter(OpenTK.Graphics.ES30.FramebufferTarget target, OpenTK.Graphics.ES30.FramebufferAttachment attachment, OpenTK.Graphics.ES30.FramebufferParameterName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14782,7 +15132,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetInteger64i_v")]
         public static 
-        Int64 GetInteger64i_v(OpenTK.Graphics.ES30.GetIndexedPName target)
+        Int64 GetInteger(OpenTK.Graphics.ES30.GetIndexedPName target)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14923,7 +15273,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetInteger64v")]
         public static 
-        Int64 GetInteger64v(OpenTK.Graphics.ES30.GetPName pname)
+        Int64 GetInteger64(OpenTK.Graphics.ES30.GetPName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14999,27 +15349,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
-        public static 
-        Int32 GetIntegeri_v(OpenTK.Graphics.ES30.GetIndexedPName target)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 data;
-            UInt32 = 1;
-            Int32* data_ptr = data;
-            Delegates.glGetIntegeri_v((OpenTK.Graphics.ES30.GetIndexedPName)target);
-            return data;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
@@ -15143,7 +15472,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetIntegerv")]
         public static 
-        Int32 GetIntegerv(OpenTK.Graphics.ES30.GetPName pname)
+        Int32 GetInteger(OpenTK.Graphics.ES30.GetPName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15249,7 +15578,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetInternalformativ")]
         public static 
-        Int32 GetInternalformativ(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname)
+        Int32 GetInternalformat(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferInternalFormat internalformat, OpenTK.Graphics.ES30.InternalFormatParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17855,10 +18184,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_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>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        Int32 GetProgramiv(Int32 program, OpenTK.Graphics.ES30.ProgramParameter pname)
+        Int32 GetProgram(Int32 program, OpenTK.Graphics.ES30.ProgramParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17875,11 +18221,28 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_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 = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        Int32 GetProgramiv(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname)
+        Int32 GetProgram(UInt32 program, OpenTK.Graphics.ES30.ProgramParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18138,7 +18501,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetQueryiv")]
         public static 
-        Int32 GetQueryiv(OpenTK.Graphics.ES30.QueryTarget target, OpenTK.Graphics.ES30.GetQueryParam pname)
+        Int32 GetQuery(OpenTK.Graphics.ES30.QueryTarget target, OpenTK.Graphics.ES30.GetQueryParam pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18265,11 +18628,28 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Return parameters of a query object
+                /// </summary>
+                /// <param name="id">
+                /// <para>
+                /// Specifies the name of a query object.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// If a buffer is bound to the GL_QUERY_RESULT_BUFFER target, then params is treated as an offset to a location within that buffer's data store to receive the result of the query. If no buffer is bound to GL_QUERY_RESULT_BUFFER, then params is treated as an address in client memory of a variable to receive the resulting data.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetQueryObjectuiv")]
         public static 
-        UInt32 GetQueryObjectuiv(Int32 id, OpenTK.Graphics.ES30.GetQueryObjectParam pname)
+        UInt32 GetQueryObject(Int32 id, OpenTK.Graphics.ES30.GetQueryObjectParam pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18286,11 +18666,28 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Return parameters of a query object
+                /// </summary>
+                /// <param name="id">
+                /// <para>
+                /// Specifies the name of a query object.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// If a buffer is bound to the GL_QUERY_RESULT_BUFFER target, then params is treated as an offset to a location within that buffer's data store to receive the result of the query. If no buffer is bound to GL_QUERY_RESULT_BUFFER, then params is treated as an address in client memory of a variable to receive the resulting data.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetQueryObjectuiv")]
         public static 
-        UInt32 GetQueryObjectuiv(UInt32 id, OpenTK.Graphics.ES30.GetQueryObjectParam pname)
+        UInt32 GetQueryObject(UInt32 id, OpenTK.Graphics.ES30.GetQueryObjectParam pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18529,10 +18926,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Retrieve information about a bound renderbuffer object
+                /// </summary>
+                /// <param name="target">
+                /// <para>
+                /// Specifies the target of the query operation. target must be GL_RENDERBUFFER.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the parameter whose value to retrieve from the renderbuffer bound to target.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Specifies the address of an array to receive the value of the queried parameter.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetRenderbufferParameteriv")]
         public static 
-        Int32 GetRenderbufferParameteriv(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferParameterName pname)
+        Int32 GetRenderbufferParameter(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferParameterName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18659,10 +19073,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Return sampler parameter values
+                /// </summary>
+                /// <param name="sampler">
+                /// <para>
+                /// Specifies name of the sampler object from which to retrieve parameters.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of a sampler parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_LOD_BIAS, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_COMPARE_MODE, and GL_TEXTURE_COMPARE_FUNC are accepted.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the sampler parameters.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        Single GetSamplerParameterfv(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname)
+        Single GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18679,11 +19110,28 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Return sampler parameter values
+                /// </summary>
+                /// <param name="sampler">
+                /// <para>
+                /// Specifies name of the sampler object from which to retrieve parameters.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of a sampler parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_LOD_BIAS, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_COMPARE_MODE, and GL_TEXTURE_COMPARE_FUNC are accepted.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the sampler parameters.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        Single GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname)
+        Single GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18922,47 +19370,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
-        public static 
-        Int32 GetSamplerParameteriv(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
-        public static 
-        Int32 GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
                 /// <summary>[requires: v3.0 and ES_VERSION_3_0]
                 /// Return sampler parameter values
                 /// </summary>
@@ -19350,10 +19757,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Returns a parameter from a shader object
+                /// </summary>
+                /// <param name="shader">
+                /// <para>
+                /// Specifies the shader object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the object parameter. Accepted symbolic names are GL_SHADER_TYPE, GL_DELETE_STATUS, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the requested object parameter.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetShaderiv")]
         public static 
-        Int32 GetShaderiv(Int32 shader, OpenTK.Graphics.ES30.ShaderParameter pname)
+        Int32 GetShader(Int32 shader, OpenTK.Graphics.ES30.ShaderParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19370,11 +19794,28 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Returns a parameter from a shader object
+                /// </summary>
+                /// <param name="shader">
+                /// <para>
+                /// Specifies the shader object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the object parameter. Accepted symbolic names are GL_SHADER_TYPE, GL_DELETE_STATUS, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the requested object parameter.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetShaderiv")]
         public static 
-        Int32 GetShaderiv(UInt32 shader, OpenTK.Graphics.ES30.ShaderParameter pname)
+        Int32 GetShader(UInt32 shader, OpenTK.Graphics.ES30.ShaderParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19988,11 +20429,91 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// 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 = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSynciv")]
+        public static 
+        Int32 GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* length_ptr = &length)
+                {
+                    Int32 values;
+                    Int32* values_ptr = values;
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr);
+                    retval = values;
+                    length = *length_ptr;
+                    return retval;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// 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 = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSynciv")]
         public static 
-        unsafe Int32 GetSynciv(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length)
+        unsafe Int32 GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20152,10 +20673,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Return texture parameter values
+                /// </summary>
+                /// <param name="target">
+                /// <para>
+                /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D_ARRAY, GL_TEXTURE_3D, GL_TEXTURE_RECTANGLE, GL_TEXTURE_CUBE_MAP, and GL_TEXTURE_CUBE_MAP_ARRAY are accepted.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of a texture parameter. GL_DEPTH_STENCIL_TEXTURE_MODE, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_TEXTURE_IMMUTABLE_FORMAT, GL_TEXTURE_IMMUTABLE_LEVELS, GL_TEXTURE_LOD_BIAS, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_MAX_LOD, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_SWIZZLE_R, GL_TEXTURE_SWIZZLE_G, GL_TEXTURE_SWIZZLE_B, GL_TEXTURE_SWIZZLE_A, GL_TEXTURE_SWIZZLE_RGBA, GL_TEXTURE_VIEW_MIN_LAYER, GL_TEXTURE_VIEW_MIN_LEVEL, GL_TEXTURE_VIEW_NUM_LAYERS, GL_TEXTURE_VIEW_NUM_LEVELS, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, and GL_TEXTURE_WRAP_R are accepted.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the texture parameters.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameterfv")]
         public static 
-        Single GetTexParameterfv(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameterName pname)
+        Single GetTexParameter(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameterName pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20282,26 +20820,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameteriv")]
-        public static 
-        Int32 GetTexParameteriv(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameterName pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetTexParameteriv((OpenTK.Graphics.ES30.TextureTarget)target, (OpenTK.Graphics.ES30.GetTextureParameterName)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
                 /// <summary>[requires: v2.0 and ES_VERSION_2_0]
                 /// Return texture parameter values
                 /// </summary>
@@ -20700,49 +21218,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetUniformfv")]
-        public static 
-        Single GetUniformfv(Int32 program)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Single @params;
-            Int32 = 1;
-            Single* @params_ptr = @params;
-            Delegates.glGetUniformfv((UInt32)program);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetUniformfv")]
-        public static 
-        Single GetUniformfv(UInt32 program)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Single @params;
-            Int32 = 1;
-            Single* @params_ptr = @params;
-            Delegates.glGetUniformfv((UInt32)program);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
                 /// <summary>[requires: v2.0 and ES_VERSION_2_0]
                 /// Returns the value of a uniform variable
                 /// </summary>
@@ -21303,49 +21778,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetUniformiv")]
-        public static 
-        Int32 GetUniformiv(Int32 program)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32 = 1;
-            Int32* @params_ptr = @params;
-            Delegates.glGetUniformiv((UInt32)program);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetUniformiv")]
-        public static 
-        Int32 GetUniformiv(UInt32 program)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32 = 1;
-            Int32* @params_ptr = @params;
-            Delegates.glGetUniformiv((UInt32)program);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
                 /// <summary>[requires: v2.0 and ES_VERSION_2_0]
                 /// Returns the value of a uniform variable
                 /// </summary>
@@ -21623,11 +22055,28 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Returns the value of a uniform variable
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="location">
+                /// <para>
+                /// Specifies the location of the uniform variable to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the value of the specified uniform variable.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetUniformuiv")]
         public static 
-        UInt32 GetUniformuiv(Int32 program)
+        UInt32 GetUniform(Int32 program)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -21645,11 +22094,28 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
+                /// <summary>[requires: v3.0 and ES_VERSION_3_0]
+                /// Returns the value of a uniform variable
+                /// </summary>
+                /// <param name="program">
+                /// <para>
+                /// Specifies the program object to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="location">
+                /// <para>
+                /// Specifies the location of the uniform variable to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the value of the specified uniform variable.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetUniformuiv")]
         public static 
-        UInt32 GetUniformuiv(UInt32 program)
+        UInt32 GetUniform(UInt32 program)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -21779,10 +22245,27 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Return a generic vertex attribute parameter
+                /// </summary>
+                /// <param name="index">
+                /// <para>
+                /// Specifies the generic vertex attribute parameter to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, GL_VERTEX_ATTRIB_ARRAY_INTEGER, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, or GL_CURRENT_VERTEX_ATTRIB.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the requested data.
+                /// </para>
+                /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
         public static 
-        Single GetVertexAttribfv(Int32 index, OpenTK.Graphics.ES30.VertexAttribParameter pname)
+        Single GetVertexAttrib(Int32 index, OpenTK.Graphics.ES30.VertexAttribParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -21799,11 +22282,28 @@ namespace OpenTK.Graphics.ES30
         #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
+                /// <summary>[requires: v2.0 and ES_VERSION_2_0]
+                /// Return a generic vertex attribute parameter
+                /// </summary>
+                /// <param name="index">
+                /// <para>
+                /// Specifies the generic vertex attribute parameter to be queried.
+                /// </para>
+                /// </param>
+                /// <param name="pname">
+                /// <para>
+                /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, GL_VERTEX_ATTRIB_ARRAY_INTEGER, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, or GL_CURRENT_VERTEX_ATTRIB.
+                /// </para>
+                /// </param>
+                /// <param name="params">
+                /// <para>
+                /// Returns the requested data.
+                /// </para>
+                /// </param>
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
         public static 
-        Single GetVertexAttribfv(UInt32 index, OpenTK.Graphics.ES30.VertexAttribParameter pname)
+        Single GetVertexAttrib(UInt32 index, OpenTK.Graphics.ES30.VertexAttribParameter pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -22042,47 +22542,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
-        public static 
-        Int32 GetVertexAttribIiv(Int32 index, OpenTK.Graphics.ES30.All pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.ES30.All)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
-        /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
-        public static 
-        Int32 GetVertexAttribIiv(UInt32 index, OpenTK.Graphics.ES30.All pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.ES30.All)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
         public static 
@@ -22164,7 +22623,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetVertexAttribIuiv")]
         public static 
-        UInt32 GetVertexAttribIuiv(Int32 index, OpenTK.Graphics.ES30.All pname)
+        UInt32 GetVertexAttribI(Int32 index, OpenTK.Graphics.ES30.All pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -22185,7 +22644,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetVertexAttribIuiv")]
         public static 
-        UInt32 GetVertexAttribIuiv(UInt32 index, OpenTK.Graphics.ES30.All pname)
+        UInt32 GetVertexAttribI(UInt32 index, OpenTK.Graphics.ES30.All pname)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -22241,47 +22700,6 @@ namespace OpenTK.Graphics.ES30
             #endif
         }
 
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
-        public static 
-        Int32 GetVertexAttribiv(Int32 index, OpenTK.Graphics.ES30.VertexAttribParameter pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetVertexAttribiv((UInt32)index, (OpenTK.Graphics.ES30.VertexAttribParameter)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
-        /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
-        public static 
-        Int32 GetVertexAttribiv(UInt32 index, OpenTK.Graphics.ES30.VertexAttribParameter pname)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Int32 @params;
-            Int32* @params_ptr = @params;
-            Delegates.glGetVertexAttribiv((UInt32)index, (OpenTK.Graphics.ES30.VertexAttribParameter)pname);
-            return @params;
-        }
-        }
-        #if DEBUG
-        }
-        #endif
-        }
-
                 /// <summary>[requires: v2.0 and ES_VERSION_2_0]
                 /// Return a generic vertex attribute parameter
                 /// </summary>
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index 0fcf35b6..a433b859 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -148,7 +148,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetActiveUniformBlockiv, GL.GetActiveUniformBlock
+    /// Used in GL.GetActiveUniformBlock
     /// </summary>
     public enum ActiveUniformBlockParameter : int
     {
@@ -183,7 +183,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetActiveUniformsiv, GL.GetActiveUniforms
+    /// Used in GL.GetActiveUniforms
     /// </summary>
     public enum ActiveUniformParameter : int
     {
@@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 43 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 41 other functions
     /// </summary>
     public enum All : int
     {
@@ -9513,7 +9513,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetBufferParameteri64v, GL.GetBufferParameter and 1 other function
+    /// Used in GL.GetBufferParameter
     /// </summary>
     public enum BufferParameterName : int
     {
@@ -9578,7 +9578,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BindBuffer, GL.BufferData and 14 other functions
+    /// Used in GL.BindBuffer, GL.BufferData and 12 other functions
     /// </summary>
     public enum BufferTarget : int
     {
@@ -14601,7 +14601,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetFramebufferAttachmentParameteriv, GL.GetFramebufferAttachmentParameter and 2 other functions
+    /// Used in GL.GetFramebufferAttachmentParameter, GL.InvalidateFramebuffer and 1 other function
     /// </summary>
     public enum FramebufferAttachment : int
     {
@@ -14723,7 +14723,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetFramebufferAttachmentParameteriv, GL.GetFramebufferAttachmentParameter
+    /// Used in GL.GetFramebufferAttachmentParameter
     /// </summary>
     public enum FramebufferParameterName : int
     {
@@ -14865,7 +14865,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BindFramebuffer, GL.CheckFramebufferStatus and 7 other functions
+    /// Used in GL.BindFramebuffer, GL.CheckFramebufferStatus and 6 other functions
     /// </summary>
     public enum FramebufferTarget : int
     {
@@ -15024,7 +15024,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetInteger64i_v, GL.GetInteger and 2 other functions
+    /// Used in GL.GetInteger, GL.Ext.GetInteger
     /// </summary>
     public enum GetIndexedPName : int
     {
@@ -15152,7 +15152,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Apple.GetInteger64, GL.GetBooleanv and 7 other functions
+    /// Used in GL.Apple.GetInteger64, GL.GetBoolean and 3 other functions
     /// </summary>
     public enum GetPName : int
     {
@@ -17242,7 +17242,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetQueryObjectuiv, GL.GetQueryObject and 1 other function
+    /// Used in GL.GetQueryObject, GL.Ext.GetQueryObject
     /// </summary>
     public enum GetQueryObjectParam : int
     {
@@ -17265,7 +17265,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetQueryiv, GL.GetQuery and 1 other function
+    /// Used in GL.GetQuery, GL.Ext.GetQuery
     /// </summary>
     public enum GetQueryParam : int
     {
@@ -17507,7 +17507,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetTexParameterfv, GL.GetTexParameter and 1 other function
+    /// Used in GL.GetTexParameter
     /// </summary>
     public enum GetTextureParameterName : int
     {
@@ -18262,7 +18262,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetInternalformativ, GL.GetInternalformat
+    /// Used in GL.GetInternalformat
     /// </summary>
     public enum InternalFormatParameter : int
     {
@@ -22009,7 +22009,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetProgramiv, GL.GetProgram
+    /// Used in GL.GetProgram
     /// </summary>
     public enum ProgramParameter : int
     {
@@ -22394,7 +22394,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BeginQuery, GL.EndQuery and 5 other functions
+    /// Used in GL.BeginQuery, GL.EndQuery and 4 other functions
     /// </summary>
     public enum QueryTarget : int
     {
@@ -22548,7 +22548,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 7 other functions
+    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 6 other functions
     /// </summary>
     public enum RenderbufferInternalFormat : int
     {
@@ -22775,7 +22775,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetRenderbufferParameteriv, GL.GetRenderbufferParameter
+    /// Used in GL.GetRenderbufferParameter
     /// </summary>
     public enum RenderbufferParameterName : int
     {
@@ -22822,7 +22822,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 11 other functions
+    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 9 other functions
     /// </summary>
     public enum RenderbufferTarget : int
     {
@@ -22915,7 +22915,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetSamplerParameterfv, GL.GetSamplerParameter and 2 other functions
+    /// Used in GL.GetSamplerParameter, GL.SamplerParameter
     /// </summary>
     public enum SamplerParameterName : int
     {
@@ -22980,7 +22980,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetShaderiv, GL.GetShader
+    /// Used in GL.GetShader
     /// </summary>
     public enum ShaderParameter : int
     {
@@ -23763,7 +23763,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Apple.GetSync, GL.GetSynciv and 1 other function
+    /// Used in GL.Apple.GetSync, GL.GetSync
     /// </summary>
     public enum SyncParameterName : int
     {
@@ -24749,7 +24749,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BindTexture, GL.GenerateMipmap and 4 other functions
+    /// Used in GL.BindTexture, GL.GenerateMipmap and 2 other functions
     /// </summary>
     public enum TextureTarget : int
     {
@@ -25319,7 +25319,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.GetVertexAttribfv, GL.GetVertexAttrib and 1 other function
+    /// Used in GL.GetVertexAttrib
     /// </summary>
     public enum VertexAttribParameter : int
     {