diff --git a/vulkan.py b/vulkan.py
index 7c38a37..e03917c 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -188,7 +188,7 @@
         "VkDevice",
         "VkQueue",
         "VkSemaphore",
-        "VkCmdBuffer",
+        "VkCommandBuffer",
         "VkFence",
         "VkDeviceMemory",
         "VkBuffer",
@@ -208,17 +208,17 @@
         "VkDescriptorPool",
         "VkDescriptorSet",
         "VkFramebuffer",
-        "VkCmdPool",
+        "VkCommandPool",
     ],
     protos=[
         Proto("VkResult", "CreateInstance",
             [Param("const VkInstanceCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkInstance*", "pInstance")]),
 
         Proto("void", "DestroyInstance",
             [Param("VkInstance", "instance"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "EnumeratePhysicalDevices",
             [Param("VkInstance", "instance"),
@@ -267,12 +267,12 @@
         Proto("VkResult", "CreateDevice",
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("const VkDeviceCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkDevice*", "pDevice")]),
 
         Proto("void", "DestroyDevice",
             [Param("VkDevice", "device"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "EnumerateInstanceExtensionProperties",
             [Param("const char*", "pLayerName"),
@@ -312,16 +312,16 @@
         Proto("VkResult", "DeviceWaitIdle",
             [Param("VkDevice", "device")]),
 
-        Proto("VkResult", "AllocMemory",
+        Proto("VkResult", "AllocateMemory",
             [Param("VkDevice", "device"),
-             Param("const VkMemoryAllocInfo*", "pAllocInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
-             Param("VkDeviceMemory*", "pMem")]),
+             Param("const VkMemoryAllocateInfo*", "pAllocateInfo"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
+             Param("VkDeviceMemory*", "pMemory")]),
 
         Proto("void", "FreeMemory",
             [Param("VkDevice", "device"),
              Param("VkDeviceMemory", "mem"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "MapMemory",
             [Param("VkDevice", "device"),
@@ -337,13 +337,13 @@
 
         Proto("VkResult", "FlushMappedMemoryRanges",
             [Param("VkDevice", "device"),
-             Param("uint32_t", "memRangeCount"),
-             Param("const VkMappedMemoryRange*", "pMemRanges")]),
+             Param("uint32_t", "memoryRangeCount"),
+             Param("const VkMappedMemoryRange*", "pMemoryRanges")]),
 
         Proto("VkResult", "InvalidateMappedMemoryRanges",
             [Param("VkDevice", "device"),
-             Param("uint32_t", "memRangeCount"),
-             Param("const VkMappedMemoryRange*", "pMemRanges")]),
+             Param("uint32_t", "memoryRangeCount"),
+             Param("const VkMappedMemoryRange*", "pMemoryRanges")]),
 
         Proto("void", "GetDeviceMemoryCommitment",
             [Param("VkDevice", "device"),
@@ -354,13 +354,13 @@
             [Param("VkDevice", "device"),
              Param("VkBuffer", "buffer"),
              Param("VkDeviceMemory", "mem"),
-             Param("VkDeviceSize", "memOffset")]),
+             Param("VkDeviceSize", "memoryOffset")]),
 
         Proto("VkResult", "BindImageMemory",
             [Param("VkDevice", "device"),
              Param("VkImage", "image"),
              Param("VkDeviceMemory", "mem"),
-             Param("VkDeviceSize", "memOffset")]),
+             Param("VkDeviceSize", "memoryOffset")]),
 
         Proto("void", "GetBufferMemoryRequirements",
             [Param("VkDevice", "device"),
@@ -397,13 +397,13 @@
         Proto("VkResult", "CreateFence",
             [Param("VkDevice", "device"),
              Param("const VkFenceCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkFence*", "pFence")]),
 
         Proto("void", "DestroyFence",
             [Param("VkDevice", "device"),
              Param("VkFence", "fence"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "ResetFences",
             [Param("VkDevice", "device"),
@@ -424,24 +424,24 @@
         Proto("VkResult", "CreateSemaphore",
             [Param("VkDevice", "device"),
              Param("const VkSemaphoreCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkSemaphore*", "pSemaphore")]),
 
         Proto("void", "DestroySemaphore",
             [Param("VkDevice", "device"),
              Param("VkSemaphore", "semaphore"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateEvent",
             [Param("VkDevice", "device"),
              Param("const VkEventCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkEvent*", "pEvent")]),
 
         Proto("void", "DestroyEvent",
             [Param("VkDevice", "device"),
              Param("VkEvent", "event"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "GetEventStatus",
             [Param("VkDevice", "device"),
@@ -458,13 +458,13 @@
         Proto("VkResult", "CreateQueryPool",
             [Param("VkDevice", "device"),
              Param("const VkQueryPoolCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkQueryPool*", "pQueryPool")]),
 
         Proto("void", "DestroyQueryPool",
             [Param("VkDevice", "device"),
              Param("VkQueryPool", "queryPool"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "GetQueryPoolResults",
             [Param("VkDevice", "device"),
@@ -479,35 +479,35 @@
         Proto("VkResult", "CreateBuffer",
             [Param("VkDevice", "device"),
              Param("const VkBufferCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkBuffer*", "pBuffer")]),
 
         Proto("void", "DestroyBuffer",
             [Param("VkDevice", "device"),
              Param("VkBuffer", "buffer"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateBufferView",
             [Param("VkDevice", "device"),
              Param("const VkBufferViewCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkBufferView*", "pView")]),
 
         Proto("void", "DestroyBufferView",
             [Param("VkDevice", "device"),
              Param("VkBufferView", "bufferView"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateImage",
             [Param("VkDevice", "device"),
              Param("const VkImageCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkImage*", "pImage")]),
 
         Proto("void", "DestroyImage",
             [Param("VkDevice", "device"),
              Param("VkImage", "image"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("void", "GetImageSubresourceLayout",
             [Param("VkDevice", "device"),
@@ -518,46 +518,46 @@
         Proto("VkResult", "CreateImageView",
             [Param("VkDevice", "device"),
              Param("const VkImageViewCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkImageView*", "pView")]),
 
         Proto("void", "DestroyImageView",
             [Param("VkDevice", "device"),
              Param("VkImageView", "imageView"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateShaderModule",
             [Param("VkDevice", "device"),
              Param("const VkShaderModuleCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkShaderModule*", "pShaderModule")]),
 
         Proto("void", "DestroyShaderModule",
             [Param("VkDevice", "device"),
              Param("VkShaderModule", "shaderModule"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateShader",
             [Param("VkDevice", "device"),
              Param("const VkShaderCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkShader*", "pShader")]),
 
         Proto("void", "DestroyShader",
             [Param("VkDevice", "device"),
              Param("VkShader", "shader"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreatePipelineCache",
             [Param("VkDevice", "device"),
              Param("const VkPipelineCacheCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkPipelineCache*", "pPipelineCache")]),
 
         Proto("void", "DestroyPipelineCache",
             [Param("VkDevice", "device"),
              Param("VkPipelineCache", "pipelineCache"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "GetPipelineCacheData",
             [Param("VkDevice", "device"),
@@ -567,7 +567,7 @@
 
         Proto("VkResult", "MergePipelineCaches",
             [Param("VkDevice", "device"),
-             Param("VkPipelineCache", "destCache"),
+             Param("VkPipelineCache", "dstCache"),
              Param("uint32_t", "srcCacheCount"),
              Param("const VkPipelineCache*", "pSrcCaches")]),
 
@@ -576,7 +576,7 @@
              Param("VkPipelineCache", "pipelineCache"),
              Param("uint32_t", "createInfoCount"),
              Param("const VkGraphicsPipelineCreateInfo*", "pCreateInfos"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkPipeline*", "pPipelines")]),
 
         Proto("VkResult", "CreateComputePipelines",
@@ -584,66 +584,66 @@
              Param("VkPipelineCache", "pipelineCache"),
              Param("uint32_t", "createInfoCount"),
              Param("const VkComputePipelineCreateInfo*", "pCreateInfos"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkPipeline*", "pPipelines")]),
 
         Proto("void", "DestroyPipeline",
             [Param("VkDevice", "device"),
              Param("VkPipeline", "pipeline"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreatePipelineLayout",
             [Param("VkDevice", "device"),
              Param("const VkPipelineLayoutCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkPipelineLayout*", "pPipelineLayout")]),
 
         Proto("void", "DestroyPipelineLayout",
             [Param("VkDevice", "device"),
              Param("VkPipelineLayout", "pipelineLayout"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateSampler",
             [Param("VkDevice", "device"),
              Param("const VkSamplerCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkSampler*", "pSampler")]),
 
         Proto("void", "DestroySampler",
             [Param("VkDevice", "device"),
              Param("VkSampler", "sampler"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateDescriptorSetLayout",
             [Param("VkDevice", "device"),
              Param("const VkDescriptorSetLayoutCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkDescriptorSetLayout*", "pSetLayout")]),
 
         Proto("void", "DestroyDescriptorSetLayout",
             [Param("VkDevice", "device"),
              Param("VkDescriptorSetLayout", "descriptorSetLayout"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateDescriptorPool",
             [Param("VkDevice", "device"),
              Param("const VkDescriptorPoolCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkDescriptorPool*", "pDescriptorPool")]),
 
         Proto("void", "DestroyDescriptorPool",
             [Param("VkDevice", "device"),
              Param("VkDescriptorPool", "descriptorPool"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "ResetDescriptorPool",
             [Param("VkDevice", "device"),
              Param("VkDescriptorPool", "descriptorPool"),
              Param("VkDescriptorPoolResetFlags", "flags")]),
 
-        Proto("VkResult", "AllocDescriptorSets",
+        Proto("VkResult", "AllocateDescriptorSets",
             [Param("VkDevice", "device"),
-             Param("const VkDescriptorSetAllocInfo*", "pAllocInfo"),
+             Param("const VkDescriptorSetAllocateInfo*", "pAllocateInfo"),
              Param("VkDescriptorSet*", "pDescriptorSets")]),
 
         Proto("VkResult", "FreeDescriptorSets",
@@ -662,24 +662,24 @@
         Proto("VkResult", "CreateFramebuffer",
             [Param("VkDevice", "device"),
              Param("const VkFramebufferCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkFramebuffer*", "pFramebuffer")]),
 
         Proto("void", "DestroyFramebuffer",
             [Param("VkDevice", "device"),
              Param("VkFramebuffer", "framebuffer"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "CreateRenderPass",
             [Param("VkDevice", "device"),
              Param("const VkRenderPassCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
              Param("VkRenderPass*", "pRenderPass")]),
 
         Proto("void", "DestroyRenderPass",
             [Param("VkDevice", "device"),
              Param("VkRenderPass", "renderPass"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("void", "GetRenderAreaGranularity",
             [Param("VkDevice", "device"),
@@ -688,93 +688,93 @@
 
         Proto("VkResult", "CreateCommandPool",
             [Param("VkDevice", "device"),
-             Param("const VkCmdPoolCreateInfo*", "pCreateInfo"),
-             Param("const VkAllocCallbacks*", "pAllocator"),
-             Param("VkCmdPool*", "pCmdPool")]),
+             Param("const VkCommandPoolCreateInfo*", "pCreateInfo"),
+             Param("const VkAllocationCallbacks*", "pAllocator"),
+             Param("VkCommandPool*", "pCommandPool")]),
 
         Proto("void", "DestroyCommandPool",
             [Param("VkDevice", "device"),
-             Param("VkCmdPool", "cmdPool"),
-             Param("const VkAllocCallbacks*", "pAllocator")]),
+             Param("VkCommandPool", "commandPool"),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
 
         Proto("VkResult", "ResetCommandPool",
             [Param("VkDevice", "device"),
-             Param("VkCmdPool", "cmdPool"),
-             Param("VkCmdPoolResetFlags", "flags")]),
+             Param("VkCommandPool", "commandPool"),
+             Param("VkCommandPoolResetFlags", "flags")]),
 
-        Proto("VkResult", "AllocCommandBuffers",
+        Proto("VkResult", "AllocateCommandBuffers",
             [Param("VkDevice", "device"),
-             Param("const VkCmdBufferAllocInfo*", "pAllocInfo"),
-             Param("VkCmdBuffer*", "pCmdBuffers")]),
+             Param("const VkCommandBufferAllocateInfo*", "pAllocateInfo"),
+             Param("VkCommandBuffer*", "pCommandBuffers")]),
 
         Proto("void", "FreeCommandBuffers",
             [Param("VkDevice", "device"),
-             Param("VkCmdPool", "cmdPool"),
+             Param("VkCommandPool", "commandPool"),
              Param("uint32_t", "commandBufferCount"),
-             Param("const VkCmdBuffer*", "pCommandBuffers")]),
+             Param("const VkCommandBuffer*", "pCommandBuffers")]),
 
         Proto("VkResult", "BeginCommandBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("const VkCmdBufferBeginInfo*", "pBeginInfo")]),
+            [Param("VkCommandBuffer", "commandBuffer"),
+             Param("const VkCommandBufferBeginInfo*", "pBeginInfo")]),
 
         Proto("VkResult", "EndCommandBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer")]),
+            [Param("VkCommandBuffer", "commandBuffer")]),
 
         Proto("VkResult", "ResetCommandBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkCmdBufferResetFlags", "flags")]),
+            [Param("VkCommandBuffer", "commandBuffer"),
+             Param("VkCommandBufferResetFlags", "flags")]),
 
         Proto("void", "CmdBindPipeline",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkPipelineBindPoint", "pipelineBindPoint"),
              Param("VkPipeline", "pipeline")]),
 
         Proto("void", "CmdSetViewport",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "viewportCount"),
              Param("const VkViewport*", "pViewports")]),
 
         Proto("void", "CmdSetScissor",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "scissorCount"),
              Param("const VkRect2D*", "pScissors")]),
 
         Proto("void", "CmdSetLineWidth",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("float", "lineWidth")]),
 
         Proto("void", "CmdSetDepthBias",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("float", "depthBiasConstantFactor"),
              Param("float", "depthBiasClamp"),
              Param("float", "depthBiasSlopeFactor")]),
 
         Proto("void", "CmdSetBlendConstants",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("const float[4]", "blendConstants")]),
 
         Proto("void", "CmdSetDepthBounds",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("float", "minDepthBounds"),
              Param("float", "maxDepthBounds")]),
 
         Proto("void", "CmdSetStencilCompareMask",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkStencilFaceFlags", "faceMask"),
              Param("uint32_t", "stencilCompareMask")]),
 
         Proto("void", "CmdSetStencilWriteMask",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkStencilFaceFlags", "faceMask"),
              Param("uint32_t", "stencilWriteMask")]),
 
         Proto("void", "CmdSetStencilReference",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkStencilFaceFlags", "faceMask"),
              Param("uint32_t", "stencilReference")]),
 
         Proto("void", "CmdBindDescriptorSets",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkPipelineBindPoint", "pipelineBindPoint"),
              Param("VkPipelineLayout", "layout"),
              Param("uint32_t", "firstSet"),
@@ -784,27 +784,27 @@
              Param("const uint32_t*", "pDynamicOffsets")]),
 
         Proto("void", "CmdBindIndexBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkBuffer", "buffer"),
              Param("VkDeviceSize", "offset"),
              Param("VkIndexType", "indexType")]),
 
         Proto("void", "CmdBindVertexBuffers",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "startBinding"),
              Param("uint32_t", "bindingCount"),
              Param("const VkBuffer*", "pBuffers"),
              Param("const VkDeviceSize*", "pOffsets")]),
 
         Proto("void", "CmdDraw",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "vertexCount"),
              Param("uint32_t", "instanceCount"),
              Param("uint32_t", "firstVertex"),
              Param("uint32_t", "firstInstance")]),
 
         Proto("void", "CmdDrawIndexed",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "indexCount"),
              Param("uint32_t", "instanceCount"),
              Param("uint32_t", "firstIndex"),
@@ -812,88 +812,88 @@
              Param("uint32_t", "firstInstance")]),
 
         Proto("void", "CmdDrawIndirect",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkBuffer", "buffer"),
              Param("VkDeviceSize", "offset"),
              Param("uint32_t", "drawCount"),
              Param("uint32_t", "stride")]),
 
         Proto("void", "CmdDrawIndexedIndirect",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkBuffer", "buffer"),
              Param("VkDeviceSize", "offset"),
              Param("uint32_t", "drawCount"),
              Param("uint32_t", "stride")]),
 
         Proto("void", "CmdDispatch",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "x"),
              Param("uint32_t", "y"),
              Param("uint32_t", "z")]),
 
         Proto("void", "CmdDispatchIndirect",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkBuffer", "buffer"),
              Param("VkDeviceSize", "offset")]),
 
         Proto("void", "CmdCopyBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkBuffer", "srcBuffer"),
-             Param("VkBuffer", "destBuffer"),
+             Param("VkBuffer", "dstBuffer"),
              Param("uint32_t", "regionCount"),
              Param("const VkBufferCopy*", "pRegions")]),
 
         Proto("void", "CmdCopyImage",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkImage", "srcImage"),
              Param("VkImageLayout", "srcImageLayout"),
-             Param("VkImage", "destImage"),
-             Param("VkImageLayout", "destImageLayout"),
+             Param("VkImage", "dstImage"),
+             Param("VkImageLayout", "dstImageLayout"),
              Param("uint32_t", "regionCount"),
              Param("const VkImageCopy*", "pRegions")]),
 
         Proto("void", "CmdBlitImage",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkImage", "srcImage"),
              Param("VkImageLayout", "srcImageLayout"),
-             Param("VkImage", "destImage"),
-             Param("VkImageLayout", "destImageLayout"),
+             Param("VkImage", "dstImage"),
+             Param("VkImageLayout", "dstImageLayout"),
              Param("uint32_t", "regionCount"),
              Param("const VkImageBlit*", "pRegions"),
              Param("VkFilter", "filter")]),
 
         Proto("void", "CmdCopyBufferToImage",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkBuffer", "srcBuffer"),
-             Param("VkImage", "destImage"),
-             Param("VkImageLayout", "destImageLayout"),
+             Param("VkImage", "dstImage"),
+             Param("VkImageLayout", "dstImageLayout"),
              Param("uint32_t", "regionCount"),
              Param("const VkBufferImageCopy*", "pRegions")]),
 
         Proto("void", "CmdCopyImageToBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkImage", "srcImage"),
              Param("VkImageLayout", "srcImageLayout"),
-             Param("VkBuffer", "destBuffer"),
+             Param("VkBuffer", "dstBuffer"),
              Param("uint32_t", "regionCount"),
              Param("const VkBufferImageCopy*", "pRegions")]),
 
         Proto("void", "CmdUpdateBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkBuffer", "destBuffer"),
-             Param("VkDeviceSize", "destOffset"),
+            [Param("VkCommandBuffer", "commandBuffer"),
+             Param("VkBuffer", "dstBuffer"),
+             Param("VkDeviceSize", "dstOffset"),
              Param("VkDeviceSize", "dataSize"),
              Param("const uint32_t*", "pData")]),
 
         Proto("void", "CmdFillBuffer",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkBuffer", "destBuffer"),
-             Param("VkDeviceSize", "destOffset"),
+            [Param("VkCommandBuffer", "commandBuffer"),
+             Param("VkBuffer", "dstBuffer"),
+             Param("VkDeviceSize", "dstOffset"),
              Param("VkDeviceSize", "size"),
              Param("uint32_t", "data")]),
 
         Proto("void", "CmdClearColorImage",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkImage", "image"),
              Param("VkImageLayout", "imageLayout"),
              Param("const VkClearColorValue*", "pColor"),
@@ -901,7 +901,7 @@
              Param("const VkImageSubresourceRange*", "pRanges")]),
 
         Proto("void", "CmdClearDepthStencilImage",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkImage", "image"),
              Param("VkImageLayout", "imageLayout"),
              Param("const VkClearDepthStencilValue*", "pDepthStencil"),
@@ -909,83 +909,83 @@
              Param("const VkImageSubresourceRange*", "pRanges")]),
 
         Proto("void", "CmdClearAttachments",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "attachmentCount"),
              Param("const VkClearAttachment*", "pAttachments"),
              Param("uint32_t", "rectCount"),
              Param("const VkClearRect*", "pRects")]),
 
         Proto("void", "CmdResolveImage",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkImage", "srcImage"),
              Param("VkImageLayout", "srcImageLayout"),
-             Param("VkImage", "destImage"),
-             Param("VkImageLayout", "destImageLayout"),
+             Param("VkImage", "dstImage"),
+             Param("VkImageLayout", "dstImageLayout"),
              Param("uint32_t", "regionCount"),
              Param("const VkImageResolve*", "pRegions")]),
 
         Proto("void", "CmdSetEvent",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkEvent", "event"),
              Param("VkPipelineStageFlags", "stageMask")]),
 
         Proto("void", "CmdResetEvent",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkEvent", "event"),
              Param("VkPipelineStageFlags", "stageMask")]),
 
         Proto("void", "CmdWaitEvents",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("uint32_t", "eventCount"),
              Param("const VkEvent*", "pEvents"),
              Param("VkPipelineStageFlags", "srcStageMask"),
-             Param("VkPipelineStageFlags", "destStageMask"),
-             Param("uint32_t", "memBarrierCount"),
-             Param("const void* const*", "ppMemBarriers")]),
+             Param("VkPipelineStageFlags", "dstStageMask"),
+             Param("uint32_t", "memoryBarrierCount"),
+             Param("const void* const*", "ppMemoryBarriers")]),
 
         Proto("void", "CmdPipelineBarrier",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkPipelineStageFlags", "srcStageMask"),
-             Param("VkPipelineStageFlags", "destStageMask"),
+             Param("VkPipelineStageFlags", "dstStageMask"),
              Param("VkDependencyFlags", "dependencyFlags"),
-             Param("uint32_t", "memBarrierCount"),
-             Param("const void* const*", "ppMemBarriers")]),
+             Param("uint32_t", "memoryBarrierCount"),
+             Param("const void* const*", "ppMemoryBarriers")]),
 
         Proto("void", "CmdBeginQuery",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkQueryPool", "queryPool"),
              Param("uint32_t", "slot"),
              Param("VkQueryControlFlags", "flags")]),
 
         Proto("void", "CmdEndQuery",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkQueryPool", "queryPool"),
              Param("uint32_t", "slot")]),
 
         Proto("void", "CmdResetQueryPool",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkQueryPool", "queryPool"),
              Param("uint32_t", "startQuery"),
              Param("uint32_t", "queryCount")]),
 
         Proto("void", "CmdWriteTimestamp",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkPipelineStageFlagBits", "pipelineStage"),
              Param("VkQueryPool", "queryPool"),
              Param("uint32_t", "slot")]),
 
         Proto("void", "CmdCopyQueryPoolResults",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkQueryPool", "queryPool"),
              Param("uint32_t", "startQuery"),
              Param("uint32_t", "queryCount"),
-             Param("VkBuffer", "destBuffer"),
-             Param("VkDeviceSize", "destOffset"),
+             Param("VkBuffer", "dstBuffer"),
+             Param("VkDeviceSize", "dstOffset"),
              Param("VkDeviceSize", "stride"),
              Param("VkQueryResultFlags", "flags")]),
 
         Proto("void", "CmdPushConstants",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkPipelineLayout", "layout"),
              Param("VkShaderStageFlags", "stageFlags"),
              Param("uint32_t", "offset"),
@@ -993,21 +993,21 @@
              Param("const void*", "values")]),
 
         Proto("void", "CmdBeginRenderPass",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("const VkRenderPassBeginInfo*", "pRenderPassBegin"),
              Param("VkRenderPassContents", "contents")]),
 
         Proto("void", "CmdNextSubpass",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("VkRenderPassContents", "contents")]),
 
         Proto("void", "CmdEndRenderPass",
-            [Param("VkCmdBuffer", "cmdBuffer")]),
+            [Param("VkCommandBuffer", "commandBuffer")]),
 
         Proto("void", "CmdExecuteCommands",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("uint32_t", "cmdBuffersCount"),
-             Param("const VkCmdBuffer*", "pCmdBuffers")]),
+            [Param("VkCommandBuffer", "commandBuffer"),
+             Param("uint32_t", "commandBuffersCount"),
+             Param("const VkCommandBuffer*", "pCommandBuffers")]),
     ],
 )
 
@@ -1098,11 +1098,11 @@
     objects=[],
     protos=[
         Proto("void", "CmdDbgMarkerBegin",
-            [Param("VkCmdBuffer", "cmdBuffer"),
+            [Param("VkCommandBuffer", "commandBuffer"),
              Param("const char*", "pMarker")]),
 
         Proto("void", "CmdDbgMarkerEnd",
-            [Param("VkCmdBuffer", "cmdBuffer")]),
+            [Param("VkCommandBuffer", "commandBuffer")]),
 
         Proto("VkResult", "DbgSetObjectTag",
             [Param("VkDevice", "device"),
@@ -1126,11 +1126,11 @@
     "VkPhysicalDevice",
     "VkDevice",
     "VkQueue",
-    "VkCmdBuffer",
+    "VkCommandBuffer",
 ]
 
 object_non_dispatch_list = [
-    "VkCmdPool",
+    "VkCommandPool",
     "VkFence",
     "VkDeviceMemory",
     "VkBuffer",