diff --git a/Source/Bind/Structures/Function.cs b/Source/Bind/Structures/Function.cs
index 3f3b743d..6a0345f7 100644
--- a/Source/Bind/Structures/Function.cs
+++ b/Source/Bind/Structures/Function.cs
@@ -33,7 +33,7 @@ namespace Bind.Structures
         
         #endregion
 
-        static Regex endings = new Regex(@"((([df]|u?[isb])v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft);
+        static Regex endings = new Regex(@"((([df]|u?[isb])_?v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft);
         static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv|Tess|Status|Pixels|Instanced|Indexed)", RegexOptions.Compiled | RegexOptions.RightToLeft);
 
         // Add a trailing v to functions matching this regex. Used to differntiate between overloads taking both
diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs
index 73d98c09..1af79810 100644
--- a/Source/OpenTK/Graphics/GL/GL.cs
+++ b/Source/OpenTK/Graphics/GL/GL.cs
@@ -49716,7 +49716,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        void GetBooleani_(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool[] data)
+        void GetBoolean(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool[] data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49736,7 +49736,7 @@ namespace OpenTK.Graphics
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        void GetBooleani_(OpenTK.Graphics.Version30 target, Int32 index, [Out] bool[] data)
+        void GetBoolean(OpenTK.Graphics.Version30 target, Int32 index, [Out] bool[] data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49757,7 +49757,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        void GetBooleani_(OpenTK.Graphics.Version30 target, UInt32 index, [Out] out bool data)
+        void GetBoolean(OpenTK.Graphics.Version30 target, UInt32 index, [Out] out bool data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49778,7 +49778,7 @@ namespace OpenTK.Graphics
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        void GetBooleani_(OpenTK.Graphics.Version30 target, Int32 index, [Out] out bool data)
+        void GetBoolean(OpenTK.Graphics.Version30 target, Int32 index, [Out] out bool data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49800,7 +49800,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        unsafe void GetBooleani_(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool* data)
+        unsafe void GetBoolean(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49815,7 +49815,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        unsafe void GetBooleani_(OpenTK.Graphics.Version30 target, Int32 index, [Out] bool* data)
+        unsafe void GetBoolean(OpenTK.Graphics.Version30 target, Int32 index, [Out] bool* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49830,7 +49830,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        void GetIntegeri_(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32[] data)
+        void GetInteger(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32[] data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49850,7 +49850,7 @@ namespace OpenTK.Graphics
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        void GetIntegeri_(OpenTK.Graphics.Version30 target, Int32 index, [Out] Int32[] data)
+        void GetInteger(OpenTK.Graphics.Version30 target, Int32 index, [Out] Int32[] data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49871,7 +49871,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        void GetIntegeri_(OpenTK.Graphics.Version30 target, UInt32 index, [Out] out Int32 data)
+        void GetInteger(OpenTK.Graphics.Version30 target, UInt32 index, [Out] out Int32 data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49892,7 +49892,7 @@ namespace OpenTK.Graphics
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        void GetIntegeri_(OpenTK.Graphics.Version30 target, Int32 index, [Out] out Int32 data)
+        void GetInteger(OpenTK.Graphics.Version30 target, Int32 index, [Out] out Int32 data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49914,7 +49914,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        unsafe void GetIntegeri_(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32* data)
+        unsafe void GetInteger(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49929,7 +49929,7 @@ namespace OpenTK.Graphics
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        unsafe void GetIntegeri_(OpenTK.Graphics.Version30 target, Int32 index, [Out] Int32* data)
+        unsafe void GetInteger(OpenTK.Graphics.Version30 target, Int32 index, [Out] Int32* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))