diff --git a/xml/gl.xml b/xml/gl.xml
index c36a908..963a904 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -98,7 +98,7 @@
         </group>
 
         <group name="ProgramTarget">
-            <enum name="GL_TEXT_FRAGMENT_SHADER"/>
+            <enum name="GL_TEXT_FRAGMENT_SHADER_ATI"/>
         </group>
 
         <group name="CombinerStageNV">
@@ -113,13 +113,13 @@
         </group>
 
         <group name="CombinerPortionNV">
-            <enum name="GL_RGB_NV"/>
-            <enum name="GL_ALPHA_NV"/>
+            <enum name="GL_RGB"/>
+            <enum name="GL_ALPHA"/>
         </group>
 
         <group name="MapTypeNV">
-            <enum name="GL_FLOAT_NV"/>
-            <enum name="GL_DOUBLE_NV"/>
+            <enum name="GL_FLOAT"/>
+            <enum name="GL_DOUBLE"/>
         </group>
 
         <group name="ScalarType">
@@ -134,11 +134,11 @@
         </group>
 
         <group name="ProgramStringProperty">
-            <enum name="GL_PROGRAM_STRING"/>
+            <enum name="GL_PROGRAM_STRING_ARB"/>
         </group>
 
         <group name="ProgramFormat">
-            <enum name="GL_PROGRAM_FORMAT_ASCII"/>
+            <enum name="GL_PROGRAM_FORMAT_ASCII_ARB"/>
         </group>
 
         <group name="PathColorFormat">
@@ -152,16 +152,16 @@
         </group>
 
         <group name="ReplacementCodeTypeSUN">
-            <enum name="GL_UNSIGNED_BYTE_SUN"/>
-            <enum name="GL_UNSIGNED_SHORT_SUN"/>
-            <enum name="GL_UNSIGNED_INT_SUN"/>
+            <enum name="GL_UNSIGNED_BYTE"/>
+            <enum name="GL_UNSIGNED_SHORT"/>
+            <enum name="GL_UNSIGNED_INT"/>
         </group>
 
         <group name="SecondaryColorPointerTypeIBM">
-            <enum name="GL_SHORT_IBM"/>
-            <enum name="GL_INT_IBM"/>
-            <enum name="GL_FLOAT_IBM"/>
-            <enum name="GL_DOUBLE_IBM"/>
+            <enum name="GL_SHORT"/>
+            <enum name="GL_INT"/>
+            <enum name="GL_FLOAT"/>
+            <enum name="GL_DOUBLE"/>
         </group>
 
         <group name="FragmentLightNameSGIX">
@@ -176,7 +176,7 @@
         </group>
 
         <group name="FragmentLightParameterSGIX">
-            <enum name="GL_SPOT_EXPONENT_SGIX"/>
+            <!--<enum name="GL_SPOT_EXPONENT_SGIX"/>
             <enum name="GL_SPOT_CUTOFF_SGIX"/>
             <enum name="GL_CONSTANT_ATTENUATION_SGIX"/>
             <enum name="GL_LINEAR_ATTENUATION_SGIX"/>
@@ -190,30 +190,45 @@
             <enum name="GL_SPOT_CUTOFF_SGIX"/>
             <enum name="GL_CONSTANT_ATTENUATION_SGIX"/>
             <enum name="GL_LINEAR_ATTENUATION_SGIX"/>
-            <enum name="GL_QUADRATIC_ATTENUATION_SGIX"/>
+            <enum name="GL_QUADRATIC_ATTENUATION_SGIX"/>-->
+            <enum name="GL_SPOT_EXPONENT"/>
+            <enum name="GL_SPOT_CUTOFF"/>
+            <enum name="GL_CONSTANT_ATTENUATION"/>
+            <enum name="GL_LINEAR_ATTENUATION"/>
+            <enum name="GL_QUADRATIC_ATTENUATION"/>
+            <enum name="GL_AMBIENT"/>
+            <enum name="GL_DIFFUSE"/>
+            <enum name="GL_SPECULAR"/>
+            <enum name="GL_POSITION"/>
+            <enum name="GL_SPOT_DIRECTION"/>
+            <enum name="GL_SPOT_EXPONENT"/>
+            <enum name="GL_SPOT_CUTOFF"/>
+            <enum name="GL_CONSTANT_ATTENUATION"/>
+            <enum name="GL_LINEAR_ATTENUATION"/>
+            <enum name="GL_QUADRATIC_ATTENUATION"/>
         </group>
 
         <group name="ElementPointerTypeATI">
