diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 32c7812b..29468a3e 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -1614,7 +1614,7 @@
     
     <function name="GetSynciv" extension="Core">
       <param name="pname">
-          <type>SyncParameter</type>
+          <type>SyncParameterName</type>
         </param>
     </function>
     
@@ -3680,7 +3680,7 @@
       <use enum="VERSION_3_2" token="CONDITION_SATISFIED" />
       <use enum="VERSION_3_2" token="WAIT_FAILED" />
     </enum>
-    <enum name="SyncParameter">
+    <enum name="SyncParameterName">
       <use enum="VERSION_3_2" token="OBJECT_TYPE" />
       <use enum="VERSION_3_2" token="SYNC_STATUS" />
       <use enum="VERSION_3_2" token="SYNC_CONDITION" />
@@ -5315,14 +5315,19 @@
       <param name="condition"><type>SyncCondition</type></param>
       <param name="flags"><type>WaitSyncFlags</type></param>
     </function>
-    <function name="ClientWaitSync" extension="Core">
+    <function name="ClientWaitSync">
       <returns>WaitSyncStatus</returns>
       <param name="flags"><type>ClientWaitSyncFlags</type></param>
     </function>
-    <function name="WaitSync" extension="Core">
+    <function name="WaitSync">
       <param name="flags"><type>WaitSyncFlags</type></param>
     </function>
     
+    <!-- Sync Object Queries [6.1.8] -->
+    <function name="GetSync">
+      <param name="pname"><type>SyncParameterName</type></param>
+    </function>
+    
    </replace>
   
   <add name="gles2" version="3.0">
@@ -5574,6 +5579,15 @@
       <use token="TEXTURE_IMMUTABLE_FORMAT" />
       <use token="TEXTURE_IMMUTABLE_LEVELS" />
     </enum>
+    <enum name="HintMode">
+      <use token="FASTEST" />
+      <use token="NICEST" />
+      <use token="DONT_CARE" />
+    </enum>
+    <enum name="HintTarget">
+      <use token="GENERATE_MIPMAP_HINT" />
+      <use token="FRAGMENT_SHADER_DERIVATIVE_HINT" />
+    </enum>
     <enum name="PixelFormat">
       <use token="ALPHA" />
       <use token="RGBA" />
@@ -5763,6 +5777,12 @@
     <enum name="SyncCondition">
       <use token="SYNC_GPU_COMMANDS_COMPLETE" />
     </enum>
+    <enum name="SyncParameterName">
+      <use token="OBJECT_TYPE" />
+      <use token="SYNC_STATUS" />
+      <use token="SYNC_CONDITION" />
+      <use token="SYNC_FLAGS" />
+    </enum>
     <enum name="TextureComponentCount">
       <reuse enum="SizedInternalFormat" />
       <use token="RGB" />
diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index 64e9bbb6..454589f6 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -1814,13 +1814,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glClientWaitSyncAPPLE")]
             public static 
-            OpenTK.Graphics.ES30.All ClientWaitSync(IntPtr sync, Int32 flags, Int64 timeout)
+            OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, Int64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.ClientWaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -1848,13 +1848,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glClientWaitSyncAPPLE")]
             public static 
-            OpenTK.Graphics.ES30.All ClientWaitSync(IntPtr sync, UInt32 flags, UInt64 timeout)
+            OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.ClientWaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -2032,7 +2032,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetSyncivAPPLE")]
             public static 
-            void GetSync(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] values)
+            void GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] values)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2043,7 +2043,7 @@ namespace OpenTK.Graphics.ES30
                     fixed (Int32* length_ptr = length)
                     fixed (Int32* values_ptr = values)
                     {
-                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.All)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     }
                 }
                 #if DEBUG
@@ -2082,7 +2082,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetSyncivAPPLE")]
             public static 
-            void GetSync(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+            void GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2093,7 +2093,7 @@ namespace OpenTK.Graphics.ES30
                     fixed (Int32* length_ptr = &length)
                     fixed (Int32* values_ptr = &values)
                     {
-                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.All)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                         length = *length_ptr;
                         values = *values_ptr;
                     }
@@ -2135,13 +2135,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetSyncivAPPLE")]
             public static 
-            unsafe void GetSync(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+            unsafe void GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.All)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+                Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
                 #if DEBUG
                 }
                 #endif
@@ -2249,13 +2249,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glWaitSyncAPPLE")]
             public static 
-            void WaitSync(IntPtr sync, Int32 flags, Int64 timeout)
+            void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, Int64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                Delegates.glWaitSyncAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.WaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -2283,13 +2283,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glWaitSyncAPPLE")]
             public static 
