diff --git a/xml/cl.xml b/xml/cl.xml
index 70894e9e..b67cd01f 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -256,8 +256,6 @@ server's OpenCL/api-docs repository.
         <type category="define">typedef <type>cl_bitfield</type>      <name>cl_mutable_dispatch_asserts_khr</name></type>
         <type category="define">typedef <type>cl_bitfield</type>      <name>cl_device_kernel_clock_capabilities_khr</name>;</type>
         <type category="define">typedef <type>cl_uint</type>          <name>cl_command_termination_reason_arm</name>;</type>
-        <type category="define">typedef <type>cl_int</type>           <name>cl_command_execution_status</name>;</type>
-        <type category="define">typedef <type>cl_int</type>           <name>cl_error_code</name>;</type>
 
             <comment>Structure types</comment>
         <type category="struct" name="cl_dx9_surface_info_khr">
@@ -743,7 +741,7 @@ server's OpenCL/api-docs repository.
             <unused start="-4" end="-9999"/>
     </enums>
 
-    <enums name="cl_command_execution_status" vendor="Khronos">
+    <enums name="clCommandExecutionStatus" vendor="Khronos">
         <enum value="0x0"           name="CL_COMPLETE"/>
         <enum value="0x1"           name="CL_RUNNING"/>
         <enum value="0x2"           name="CL_SUBMITTED"/>
@@ -4390,8 +4388,6 @@ server's OpenCL/api-docs repository.
             <type name="cl_profiling_info"/>
             <type name="cl_image_format"/>
             <type name="cl_buffer_region"/>
-            <type name="cl_error_code"/>
-            <type name="cl_command_execution_status"/>
         </require>
         <require etype="constants">
             <enum name="CL_CHAR_BIT"/>
@@ -4435,7 +4431,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_MAXFLOAT"/>
             <enum name="CL_INFINITY"/>
         </require>
-        <require group="cl_error_code">
+        <require comment="Error codes">
             <enum name="CL_SUCCESS"/>
             <enum name="CL_DEVICE_NOT_FOUND"/>
             <enum name="CL_DEVICE_NOT_AVAILABLE"/>
@@ -4746,7 +4742,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_COMMAND_ACQUIRE_GL_OBJECTS"/>
             <enum name="CL_COMMAND_RELEASE_GL_OBJECTS"/>
         </require>
-        <require group="cl_command_execution_status">
+        <require comment="command execution status">
             <enum name="CL_COMPLETE"/>
             <enum name="CL_RUNNING"/>
             <enum name="CL_SUBMITTED"/>
@@ -4889,7 +4885,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_MAXFLOAT"/>
             <enum name="CL_INFINITY"/>
         </require>
-        <require group="cl_error_code">
+        <require comment="Error codes">
             <enum name="CL_MISALIGNED_SUB_BUFFER_OFFSET"/>
             <enum name="CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST"/>
             <enum name="CL_INVALID_PROPERTY"/>
@@ -4980,7 +4976,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DBL_MIN"/>
             <enum name="CL_DBL_EPSILON"/>
         </require>
-        <require group="cl_error_code">
+        <require comment="Error codes">
             <enum name="CL_COMPILE_PROGRAM_FAILURE"/>
             <enum name="CL_LINKER_NOT_AVAILABLE"/>
             <enum name="CL_LINK_PROGRAM_FAILURE"/>
@@ -5153,7 +5149,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_sampler_properties"/>
             <type name="cl_kernel_exec_info"/>
         </require>
-        <require group="cl_error_code">
+        <require comment="Error codes">
             <enum name="CL_INVALID_PIPE_SIZE"/>
             <enum name="CL_INVALID_DEVICE_QUEUE"/>
         </require>
@@ -5318,7 +5314,7 @@ server's OpenCL/api-docs repository.
     </feature>
 
     <feature api="opencl" name="CL_VERSION_2_2" number="2.2" comment="OpenCL core API interface definitions">
-        <require group="cl_error_code">
+        <require comment="Error codes">
             <enum name="CL_INVALID_SPEC_ID"/>
             <enum name="CL_MAX_SIZE_RESTRICTION_EXCEEDED"/>
         </require>
@@ -5428,7 +5424,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_d3d10_device_source_khr"/>
                 <type name="cl_d3d10_device_set_khr"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_D3D10_DEVICE_KHR"/>
                 <enum name="CL_INVALID_D3D10_RESOURCE_KHR"/>
                 <enum name="CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR"/>
@@ -5477,7 +5473,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_d3d11_device_source_khr"/>
                 <type name="cl_d3d11_device_set_khr"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_D3D11_DEVICE_KHR"/>
                 <enum name="CL_INVALID_D3D11_RESOURCE_KHR"/>
                 <enum name="CL_D3D11_RESOURCE_ALREADY_ACQUIRED_KHR"/>
@@ -5527,7 +5523,7 @@ server's OpenCL/api-docs repository.
             <require condition="defined(_WIN32)">
                 <type name="cl_dx9_surface_info_khr"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_DX9_MEDIA_ADAPTER_KHR"/>
                 <enum name="CL_INVALID_DX9_MEDIA_SURFACE_KHR"/>
                 <enum name="CL_DX9_MEDIA_SURFACE_ALREADY_ACQUIRED_KHR"/>
