diff --git a/xml/vk.xml b/xml/vk.xml
index 332de107a..8dce0f6f2 100644
--- a/xml/vk.xml
+++ b/xml/vk.xml
@@ -5299,7 +5299,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                            <name>pNext</name></member>
             <member><type>VkAccelerationStructureTypeNV</type>         <name>type</name></member>
-            <member optional="true"><type>VkBuildAccelerationStructureFlagsNV</type> <name>flags</name></member>
+            <member optional="true"><type>VkBuildAccelerationStructureFlagsKHR</type> <name>flags</name></member>
             <member optional="true"><type>uint32_t</type>               <name>instanceCount</name></member>
             <member optional="true"><type>uint32_t</type>               <name>geometryCount</name></member>
             <member len="geometryCount">const <type>VkGeometryNV</type>* <name>pGeometries</name></member>
@@ -9796,7 +9796,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkDeviceAddress</type>   <name>dstAddress</name></member>
             <member><type>VkDeviceSize</type>      <name>compressedSize</name><comment>Specified in bytes</comment></member>
             <member><type>VkDeviceSize</type>      <name>decompressedSize</name><comment>Specified in bytes</comment></member>
-            <member><type>VkMemoryDecompressionMethodFlagsNV</type> <name>decompressionMethod</name></member>
+            <member><type>VkMemoryDecompressionMethodFlagsEXT</type> <name>decompressionMethod</name></member>
         </type>
         <type category="struct" name="VkDecompressMemoryRegionEXT">
             <member><type>VkDeviceAddress</type>   <name>srcAddress</name></member>
@@ -11047,7 +11047,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkDataGraphPipelineCreateInfoARM">
             <member values="VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CREATE_INFO_ARM"><type>VkStructureType</type>  <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                                     <name>pNext</name></member>
-            <member optional="true"><type>VkPipelineCreateFlags2KHR</type>                                       <name>flags</name></member>
+            <member optional="true"><type>VkPipelineCreateFlags2</type>                                          <name>flags</name></member>
             <member><type>VkPipelineLayout</type>                                                                <name>layout</name></member>
             <member optional="true"><type>uint32_t</type>                                                        <name>resourceInfoCount</name></member>
             <member len="resourceInfoCount">const <type>VkDataGraphPipelineResourceInfoARM</type>*               <name>pResourceInfos</name></member>
@@ -16651,7 +16651,7 @@ endif::VK_KHR_internally_synchronized_queues[]
             <proto><type>void</type> <name>vkGetAccelerationStructureMemoryRequirementsNV</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param>const <type>VkAccelerationStructureMemoryRequirementsInfoNV</type>* <name>pInfo</name></param>
-            <param><type>VkMemoryRequirements2KHR</type>* <name>pMemoryRequirements</name></param>
+            <param><type>VkMemoryRequirements2</type>* <name>pMemoryRequirements</name></param>
         </command>
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_UNKNOWN,VK_ERROR_VALIDATION_FAILED">
             <proto><type>VkResult</type> <name>vkBindAccelerationStructureMemoryNV</name></proto>
@@ -18138,7 +18138,7 @@ endif::VK_KHR_internally_synchronized_queues[]
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_UNKNOWN,VK_ERROR_VALIDATION_FAILED">
             <proto><type>VkResult</type> <name>vkGetPipelinePropertiesEXT</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
-            <param>const <type>VkPipelineInfoEXT</type>* <name>pPipelineInfo</name></param>
+            <param>const <type>VkPipelineInfoKHR</type>* <name>pPipelineInfo</name></param>
             <param noautovalidity="true" validstructs="VkPipelinePropertiesIdentifierEXT"><type>VkBaseOutStructure</type>* <name>pPipelineProperties</name></param>
         </command>
         <command>