Merge duplicated enum group names following #274 / #273, and add missing
GL_ prefix on enum names in lots of places.
diff --git a/xml/gl.xml b/xml/gl.xml
index d74dbdc..463cdfe 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -83,400 +83,429 @@
 
     <groups>
         <group name="TextureNormalModeEXT">
-            <enum name="PERTURB_EXT"/>
+            <enum name="GL_PERTURB_EXT"/>
         </group>
 
         <group name="LightTexturePNameEXT">
-            <enum name="ATTENUATION_EXT"/>
-            <enum name="SHADOW_ATTENUATION_EXT"/>
+            <enum name="GL_ATTENUATION_EXT"/>
+            <enum name="GL_SHADOW_ATTENUATION_EXT"/>
         </group>
 
         <group name="VertexShaderCoordOutEXT">
-            <enum name="X_EXT"/>
-            <enum name="Y_EXT"/>
-            <enum name="Z_EXT"/>
-            <enum name="W_EXT"/>
-            <enum name="NEGATIVE_X_EXT"/>
-            <enum name="NEGATIVE_Y_EXT"/>
-            <enum name="NEGATIVE_Z_EXT"/>
-            <enum name="NEGATIVE_W_EXT"/>
-            <enum name="ZERO_EXT"/>
-            <enum name="ONE_EXT"/>
-            <enum name="NEGATIVE_ONE_EXT"/>
+            <enum name="GL_X_EXT"/>
+            <enum name="GL_Y_EXT"/>
+            <enum name="GL_Z_EXT"/>
+            <enum name="GL_W_EXT"/>
+            <enum name="GL_NEGATIVE_X_EXT"/>
+            <enum name="GL_NEGATIVE_Y_EXT"/>
+            <enum name="GL_NEGATIVE_Z_EXT"/>
+            <enum name="GL_NEGATIVE_W_EXT"/>
+            <enum name="GL_ZERO_EXT"/>
+            <enum name="GL_ONE_EXT"/>
+            <enum name="GL_NEGATIVE_ONE_EXT"/>
         </group>
 
         <group name="SamplePatternEXT">
-            <enum name="1PASS_EXT"/>
-            <enum name="2PASS_0_EXT"/>
-            <enum name="2PASS_1_EXT"/>
-            <enum name="4PASS_0_EXT"/>
-            <enum name="4PASS_1_EXT"/>
-            <enum name="4PASS_2_EXT"/>
-            <enum name="4PASS_3_EXT"/>
+            <enum name="GL_1PASS_EXT"/>
+            <enum name="GL_2PASS_0_EXT"/>
+            <enum name="GL_2PASS_1_EXT"/>
+            <enum name="GL_4PASS_0_EXT"/>
+            <enum name="GL_4PASS_1_EXT"/>
+            <enum name="GL_4PASS_2_EXT"/>
+            <enum name="GL_4PASS_3_EXT"/>
         </group>
 
         <group name="VertexShaderStorageTypeEXT">
-            <enum name="VARIANT_EXT"/>
-            <enum name="INVARIANT_EXT"/>
-            <enum name="LOCAL_CONSTANT_EXT"/>
-            <enum name="LOCAL_EXT"/>
+            <enum name="GL_VARIANT_EXT"/>
+            <enum name="GL_INVARIANT_EXT"/>
+            <enum name="GL_LOCAL_CONSTANT_EXT"/>
+            <enum name="GL_LOCAL_EXT"/>
         </group>
 
         <group name="VertexShaderParameterEXT">
-            <enum name="CURRENT_VERTEX_EXT"/>
-            <enum name="MVP_MATRIX_EXT"/>
+            <enum name="GL_CURRENT_VERTEX_EXT"/>
+            <enum name="GL_MVP_MATRIX_EXT"/>
         </group>
 
         <group name="LightTextureModeEXT">
-            <enum name="FRAGMENT_MATERIAL_EXT"/>
-            <enum name="FRAGMENT_NORMAL_EXT"/>
-            <enum name="FRAGMENT_DEPTH_EXT"/>
-            <enum name="FRAGMENT_COLOR_EXT"/>
+            <enum name="GL_FRAGMENT_MATERIAL_EXT"/>
+            <enum name="GL_FRAGMENT_NORMAL_EXT"/>
+            <enum name="GL_FRAGMENT_DEPTH_EXT"/>
+            <enum name="GL_FRAGMENT_COLOR_EXT"/>
         </group>
 
         <group name="VertexShaderOpEXT">