@@ -5574,7 +5570,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_COMMAND_ACQUIRE_EGL_OBJECTS_KHR"/>
                 <enum name="CL_COMMAND_RELEASE_EGL_OBJECTS_KHR"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error type for clCreateFromEGLImageKHR">
                 <enum name="CL_INVALID_EGL_OBJECT_KHR"/>
                 <enum name="CL_EGL_RESOURCE_NOT_ACQUIRED_KHR"/>
             </require>
@@ -5648,7 +5644,7 @@ server's OpenCL/api-docs repository.
             <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_ICD_SUFFIX_KHR"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_PLATFORM_NOT_FOUND_KHR"/>
             </require>
             <require>
@@ -5743,7 +5739,7 @@ server's OpenCL/api-docs repository.
             <require group="cl_device_terminate_capability_khr" etype="bitfield">
                 <enum name="CL_DEVICE_TERMINATE_CAPABILITY_CONTEXT_KHR"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_CONTEXT_TERMINATED_KHR"/>
             </require>
             <require>
@@ -5830,7 +5826,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_device_partition_property_ext"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_DEVICE_PARTITION_FAILED_EXT"/>
                 <enum name="CL_INVALID_PARTITION_COUNT_EXT"/>
                 <enum name="CL_INVALID_PARTITION_NAME_EXT"/>
@@ -5975,7 +5971,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_GRALLOC_RESOURCE_NOT_ACQUIRED_IMG"/>
                 <enum name="CL_INVALID_GRALLOC_OBJECT_IMG"/>
             </require>
@@ -6169,7 +6165,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_ACCELERATOR_CONTEXT_INTEL"/>
                 <enum name="CL_ACCELERATOR_TYPE_INTEL"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_ACCELERATOR_INTEL"/>
                 <enum name="CL_INVALID_ACCELERATOR_TYPE_INTEL"/>
                 <enum name="CL_INVALID_ACCELERATOR_DESCRIPTOR_INTEL"/>
@@ -6498,7 +6494,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_va_api_device_source_intel"/>
                 <type name="cl_va_api_device_set_intel"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_VA_API_MEDIA_ADAPTER_INTEL"/>
                 <enum name="CL_INVALID_VA_API_MEDIA_SURFACE_INTEL"/>
                 <enum name="CL_VA_API_MEDIA_SURFACE_ALREADY_ACQUIRED_INTEL"/>
@@ -6539,7 +6535,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_dx9_device_source_intel"/>
                 <type name="cl_dx9_device_set_intel"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_DX9_DEVICE_INTEL"/>
                 <enum name="CL_INVALID_DX9_RESOURCE_INTEL"/>
                 <enum name="CL_DX9_RESOURCE_ALREADY_ACQUIRED_INTEL"/>
@@ -6610,7 +6606,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_gl_context_info"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR"/>
             </require>
             <require group="cl_gl_context_info">
@@ -6906,7 +6902,7 @@ server's OpenCL/api-docs repository.
             <require comment="Types">
                 <type name="cl_device_controlled_termination_capabilities_arm"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_COMMAND_TERMINATED_ITSELF_WITH_FAILURE_ARM"/>
             </require>
             <require group="cl_device_controlled_termination_capabilities_arm" etype="bitfield">
@@ -7066,7 +7062,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_COMMAND_SEMAPHORE_WAIT_KHR"/>
                 <enum name="CL_COMMAND_SEMAPHORE_SIGNAL_KHR"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_SEMAPHORE_KHR"/>
             </require>
             <require>
@@ -7256,7 +7252,7 @@ server's OpenCL/api-docs repository.
             <require group="cl_command_buffer_flags_khr" etype="bitfield">
                <enum name="CL_COMMAND_BUFFER_SIMULTANEOUS_USE_KHR"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_COMMAND_BUFFER_KHR"/>
                 <enum name="CL_INVALID_SYNC_POINT_WAIT_LIST_KHR"/>
                 <enum name="CL_INCOMPATIBLE_COMMAND_QUEUE_KHR"/>
@@ -7388,7 +7384,7 @@ server's OpenCL/api-docs repository.
             <require group="cl_command_buffer_flags_khr" etype="bitfield">
                <enum name="CL_COMMAND_BUFFER_MUTABLE_KHR"/>
             </require>
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_INVALID_MUTABLE_COMMAND_KHR"/>
             </require>
             <require group="cl_device_info">
@@ -7509,7 +7505,7 @@ server's OpenCL/api-docs repository.
         <extension name="cl_khr_spirv_extended_debug_info" revision="1.0.0" supported="opencl" ratified="opencl" comment="SPIR-V only"/>
         <extension name="cl_khr_spirv_linkonce_odr" revision="1.0.0" supported="opencl" ratified="opencl" comment="SPIR-V only"/>
         <extension name="cl_img_cancel_command" revision="0.0.0" supported="opencl">
-            <require group="cl_error_code">
+            <require comment="Error codes">
                 <enum name="CL_CANCELLED_IMG"/>
             </require>
             <require>
@@ -7538,4 +7534,4 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
     </extensions>
-</registry>
+</registry>
\ No newline at end of file