-            <enum name="GL_UNSIGNED_BYTE_ATI"/>
-            <enum name="GL_UNSIGNED_SHORT_ATI"/>
-            <enum name="GL_UNSIGNED_INT_ATI"/>
+            <enum name="GL_UNSIGNED_BYTE"/>
+            <enum name="GL_UNSIGNED_SHORT"/>
+            <enum name="GL_UNSIGNED_INT"/>
         </group>
 
         <group name="MatrixIndexPointerTypeARB">
-            <enum name="GL_UNSIGNED_BYTE_ARB"/>
-            <enum name="GL_UNSIGNED_SHORT_ARB"/>
-            <enum name="GL_UNSIGNED_INT_ARB"/>
+            <enum name="GL_UNSIGNED_BYTE"/>
+            <enum name="GL_UNSIGNED_SHORT"/>
+            <enum name="GL_UNSIGNED_INT"/>
         </group>
 
         <group name="WeightPointerTypeARB">
-            <enum name="GL_BYTE_ARB"/>
-            <enum name="GL_UNSIGNED_BYTE_ARB"/>
-            <enum name="GL_SHORT_ARB"/>
-            <enum name="GL_UNSIGNED_SHORT_ARB"/>
-            <enum name="GL_INT_ARB"/>
-            <enum name="GL_UNSIGNED_INT_ARB"/>
-            <enum name="GL_FLOAT_ARB"/>
-            <enum name="GL_DOUBLE_ARB"/>
+            <enum name="GL_BYTE"/>
+            <enum name="GL_UNSIGNED_BYTE"/>
+            <enum name="GL_SHORT"/>
+            <enum name="GL_UNSIGNED_SHORT"/>
+            <enum name="GL_INT"/>
+            <enum name="GL_UNSIGNED_INT"/>
+            <enum name="GL_FLOAT"/>
+            <enum name="GL_DOUBLE"/>
         </group>
 
         <group name="CullParameterEXT">
@@ -240,14 +255,14 @@
         </group>
 
         <group name="IndexFunctionEXT">
-            <enum name="GL_NEVER_EXT"/>
-            <enum name="GL_ALWAYS_EXT"/>
-            <enum name="GL_LESS_EXT"/>
-            <enum name="GL_LEQUAL_EXT"/>
-            <enum name="GL_EQUAL_EXT"/>
-            <enum name="GL_GEQUAL_EXT"/>
-            <enum name="GL_GREATER_EXT"/>
-            <enum name="GL_NOTEQUAL_EXT"/>
+            <enum name="GL_NEVER"/>
+            <enum name="GL_ALWAYS"/>
+            <enum name="GL_LESS"/>
+            <enum name="GL_LEQUAL"/>
+            <enum name="GL_EQUAL"/>
+            <enum name="GL_GEQUAL"/>
+            <enum name="GL_GREATER"/>
+            <enum name="GL_NOTEQUAL"/>
         </group>
 
         <group name="IndexMaterialParameterEXT">
@@ -269,32 +284,36 @@
         </group>
 
         <group name="VertexWeightPointerTypeEXT">
-            <enum name="GL_FLOAT_EXT"/>
+            <enum name="GL_FLOAT"/>
         </group>
 
         <group name="VertexShaderWriteMaskEXT">
-            <enum name="GL_TRUE_EXT"/>
-            <enum name="GL_FALSE_EXT"/>
+            <enum name="GL_TRUE"/>
+            <enum name="GL_FALSE"/>
         </group>
 
         <group name="CombinerComponentUsageNV">
-            <enum name="GL_RGB_NV"/>
-            <enum name="GL_ALPHA_NV"/>
-            <enum name="GL_BLUE_NV"/>
+            <enum name="GL_RGB"/>
+            <enum name="GL_ALPHA"/>
+            <enum name="GL_BLUE"/>
         </group>
 
         <group name="TangentPointerTypeEXT">
-            <enum name="GL_BYTE_EXT"/>
-            <enum name="GL_SHORT_EXT"/>
-            <enum name="GL_FLOAT_EXT"/>
-            <enum name="GL_DOUBLE_EXT"/>
+            <enum name="GL_BYTE"/>
+            <enum name="GL_SHORT"/>
+            <enum name="GL_FLOAT"/>
+            <enum name="GL_DOUBLE"/>
         </group>
 
         <group name="BinormalPointerTypeEXT">