-            <enum name="OP_INDEX_EXT"/>
-            <enum name="OP_NEGATE_EXT"/>
-            <enum name="OP_DOT3_EXT"/>
-            <enum name="OP_DOT4_EXT"/>
-            <enum name="OP_MUL_EXT"/>
-            <enum name="OP_ADD_EXT"/>
-            <enum name="OP_MADD_EXT"/>
-            <enum name="OP_FRAC_EXT"/>
-            <enum name="OP_MAX_EXT"/>
-            <enum name="OP_MIN_EXT"/>
-            <enum name="OP_SET_GE_EXT"/>
-            <enum name="OP_SET_LT_EXT"/>
-            <enum name="OP_CLAMP_EXT"/>
-            <enum name="OP_FLOOR_EXT"/>
-            <enum name="OP_ROUND_EXT"/>
-            <enum name="OP_EXP_BASE_2_EXT"/>
-            <enum name="OP_LOG_BASE_2_EXT"/>
-            <enum name="OP_POWER_EXT"/>
-            <enum name="OP_RECIP_EXT"/>
-            <enum name="OP_RECIP_SQRT_EXT"/>
-            <enum name="OP_SUB_EXT"/>
-            <enum name="OP_CROSS_PRODUCT_EXT"/>
-            <enum name="OP_MULTIPLY_MATRIX_EXT"/>
-            <enum name="OP_MOV_EXT"/>
+            <enum name="GL_OP_INDEX_EXT"/>
+            <enum name="GL_OP_NEGATE_EXT"/>
+            <enum name="GL_OP_DOT3_EXT"/>
+            <enum name="GL_OP_DOT4_EXT"/>
+            <enum name="GL_OP_MUL_EXT"/>
+            <enum name="GL_OP_ADD_EXT"/>
+            <enum name="GL_OP_MADD_EXT"/>
+            <enum name="GL_OP_FRAC_EXT"/>
+            <enum name="GL_OP_MAX_EXT"/>
+            <enum name="GL_OP_MIN_EXT"/>
+            <enum name="GL_OP_SET_GE_EXT"/>
+            <enum name="GL_OP_SET_LT_EXT"/>
+            <enum name="GL_OP_CLAMP_EXT"/>
+            <enum name="GL_OP_FLOOR_EXT"/>
+            <enum name="GL_OP_ROUND_EXT"/>
+            <enum name="GL_OP_EXP_BASE_2_EXT"/>
+            <enum name="GL_OP_LOG_BASE_2_EXT"/>
+            <enum name="GL_OP_POWER_EXT"/>
+            <enum name="GL_OP_RECIP_EXT"/>
+            <enum name="GL_OP_RECIP_SQRT_EXT"/>
+            <enum name="GL_OP_SUB_EXT"/>
+            <enum name="GL_OP_CROSS_PRODUCT_EXT"/>
+            <enum name="GL_OP_MULTIPLY_MATRIX_EXT"/>
+            <enum name="GL_OP_MOV_EXT"/>
         </group>
 
         <group name="ProgramFormatARB">
-            <enum name="PROGRAM_FORMAT_ASCII_ARB"/>
+            <enum name="GL_PROGRAM_FORMAT_ASCII_ARB"/>
         </group>
 
         <group name="PointParameterNameARB">
             <enum name="GL_POINT_SIZE_MIN_EXT"/>
             <enum name="GL_POINT_SIZE_MAX_EXT"/>
             <enum name="GL_POINT_FADE_THRESHOLD_SIZE_EXT"/>
+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE"/>
         </group>
 
         <group name="VertexAttribPropertyARB">
-            <enum name="VERTEX_ATTRIB_ARRAY_INTEGER_EXT"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_LONG"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
+            <enum name="GL_VERTEX_ATTRIB_BINDING"/>
+            <enum name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
+            <enum name="GL_CURRENT_VERTEX_ATTRIB"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT"/>
         </group>
 
         <group name="VertexAttribPointerPropertyARB">
-            <enum name="VERTEX_ATTRIB_ARRAY_POINTER_ARB"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB"/>
+            <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
         </group>
 
         <group name="ProgramStringPropertyARB">
-            <enum name="PROGRAM_STRING_ARB"/>
+            <enum name="GL_PROGRAM_STRING_ARB"/>
         </group>
 
         <group name="BufferPointerNameARB">
-            <enum name="BUFFER_MAP_POINTER_ARB"/>
+            <enum name="GL_BUFFER_MAP_POINTER_ARB"/>
+            <enum name="GL_BUFFER_MAP_POINTER"/>
         </group>
 
         <group name="BufferPNameARB">
-            <enum name="BUFFER_SIZE_ARB"/>
-            <enum name="BUFFER_USAGE_ARB"/>
-            <enum name="BUFFER_ACCESS_ARB"/>
-            <enum name="BUFFER_MAPPED_ARB"/>
+            <enum name="GL_BUFFER_SIZE_ARB"/>
+            <enum name="GL_BUFFER_USAGE_ARB"/>
+            <enum name="GL_BUFFER_ACCESS_ARB"/>
+            <enum name="GL_BUFFER_MAPPED_ARB"/>
+            <enum name="GL_BUFFER_SIZE"/>
+            <enum name="GL_BUFFER_USAGE"/>
+            <enum name="GL_BUFFER_ACCESS"/>
+            <enum name="GL_BUFFER_ACCESS_FLAGS"/>
+            <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/>
+            <enum name="GL_BUFFER_MAPPED"/>
+            <enum name="GL_BUFFER_MAP_OFFSET"/>
+            <enum name="GL_BUFFER_MAP_LENGTH"/>
+            <enum name="GL_BUFFER_STORAGE_FLAGS"/>
         </group>
 
         <group name="ClampColorModeARB">