-            void WaitSync(IntPtr sync, UInt32 flags, UInt64 timeout)
+            void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                Delegates.glWaitSyncAPPLE((IntPtr)sync, (OpenTK.Graphics.ES30.WaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -19443,7 +19443,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19454,7 +19454,7 @@ namespace OpenTK.Graphics.ES30
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* values_ptr = values)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.All)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     length = *length_ptr;
                 }
             }
@@ -19494,7 +19494,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19505,7 +19505,7 @@ namespace OpenTK.Graphics.ES30
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* values_ptr = &values)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.All)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     length = *length_ptr;
                     values = *values_ptr;
                 }
@@ -19547,13 +19547,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSynciv")]
         public static 
-        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.All)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.ES30.SyncParameterName)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
index 52c88c85..42eaedc7 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
@@ -171,7 +171,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout);
             internal static ClientWaitSync glClientWaitSync;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate OpenTK.Graphics.ES30.All ClientWaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal delegate OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSyncAPPLE(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout);
             internal static ClientWaitSyncAPPLE glClientWaitSyncAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ColorMask(bool red, bool green, bool blue, bool alpha);
@@ -726,10 +726,10 @@ namespace OpenTK.Graphics.ES30
             internal delegate IntPtr GetStringi(OpenTK.Graphics.ES30.StringName name, UInt32 index);
             internal static GetStringi glGetStringi;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSynciv(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal unsafe delegate void GetSynciv(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             internal unsafe static GetSynciv glGetSynciv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSyncivAPPLE(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal unsafe delegate void GetSyncivAPPLE(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             internal unsafe static GetSyncivAPPLE glGetSyncivAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTexParameterfv(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameterName pname, [OutAttribute] Single* @params);
@@ -1374,7 +1374,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout);
             internal static WaitSync glWaitSync;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void WaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal delegate void WaitSyncAPPLE(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout);
             internal static WaitSyncAPPLE glWaitSyncAPPLE;
         }
     }
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index 154c9405..f544d464 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 74 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 72 other functions
     /// </summary>
     public enum All : int
     {
@@ -9749,7 +9749,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.ClientWaitSync
+    /// Used in GL.Apple.ClientWaitSync, GL.ClientWaitSync
     /// </summary>
     public enum ClientWaitSyncFlags : int
     {
@@ -22546,6 +22546,29 @@ namespace OpenTK.Graphics.ES30
         SyncGpuCommandsComplete = ((int)0x9117)        ,
     }
 
+    /// <summary>
+    /// Used in GL.Apple.GetSync, GL.GetSync
+    /// </summary>
+    public enum SyncParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_OBJECT_TYPE = 0x9112
+        /// </summary>
+        ObjectType = ((int)0x9112)        ,
+        /// <summary>
+        /// Original was GL_SYNC_CONDITION = 0x9113
+        /// </summary>
+        SyncCondition = ((int)0x9113)        ,
+        /// <summary>
+        /// Original was GL_SYNC_STATUS = 0x9114
+        /// </summary>
+        SyncStatus = ((int)0x9114)        ,
+        /// <summary>
+        /// Original was GL_SYNC_FLAGS = 0x9115
+        /// </summary>
+        SyncFlags = ((int)0x9115)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -24199,7 +24222,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Apple.FenceSync, GL.FenceSync and 1 other function
+    /// Used in GL.Apple.FenceSync, GL.Apple.WaitSync and 2 other functions
     /// </summary>
     public enum WaitSyncFlags : int
     {
diff --git a/Source/OpenTK/Graphics/ES30/ES3Core.cs b/Source/OpenTK/Graphics/ES30/ES3Core.cs
index 7ac3b77f..65272126 100644
--- a/Source/OpenTK/Graphics/ES30/ES3Core.cs
+++ b/Source/OpenTK/Graphics/ES30/ES3Core.cs
@@ -173,7 +173,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClientWaitSyncAPPLE", ExactSpelling = true)]
-            internal extern static OpenTK.Graphics.ES30.All ClientWaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal extern static OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSyncAPPLE(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glColorMask", ExactSpelling = true)]
             internal extern static void ColorMask(bool red, bool green, bool blue, bool alpha);
@@ -728,10 +728,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static IntPtr GetStringi(OpenTK.Graphics.ES30.StringName name, UInt32 index);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSynciv", ExactSpelling = true)]
-            internal extern static unsafe void GetSynciv(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal extern static unsafe void GetSynciv(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSyncivAPPLE", ExactSpelling = true)]
-            internal extern static unsafe void GetSyncivAPPLE(IntPtr sync, OpenTK.Graphics.ES30.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal extern static unsafe void GetSyncivAPPLE(IntPtr sync, OpenTK.Graphics.ES30.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTexParameterfv", ExactSpelling = true)]
             internal extern static unsafe void GetTexParameterfv(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameterName pname, [OutAttribute] Single* @params);
@@ -1376,7 +1376,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glWaitSyncAPPLE", ExactSpelling = true)]
-            internal extern static void WaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal extern static void WaitSyncAPPLE(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout);
         }
     }
 }
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 28ac8f04..d4dfb5f9 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -81656,7 +81656,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameter pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -81667,7 +81667,7 @@ namespace OpenTK.Graphics.OpenGL
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* values_ptr = values)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameter)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     length = *length_ptr;
                 }
             }
@@ -81707,7 +81707,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameter pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -81718,7 +81718,7 @@ namespace OpenTK.Graphics.OpenGL
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* values_ptr = &values)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameter)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     length = *length_ptr;
                     values = *values_ptr;
                 }