-            <enum name="GL_BYTE_EXT"/>
+            <!--<enum name="GL_BYTE_EXT"/>
             <enum name="GL_SHORT_EXT"/>
             <enum name="GL_FLOAT_EXT"/>
-            <enum name="GL_DOUBLE_EXT"/>
+            <enum name="GL_DOUBLE_EXT"/>-->
+            <enum name="GL_BYTE"/>
+            <enum name="GL_SHORT"/>
+            <enum name="GL_FLOAT"/>
+            <enum name="GL_DOUBLE"/>
         </group>
 
         <group name="TextureNormalModeEXT">
@@ -545,14 +564,14 @@
             <enum name="GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX"/>
         </group>
 
-        <group name="IglooFunctionSelectSGIX">
-            <enum name="GL_IGLOO_FULLSCREEN_SGIX"/>
-            <enum name="GL_IGLOO_VIEWPORT_OFFSET_SGIX"/>
-            <enum name="GL_IGLOO_SWAPTMESH_SGIX"/>
-            <enum name="GL_IGLOO_COLORNORMAL_SGIX"/>
-            <enum name="GL_IGLOO_IRISGL_MODE_SGIX"/>
-            <enum name="GL_IGLOO_LMC_COLOR_SGIX"/>
-            <enum name="GL_IGLOO_TMESHMODE_SGIX"/>
+        <group name="IglooFunctionSelectSGIX" comment="Private (internal) extension SGIX_igloo_interface">
+            <!--<enum name="GL_IGLOO_FULLSCREEN_SGIX"/>-->
+            <!--<enum name="GL_IGLOO_VIEWPORT_OFFSET_SGIX"/>-->
+            <!--<enum name="GL_IGLOO_SWAPTMESH_SGIX"/>-->
+            <!--<enum name="GL_IGLOO_COLORNORMAL_SGIX"/>-->
+            <!--<enum name="GL_IGLOO_IRISGL_MODE_SGIX"/>-->
+            <!--<enum name="GL_IGLOO_LMC_COLOR_SGIX"/>-->
+            <!--<enum name="GL_IGLOO_TMESHMODE_SGIX"/>-->
         </group>
 
         <group name="HintTargetPGI">
@@ -3651,8 +3670,8 @@
             <enum name="GL_RENDERBUFFER_STENCIL_SIZE_EXT"/>
             <enum name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>
             <enum name="GL_RENDERBUFFER_STORAGE_SAMPLES_AMD"/>
-            <enum name="GL_RENDERBUFFER_COVERAGE_SAMPLES_AMD"/>
-            <enum name="GL_RENDERBUFFER_COLOR_SAMPLES_AMD"/>
+            <enum name="GL_RENDERBUFFER_COVERAGE_SAMPLES_NV"/>
+            <enum name="GL_RENDERBUFFER_COLOR_SAMPLES_NV"/>
         </group>
 
         <group name="VertexBufferObjectUsage">
@@ -4151,12 +4170,12 @@
             <enum name="GL_SAMPLER_2D_SHADOW"/>
             <enum name="GL_SAMPLER_2D_RECT"/>
             <enum name="GL_SAMPLER_2D_RECT_SHADOW"/>
-            <enum name="GL_FLOAT_MAT2X3"/>
-            <enum name="GL_FLOAT_MAT2X4"/>
-            <enum name="GL_FLOAT_MAT3X2"/>
-            <enum name="GL_FLOAT_MAT3X4"/>
-            <enum name="GL_FLOAT_MAT4X2"/>
-            <enum name="GL_FLOAT_MAT4X3"/>
+            <enum name="GL_FLOAT_MAT2x3"/>
+            <enum name="GL_FLOAT_MAT2x4"/>
+            <enum name="GL_FLOAT_MAT3x2"/>
+            <enum name="GL_FLOAT_MAT3x4"/>
+            <enum name="GL_FLOAT_MAT4x2"/>
+            <enum name="GL_FLOAT_MAT4x3"/>
             <enum name="GL_SAMPLER_1D_ARRAY"/>
             <enum name="GL_SAMPLER_2D_ARRAY"/>
             <enum name="GL_SAMPLER_BUFFER"/>