-            <enum name="FIXED_ONLY_ARB"/>
-            <enum name="FALSE"/>
-            <enum name="TRUE"/>
+            <enum name="GL_FIXED_ONLY_ARB"/>
+            <enum name="GL_FALSE"/>
+            <enum name="GL_TRUE"/>
+            <enum name="GL_TRUE"/>
+            <enum name="GL_FALSE"/>
+            <enum name="GL_FIXED_ONLY"/>
         </group>
 
         <group name="ClampColorTargetARB">
-            <enum name="CLAMP_VERTEX_COLOR_ARB"/>
-            <enum name="CLAMP_FRAGMENT_COLOR_ARB"/>
-            <enum name="CLAMP_READ_COLOR_ARB"/>
+            <enum name="GL_CLAMP_VERTEX_COLOR_ARB"/>
+            <enum name="GL_CLAMP_FRAGMENT_COLOR_ARB"/>
+            <enum name="GL_CLAMP_READ_COLOR_ARB"/>
+            <enum name="GL_CLAMP_READ_COLOR"/>
         </group>
 
         <group name="ProgramTargetARB">
-            <enum name="TEXT_FRAGMENT_SHADER_ATI"/>
+            <enum name="GL_TEXT_FRAGMENT_SHADER_ATI"/>
         </group>
 
         <group name="VertexArrayPNameAPPLE">
-            <enum name="STORAGE_CLIENT_APPLE"/>
-            <enum name="STORAGE_CACHED_APPLE"/>
-            <enum name="STORAGE_SHARED_APPLE"/>
+            <enum name="GL_STORAGE_CLIENT_APPLE"/>
+            <enum name="GL_STORAGE_CACHED_APPLE"/>
+            <enum name="GL_STORAGE_SHARED_APPLE"/>
         </group>
 
         <group name="ObjectTypeAPPLE">
-            <enum name="DRAW_PIXELS_APPLE"/>
-            <enum name="FENCE_APPLE"/>
+            <enum name="GL_DRAW_PIXELS_APPLE"/>
+            <enum name="GL_FENCE_APPLE"/>
         </group>
 
         <group name="PreserveModeATI">
-            <enum name="PRESERVE_ATI"/>
-            <enum name="DISCARD_ATI"/>
+            <enum name="GL_PRESERVE_ATI"/>
+            <enum name="GL_DISCARD_ATI"/>
         </group>
 
         <group name="TexBumpParameterATI">
-            <enum name="BUMP_ROT_MATRIX_ATI"/>
+            <enum name="GL_BUMP_ROT_MATRIX_ATI"/>
         </group>
 
         <group name="SwizzleOpATI">
-            <enum name="SWIZZLE_STR_ATI"/>
-            <enum name="SWIZZLE_STQ_ATI"/>
-            <enum name="SWIZZLE_STR_DR_ATI"/>
-            <enum name="SWIZZLE_STQ_DQ_ATI"/>
+            <enum name="GL_SWIZZLE_STR_ATI"/>
+            <enum name="GL_SWIZZLE_STQ_ATI"/>
+            <enum name="GL_SWIZZLE_STR_DR_ATI"/>
+            <enum name="GL_SWIZZLE_STQ_DQ_ATI"/>
         </group>
 
         <group name="PNTrianglesPNameATI">
-            <enum name="PN_TRIANGLES_POINT_MODE_ATI"/>
-            <enum name="PN_TRIANGLES_NORMAL_MODE_ATI"/>
-            <enum name="PN_TRIANGLES_TESSELATION_LEVEL_ATI"/>
+            <enum name="GL_PN_TRIANGLES_POINT_MODE_ATI"/>
+            <enum name="GL_PN_TRIANGLES_NORMAL_MODE_ATI"/>
+            <enum name="GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI"/>
         </group>
 
         <group name="ArrayObjectUsageATI">
-            <enum name="STATIC_ATI"/>
-            <enum name="DYNAMIC_ATI"/>
+            <enum name="GL_STATIC_ATI"/>
+            <enum name="GL_DYNAMIC_ATI"/>
         </group>
 
         <group name="GetTexBumpParameterATI">
-            <enum name="BUMP_ROT_MATRIX_ATI"/>
-            <enum name="BUMP_ROT_MATRIX_SIZE_ATI"/>
-            <enum name="BUMP_NUM_TEX_UNITS_ATI"/>
-            <enum name="BUMP_TEX_UNITS_ATI"/>
+            <enum name="GL_BUMP_ROT_MATRIX_ATI"/>
+            <enum name="GL_BUMP_ROT_MATRIX_SIZE_ATI"/>
+            <enum name="GL_BUMP_NUM_TEX_UNITS_ATI"/>
+            <enum name="GL_BUMP_TEX_UNITS_ATI"/>
         </group>
 
         <group name="ArrayObjectPNameATI">