@@ -81760,13 +81760,13 @@ namespace OpenTK.Graphics.OpenGL
         [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.SyncParameter pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameter)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.SyncParameterName)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index 2d8feb61..d55317e2 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -2840,7 +2840,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static Int32 GetSubroutineUniformLocation(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, String name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSynciv", ExactSpelling = true)]
-            internal extern static unsafe void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameter pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal extern static unsafe void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTexBumpParameterfvATI", ExactSpelling = true)]
             internal extern static unsafe void GetTexBumpParameterfvATI(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Single* param);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index 0637b89c..3ba4385e 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -2838,7 +2838,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate Int32 GetSubroutineUniformLocation(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, String name);
             internal static GetSubroutineUniformLocation glGetSubroutineUniformLocation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameter pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal unsafe delegate void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             internal unsafe static GetSynciv glGetSynciv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTexBumpParameterfvATI(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Single* param);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index 12a6c41e..ff10aef7 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -50290,7 +50290,7 @@ namespace OpenTK.Graphics.OpenGL
     /// <summary>
     /// Used in GL.GetSync
     /// </summary>
-    public enum SyncParameter : int
+    public enum SyncParameterName : int
     {
         /// <summary>
         /// Original was GL_OBJECT_TYPE = 0x9112
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4.cs b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
index 4b7a0ca0..e8fc9621 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
@@ -40478,7 +40478,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameter pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] Int32[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -40489,7 +40489,7 @@ namespace OpenTK.Graphics.OpenGL4
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* values_ptr = values)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL4.SyncParameter)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL4.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     length = *length_ptr;
                 }
             }
@@ -40529,7 +40529,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameter pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -40540,7 +40540,7 @@ namespace OpenTK.Graphics.OpenGL4
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* values_ptr = &values)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL4.SyncParameter)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL4.SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     length = *length_ptr;
                     values = *values_ptr;
                 }
@@ -40582,13 +40582,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glGetSynciv")]
         public static 
-        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameter pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL4.SyncParameter)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL4.SyncParameterName)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
index fe8e13e1..2b3f75bf 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
@@ -923,7 +923,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static Int32 GetSubroutineUniformLocation(UInt32 program, OpenTK.Graphics.OpenGL4.ShaderType shadertype, String name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSynciv", ExactSpelling = true)]
-            internal extern static unsafe void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameter pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal extern static unsafe void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTexImage", ExactSpelling = true)]
             internal extern static void GetTexImage(OpenTK.Graphics.OpenGL4.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [OutAttribute] IntPtr pixels);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
index c958240e..862ee701 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
@@ -921,7 +921,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate Int32 GetSubroutineUniformLocation(UInt32 program, OpenTK.Graphics.OpenGL4.ShaderType shadertype, String name);
             internal static GetSubroutineUniformLocation glGetSubroutineUniformLocation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameter pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal unsafe delegate void GetSynciv(IntPtr sync, OpenTK.Graphics.OpenGL4.SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             internal unsafe static GetSynciv glGetSynciv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void GetTexImage(OpenTK.Graphics.OpenGL4.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [OutAttribute] IntPtr pixels);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
index 4a1a8110..6dfd0817 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
@@ -25830,7 +25830,7 @@ namespace OpenTK.Graphics.OpenGL4
     /// <summary>
     /// Used in GL.GetSync
     /// </summary>
-    public enum SyncParameter : int
+    public enum SyncParameterName : int
     {
         /// <summary>
         /// Original was GL_OBJECT_TYPE = 0x9112