Merge "Rename Vulkan functor items to match style"