-            <enum name="OBJECT_BUFFER_SIZE_ATI"/>
-            <enum name="OBJECT_BUFFER_USAGE_ATI"/>
+            <enum name="GL_OBJECT_BUFFER_SIZE_ATI"/>
+            <enum name="GL_OBJECT_BUFFER_USAGE_ATI"/>
         </group>
 
         <group name="DrawBufferModeATI">
-            <enum name="COLOR_ATTACHMENT0_NV"/>
-            <enum name="COLOR_ATTACHMENT1_NV"/>
-            <enum name="COLOR_ATTACHMENT2_NV"/>
-            <enum name="COLOR_ATTACHMENT3_NV"/>
-            <enum name="COLOR_ATTACHMENT4_NV"/>
-            <enum name="COLOR_ATTACHMENT5_NV"/>
-            <enum name="COLOR_ATTACHMENT6_NV"/>
-            <enum name="COLOR_ATTACHMENT7_NV"/>
-            <enum name="COLOR_ATTACHMENT8_NV"/>
-            <enum name="COLOR_ATTACHMENT9_NV"/>
-            <enum name="COLOR_ATTACHMENT10_NV"/>
-            <enum name="COLOR_ATTACHMENT11_NV"/>
-            <enum name="COLOR_ATTACHMENT12_NV"/>
-            <enum name="COLOR_ATTACHMENT13_NV"/>
-            <enum name="COLOR_ATTACHMENT14_NV"/>
-            <enum name="COLOR_ATTACHMENT15_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT0_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT1_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT2_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT3_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT4_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT5_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT6_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT7_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT8_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT9_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT10_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT11_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT12_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT13_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT14_NV"/>
+            <enum name="GL_COLOR_ATTACHMENT15_NV"/>
         </group>
 
         <group name="VertexStreamATI">
-            <enum name="VERTEX_STREAM0_ATI"/>
-            <enum name="VERTEX_STREAM1_ATI"/>
-            <enum name="VERTEX_STREAM2_ATI"/>
-            <enum name="VERTEX_STREAM3_ATI"/>
-            <enum name="VERTEX_STREAM4_ATI"/>
-            <enum name="VERTEX_STREAM5_ATI"/>
-            <enum name="VERTEX_STREAM6_ATI"/>
-            <enum name="VERTEX_STREAM7_ATI"/>
+            <enum name="GL_VERTEX_STREAM0_ATI"/>
+            <enum name="GL_VERTEX_STREAM1_ATI"/>
+            <enum name="GL_VERTEX_STREAM2_ATI"/>
+            <enum name="GL_VERTEX_STREAM3_ATI"/>
+            <enum name="GL_VERTEX_STREAM4_ATI"/>
+            <enum name="GL_VERTEX_STREAM5_ATI"/>
+            <enum name="GL_VERTEX_STREAM6_ATI"/>
+            <enum name="GL_VERTEX_STREAM7_ATI"/>
         </group>
 
         <group name="SpriteParameterNameSGIX">
-            <enum name="SPRITE_MODE_SGIX"/>
+            <enum name="GL_SPRITE_MODE_SGIX"/>
         </group>
 
         <group name="PixelTexGenModeSGIX">
-            <enum name="PIXEL_TEX_GEN_Q_CEILING_SGIX"/>
-            <enum name="PIXEL_TEX_GEN_Q_FLOOR_SGIX"/>
-            <enum name="PIXEL_TEX_GEN_Q_ROUND_SGIX"/>
-            <enum name="PIXEL_TEX_GEN_ALPHA_LS_SGIX"/>
-            <enum name="PIXEL_TEX_GEN_ALPHA_MS_SGIX"/>
+            <enum name="GL_PIXEL_TEX_GEN_Q_CEILING_SGIX"/>
+            <enum name="GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX"/>
+            <enum name="GL_PIXEL_TEX_GEN_Q_ROUND_SGIX"/>
+            <enum name="GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX"/>
+            <enum name="GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX"/>
         </group>
 
         <group name="IglooFunctionSelectSGIX">
-            <enum name="IGLOO_FULLSCREEN_SGIX"/>
-            <enum name="IGLOO_VIEWPORT_OFFSET_SGIX"/>
-            <enum name="IGLOO_SWAPTMESH_SGIX"/>
-            <enum name="IGLOO_COLORNORMAL_SGIX"/>
-            <enum name="IGLOO_IRISGL_MODE_SGIX"/>
-            <enum name="IGLOO_LMC_COLOR_SGIX"/>
-            <enum name="IGLOO_TMESHMODE_SGIX"/>
+            <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">
-            <enum name="VERTEX_DATA_HINT_PGI"/>
-            <enum name="VERTEX_CONSISTENT_HINT_PGI"/>
-            <enum name="MATERIAL_SIDE_HINT_PGI"/>
-            <enum name="MAX_VERTEX_HINT_PGI"/>
+            <enum name="GL_VERTEX_DATA_HINT_PGI"/>
+            <enum name="GL_VERTEX_CONSISTENT_HINT_PGI"/>
+            <enum name="GL_MATERIAL_SIDE_HINT_PGI"/>
+            <enum name="GL_MAX_VERTEX_HINT_PGI"/>
         </group>
 
         <group name="ImageTransformPNameHP">
-            <enum name="IMAGE_SCALE_X_HP"/>
-            <enum name="IMAGE_SCALE_Y_HP"/>
-            <enum name="IMAGE_TRANSLATE_X_HP"/>
-            <enum name="IMAGE_TRANSLATE_Y_HP"/>
-            <enum name="IMAGE_ROTATE_ANGLE_HP"/>
-            <enum name="IMAGE_ROTATE_ORIGIN_X_HP"/>
-            <enum name="IMAGE_ROTATE_ORIGIN_Y_HP"/>
-            <enum name="IMAGE_MAG_FILTER_HP"/>
-            <enum name="IMAGE_MIN_FILTER_HP"/>
-            <enum name="IMAGE_CUBIC_WEIGHT_HP"/>
+            <enum name="GL_IMAGE_SCALE_X_HP"/>
+            <enum name="GL_IMAGE_SCALE_Y_HP"/>
+            <enum name="GL_IMAGE_TRANSLATE_X_HP"/>
+            <enum name="GL_IMAGE_TRANSLATE_Y_HP"/>
+            <enum name="GL_IMAGE_ROTATE_ANGLE_HP"/>
+            <enum name="GL_IMAGE_ROTATE_ORIGIN_X_HP"/>
+            <enum name="GL_IMAGE_ROTATE_ORIGIN_Y_HP"/>
+            <enum name="GL_IMAGE_MAG_FILTER_HP"/>
+            <enum name="GL_IMAGE_MIN_FILTER_HP"/>
+            <enum name="GL_IMAGE_CUBIC_WEIGHT_HP"/>
         </group>
 
         <group name="ImageTransformTargetHP">
-            <enum name="IMAGE_TRANSFORM_2D_HP"/>
+            <enum name="GL_IMAGE_TRANSFORM_2D_HP"/>
         </group>
 
         <group name="TextureFilterSGIS">
-            <enum name="FILTER4_SGIS"/>
+            <enum name="GL_FILTER4_SGIS"/>
         </group>
 
         <group name="OcclusionQueryParameterNameNV">
-            <enum name="PIXEL_COUNT_NV"/>
-            <enum name="PIXEL_COUNT_AVAILABLE_NV"/>
+            <enum name="GL_PIXEL_COUNT_NV"/>
+            <enum name="GL_PIXEL_COUNT_AVAILABLE_NV"/>
         </group>
 
         <group name="GetMultisamplePNameNV">
-            <enum name="SAMPLE_LOCATION_ARB"/>
-            <enum name="PROGRAMMABLE_SAMPLE_LOCATION_ARB"/>
+            <enum name="GL_SAMPLE_POSITION"/>
+            <enum name="GL_SAMPLE_LOCATION_ARB"/>
+            <enum name="GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB"/>
         </group>
 
         <group name="MapParameterNV">
-            <enum name="MAP_TESSELLATION_NV"/>
+            <enum name="GL_MAP_TESSELLATION_NV"/>
         </group>
 
         <group name="MapAttribParameterNV">
-            <enum name="MAP_ATTRIB_U_ORDER_NV"/>
-            <enum name="MAP_ATTRIB_V_ORDER_NV"/>
+            <enum name="GL_MAP_ATTRIB_U_ORDER_NV"/>
+            <enum name="GL_MAP_ATTRIB_V_ORDER_NV"/>
         </group>
 
         <group name="FenceParameterNameNV">
-            <enum name="FENCE_STATUS_NV"/>
-            <enum name="FENCE_CONDITION_NV"/>
+            <enum name="GL_FENCE_STATUS_NV"/>
+            <enum name="GL_FENCE_CONDITION_NV"/>
         </group>
 
         <group name="CombinerParameterNV">
-            <enum name="COMBINER_INPUT_NV"/>
-            <enum name="COMBINER_MAPPING_NV"/>
-            <enum name="COMBINER_COMPONENT_USAGE_NV"/>
+            <enum name="GL_COMBINER_INPUT_NV"/>
+            <enum name="GL_COMBINER_MAPPING_NV"/>
+            <enum name="GL_COMBINER_COMPONENT_USAGE_NV"/>
         </group>
 
         <group name="CombinerBiasNV">
-            <enum name="NONE"/>
-            <enum name="BIAS_BY_NEGATIVE_ONE_HALF_NV"/>
+            <enum name="GL_NONE"/>
+            <enum name="GL_BIAS_BY_NEGATIVE_ONE_HALF_NV"/>
         </group>
 
         <group name="CombinerScaleNV">
-            <enum name="NONE"/>
-            <enum name="SCALE_BY_TWO_NV"/>
-            <enum name="SCALE_BY_FOUR_NV"/>
-            <enum name="SCALE_BY_ONE_HALF_NV"/>
+            <enum name="GL_NONE"/>
+            <enum name="GL_SCALE_BY_TWO_NV"/>
+            <enum name="GL_SCALE_BY_FOUR_NV"/>
+            <enum name="GL_SCALE_BY_ONE_HALF_NV"/>
         </group>
 
         <group name="CombinerMappingNV">
-            <enum name="UNSIGNED_IDENTITY_NV"/>
-            <enum name="UNSIGNED_INVERT_NV"/>
-            <enum name="EXPAND_NORMAL_NV"/>
-            <enum name="EXPAND_NEGATE_NV"/>
-            <enum name="HALF_BIAS_NORMAL_NV"/>
-            <enum name="HALF_BIAS_NEGATE_NV"/>
-            <enum name="SIGNED_IDENTITY_NV"/>
-            <enum name="SIGNED_NEGATE_NV"/>
+            <enum name="GL_UNSIGNED_IDENTITY_NV"/>
+            <enum name="GL_UNSIGNED_INVERT_NV"/>
+            <enum name="GL_EXPAND_NORMAL_NV"/>
+            <enum name="GL_EXPAND_NEGATE_NV"/>
+            <enum name="GL_HALF_BIAS_NORMAL_NV"/>
+            <enum name="GL_HALF_BIAS_NEGATE_NV"/>
+            <enum name="GL_SIGNED_IDENTITY_NV"/>
+            <enum name="GL_SIGNED_NEGATE_NV"/>
         </group>
 
         <group name="CombinerRegisterNV">
-            <enum name="DISCARD_NV"/>
-            <enum name="PRIMARY_COLOR_NV"/>
-            <enum name="SECONDARY_COLOR_NV"/>
-            <enum name="SPARE0_NV"/>
-            <enum name="SPARE1_NV"/>
-            <enum name="TEXTURE0_ARB"/>
-            <enum name="TEXTURE1_ARB"/>
+            <enum name="GL_DISCARD_NV"/>
+            <enum name="GL_PRIMARY_COLOR_NV"/>
+            <enum name="GL_SECONDARY_COLOR_NV"/>
+            <enum name="GL_SPARE0_NV"/>
+            <enum name="GL_SPARE1_NV"/>
+            <enum name="GL_TEXTURE0_ARB"/>
+            <enum name="GL_TEXTURE1_ARB"/>
         </group>
 
         <group name="CombinerVariableNV">
-            <enum name="VARIABLE_A_NV"/>
-            <enum name="VARIABLE_B_NV"/>
-            <enum name="VARIABLE_C_NV"/>
-            <enum name="VARIABLE_D_NV"/>
-            <enum name="VARIABLE_E_NV"/>
-            <enum name="VARIABLE_F_NV"/>
-            <enum name="VARIABLE_G_NV"/>
+            <enum name="GL_VARIABLE_A_NV"/>
+            <enum name="GL_VARIABLE_B_NV"/>
+            <enum name="GL_VARIABLE_C_NV"/>
+            <enum name="GL_VARIABLE_D_NV"/>
+            <enum name="GL_VARIABLE_E_NV"/>
+            <enum name="GL_VARIABLE_F_NV"/>
+            <enum name="GL_VARIABLE_G_NV"/>
         </group>
 
         <group name="PixelDataRangeTargetNV">
-            <enum name="WRITE_PIXEL_DATA_RANGE_NV"/>
-            <enum name="READ_PIXEL_DATA_RANGE_NV"/>
+            <enum name="GL_WRITE_PIXEL_DATA_RANGE_NV"/>
+            <enum name="GL_READ_PIXEL_DATA_RANGE_NV"/>
         </group>
 
         <group name="EvalTargetNV">
-            <enum name="EVAL_2D_NV"/>
-            <enum name="EVAL_TRIANGULAR_2D_NV"/>
+            <enum name="GL_EVAL_2D_NV"/>
+            <enum name="GL_EVAL_TRIANGULAR_2D_NV"/>
         </group>
 
         <group name="VertexAttribEnumNV">
-            <enum name="PROGRAM_PARAMETER_NV"/>
+            <enum name="GL_PROGRAM_PARAMETER_NV"/>
         </group>
 
         <group name="FenceConditionNV">
-            <enum name="ALL_COMPLETED_NV"/>
+            <enum name="GL_ALL_COMPLETED_NV"/>
         </group>
 
         <group name="PathCoordType">
-            <enum name="CLOSE_PATH_NV"/>
-            <enum name="MOVE_TO_NV"/>
-            <enum name="RELATIVE_MOVE_TO_NV"/>
-            <enum name="LINE_TO_NV"/>
-            <enum name="RELATIVE_LINE_TO_NV"/>
-            <enum name="HORIZONTAL_LINE_TO_NV"/>
-            <enum name="RELATIVE_HORIZONTAL_LINE_TO_NV"/>
-            <enum name="VERTICAL_LINE_TO_NV"/>
-            <enum name="RELATIVE_VERTICAL_LINE_TO_NV"/>
-            <enum name="QUADRATIC_CURVE_TO_NV"/>
-            <enum name="RELATIVE_QUADRATIC_CURVE_TO_NV"/>
-            <enum name="CUBIC_CURVE_TO_NV"/>
-            <enum name="RELATIVE_CUBIC_CURVE_TO_NV"/>
-            <enum name="SMOOTH_QUADRATIC_CURVE_TO_NV"/>
-            <enum name="RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
-            <enum name="SMOOTH_CUBIC_CURVE_TO_NV"/>
-            <enum name="RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV"/>
-            <enum name="SMALL_CCW_ARC_TO_NV"/>
-            <enum name="RELATIVE_SMALL_CCW_ARC_TO_NV"/>
-            <enum name="SMALL_CW_ARC_TO_NV"/>
-            <enum name="RELATIVE_SMALL_CW_ARC_TO_NV"/>
-            <enum name="LARGE_CCW_ARC_TO_NV"/>
-            <enum name="RELATIVE_LARGE_CCW_ARC_TO_NV"/>
-            <enum name="LARGE_CW_ARC_TO_NV"/>
-            <enum name="RELATIVE_LARGE_CW_ARC_TO_NV"/>
-            <enum name="CONIC_CURVE_TO_NV"/>
-            <enum name="RELATIVE_CONIC_CURVE_TO_NV"/>
-            <enum name="ROUNDED_RECT_NV"/>
-            <enum name="RELATIVE_ROUNDED_RECT_NV"/>
-            <enum name="ROUNDED_RECT2_NV"/>
-            <enum name="RELATIVE_ROUNDED_RECT2_NV"/>
-            <enum name="ROUNDED_RECT4_NV"/>
-            <enum name="RELATIVE_ROUNDED_RECT4_NV"/>
-            <enum name="ROUNDED_RECT8_NV"/>
-            <enum name="RELATIVE_ROUNDED_RECT8_NV"/>
-            <enum name="RESTART_PATH_NV"/>
-            <enum name="DUP_FIRST_CUBIC_CURVE_TO_NV"/>
-            <enum name="DUP_LAST_CUBIC_CURVE_TO_NV"/>
-            <enum name="RECT_NV"/>
-            <enum name="RELATIVE_RECT_NV"/>
-            <enum name="CIRCULAR_CCW_ARC_TO_NV"/>
-            <enum name="CIRCULAR_CW_ARC_TO_NV"/>
-            <enum name="CIRCULAR_TANGENT_ARC_TO_NV"/>
-            <enum name="ARC_TO_NV"/>
-            <enum name="RELATIVE_ARC_TO_NV"/>
+            <enum name="GL_CLOSE_PATH_NV"/>
+            <enum name="GL_MOVE_TO_NV"/>
+            <enum name="GL_RELATIVE_MOVE_TO_NV"/>
+            <enum name="GL_LINE_TO_NV"/>
+            <enum name="GL_RELATIVE_LINE_TO_NV"/>
+            <enum name="GL_HORIZONTAL_LINE_TO_NV"/>
+            <enum name="GL_RELATIVE_HORIZONTAL_LINE_TO_NV"/>
+            <enum name="GL_VERTICAL_LINE_TO_NV"/>
+            <enum name="GL_RELATIVE_VERTICAL_LINE_TO_NV"/>
+            <enum name="GL_QUADRATIC_CURVE_TO_NV"/>
+            <enum name="GL_RELATIVE_QUADRATIC_CURVE_TO_NV"/>
+            <enum name="GL_CUBIC_CURVE_TO_NV"/>
+            <enum name="GL_RELATIVE_CUBIC_CURVE_TO_NV"/>
+            <enum name="GL_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
+            <enum name="GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
+            <enum name="GL_SMOOTH_CUBIC_CURVE_TO_NV"/>
+            <enum name="GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV"/>
+            <enum name="GL_SMALL_CCW_ARC_TO_NV"/>
+            <enum name="GL_RELATIVE_SMALL_CCW_ARC_TO_NV"/>
+            <enum name="GL_SMALL_CW_ARC_TO_NV"/>
+            <enum name="GL_RELATIVE_SMALL_CW_ARC_TO_NV"/>
+            <enum name="GL_LARGE_CCW_ARC_TO_NV"/>
+            <enum name="GL_RELATIVE_LARGE_CCW_ARC_TO_NV"/>
+            <enum name="GL_LARGE_CW_ARC_TO_NV"/>
+            <enum name="GL_RELATIVE_LARGE_CW_ARC_TO_NV"/>
+            <enum name="GL_CONIC_CURVE_TO_NV"/>
+            <enum name="GL_RELATIVE_CONIC_CURVE_TO_NV"/>
+            <enum name="GL_ROUNDED_RECT_NV"/>
+            <enum name="GL_RELATIVE_ROUNDED_RECT_NV"/>
+            <enum name="GL_ROUNDED_RECT2_NV"/>
+            <enum name="GL_RELATIVE_ROUNDED_RECT2_NV"/>
+            <enum name="GL_ROUNDED_RECT4_NV"/>
+            <enum name="GL_RELATIVE_ROUNDED_RECT4_NV"/>
+            <enum name="GL_ROUNDED_RECT8_NV"/>
+            <enum name="GL_RELATIVE_ROUNDED_RECT8_NV"/>
+            <enum name="GL_RESTART_PATH_NV"/>
+            <enum name="GL_DUP_FIRST_CUBIC_CURVE_TO_NV"/>
+            <enum name="GL_DUP_LAST_CUBIC_CURVE_TO_NV"/>
+            <enum name="GL_RECT_NV"/>
+            <enum name="GL_RELATIVE_RECT_NV"/>
+            <enum name="GL_CIRCULAR_CCW_ARC_TO_NV"/>
+            <enum name="GL_CIRCULAR_CW_ARC_TO_NV"/>
+            <enum name="GL_CIRCULAR_TANGENT_ARC_TO_NV"/>
+            <enum name="GL_ARC_TO_NV"/>
+            <enum name="GL_RELATIVE_ARC_TO_NV"/>
         </group>
 
         <group name="AccumOp">
@@ -2919,6 +2948,8 @@
             <enum name="GL_CLAMP_TO_EDGE"/>
             <enum name="GL_CLAMP_TO_EDGE_SGIS"/>
             <enum name="GL_REPEAT"/>
+            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
+            <enum name="GL_MIRRORED_REPEAT"/>
         </group>
 
         <group name="UseProgramStageMask">
@@ -4131,25 +4162,6 @@
             <enum name="GL_SEPARATE_ATTRIBS"/>
         </group>
 
-        <group name="VertexAttribType">
-            <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_HALF_FLOAT"/>
-            <enum name="GL_DOUBLE"/>
-            <enum name="GL_FIXED"/>
-            <enum name="GL_INT_2_10_10_10_REV"/>
-            <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
-            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
-            <enum name="GL_INT_2_10_10_10_REV"/>
-            <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
-            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
-        </group>
-
         <group name="VertexAttribIType">
             <enum name="GL_BYTE"/>
             <enum name="GL_UNSIGNED_BYTE"/>
@@ -4196,88 +4208,12 @@
             <enum name="GL_TYPE"/>
         </group>
 
-        <group name="BufferPointerNameARB">
-            <enum name="GL_BUFFER_MAP_POINTER"/>
-        </group>
-
-        <group name="VertexAttribPointerPropertyARB">
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
-        </group>
-
-        <group name="PointParameterNameARB">
-            <enum name="GL_POINT_FADE_THRESHOLD_SIZE"/>
-        </group>
-
-        <group name="GetMultisamplePNameNV">
-            <enum name="GL_SAMPLE_POSITION"/>
-        </group>
-
-        <group name="ClampColorTargetARB">
-            <enum name="GL_CLAMP_READ_COLOR"/>
-        </group>
-
-        <group name="ClampColorModeARB">
-            <enum name="GL_TRUE"/>
-            <enum name="GL_FALSE"/>
-            <enum name="GL_FIXED_ONLY"/>
-        </group>
-
-        <group name="BufferPNameARB">
-            <enum name="GL_BUFFER_SIZE"/>
-            <enum name="GL_BUFFER_USAGE"/>
-            <enum name="GL_BUFFER_ACCESS"/>
-            <enum name="GL_BUFFER_ACCESS_FLAGS"/>
-            <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/>
-            <enum name="GL_BUFFER_MAPPED"/>
-            <enum name="GL_BUFFER_MAP_OFFSET"/>
-            <enum name="GL_BUFFER_MAP_LENGTH"/>
-            <enum name="GL_BUFFER_STORAGE_FLAGS"/>
-        </group>
-
-        <group name="VertexAttribPropertyARB">
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_LONG"/>
-            <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
-            <enum name="GL_VERTEX_ATTRIB_BINDING"/>
-            <enum name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
-            <enum name="GL_CURRENT_VERTEX_ATTRIB"/>
-        </group>
-
         <group name="TextureCompareMode">
             <enum name="GL_NONE"/>
             <enum name="GL_COMPARE_REF_TO_TEXTURE"/>
             <enum name="GL_COMPARE_R_TO_TEXTURE"/>
         </group>
 
-        <group name="TextureMagFilter">
-            <enum name="GL_NEAREST"/>
-            <enum name="GL_LINEAR"/>
-        </group>
-
-        <group name="TextureMinFilter">
-            <enum name="GL_NEAREST"/>
-            <enum name="GL_LINEAR"/>
-            <enum name="GL_NEAREST_MIPMAP_NEAREST"/>
-            <enum name="GL_LINEAR_MIPMAP_NEAREST"/>
-            <enum name="GL_NEAREST_MIPMAP_LINEAR"/>
-            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
-        </group>
-
-        <group name="TextureWrapMode">
-            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
-            <enum name="GL_CLAMP"/>
-            <enum name="GL_REPEAT"/>
-            <enum name="GL_CLAMP_TO_BORDER"/>
-            <enum name="GL_CLAMP_TO_EDGE"/>
-            <enum name="GL_MIRRORED_REPEAT"/>
-        </group>
-
         <group name="TextureSwizzle">
             <enum name="GL_RED"/>
             <enum name="GL_GREEN"/>