diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index 2159123ff0b..34e4268f5c9 100644
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -234,4 +234,4 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     gen_extensions('radv', args.xml_files, API_VERSIONS, MAX_API_VERSION,
-                   EXTENSIONS, args.out_c, args.out_h, type_prefix='vk')
+                   EXTENSIONS, args.out_c, args.out_h)
diff --git a/src/broadcom/vulkan/v3dv_extensions_gen.py b/src/broadcom/vulkan/v3dv_extensions_gen.py
index 701d1071b80..f60e564b993 100644
--- a/src/broadcom/vulkan/v3dv_extensions_gen.py
+++ b/src/broadcom/vulkan/v3dv_extensions_gen.py
@@ -49,4 +49,4 @@ if __name__ == '__main__':
     ]
 
     gen_extensions('v3dv', args.xml_files, API_VERSIONS, MAX_API_VERSION,
-                   EXTENSIONS, args.out_c, args.out_h, type_prefix='vk')
+                   EXTENSIONS, args.out_c, args.out_h)
diff --git a/src/freedreno/vulkan/tu_extensions.py b/src/freedreno/vulkan/tu_extensions.py
index 655c2105bff..d1fd461a532 100644
--- a/src/freedreno/vulkan/tu_extensions.py
+++ b/src/freedreno/vulkan/tu_extensions.py
@@ -119,4 +119,4 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     gen_extensions('tu', args.xml_files, API_VERSIONS, MAX_API_VERSION,
-                   EXTENSIONS, args.out_c, args.out_h, type_prefix='vk')
+                   EXTENSIONS, args.out_c, args.out_h)
diff --git a/src/gallium/frontends/lavapipe/lvp_extensions.py b/src/gallium/frontends/lavapipe/lvp_extensions.py
index 349a6ea7ea0..b20e9ba2cd6 100644
--- a/src/gallium/frontends/lavapipe/lvp_extensions.py
+++ b/src/gallium/frontends/lavapipe/lvp_extensions.py
@@ -184,4 +184,4 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     gen_extensions('lvp', args.xml_files, API_VERSIONS, MAX_API_VERSION,
-                   EXTENSIONS, args.out_c, args.out_h, type_prefix='vk')
+                   EXTENSIONS, args.out_c, args.out_h)
diff --git a/src/intel/vulkan/anv_extensions_gen.py b/src/intel/vulkan/anv_extensions_gen.py
index 46f97697ce9..3b49c8a5f50 100644
--- a/src/intel/vulkan/anv_extensions_gen.py
+++ b/src/intel/vulkan/anv_extensions_gen.py
@@ -50,5 +50,4 @@ if __name__ == '__main__':
     ]
 
     gen_extensions('anv', args.xml_files, API_VERSIONS, MAX_API_VERSION,
-                   EXTENSIONS, args.out_c, args.out_h, includes,
-                   type_prefix='vk')
+                   EXTENSIONS, args.out_c, args.out_h, includes)
diff --git a/src/vulkan/util/vk_extensions_gen.py b/src/vulkan/util/vk_extensions_gen.py
index 4c74b45485c..5521b965c3d 100644
--- a/src/vulkan/util/vk_extensions_gen.py
+++ b/src/vulkan/util/vk_extensions_gen.py
@@ -41,16 +41,14 @@ _TEMPLATE_H = Template(COPYRIGHT + """
 #include "${include}"
 %endfor
 
-%if type_prefix == 'vk' and driver != 'vk':
-#include "vk_extensions.h"
-%else:
-#define ${driver.upper()}_INSTANCE_EXTENSION_COUNT ${len(instance_extensions)}
+%if driver == 'vk':
+#define VK_INSTANCE_EXTENSION_COUNT ${len(instance_extensions)}
 
-extern const VkExtensionProperties ${driver}_instance_extensions[];
+extern const VkExtensionProperties vk_instance_extensions[];
 
-struct ${driver}_instance_extension_table {
+struct vk_instance_extension_table {
    union {
-      bool extensions[${driver.upper()}_INSTANCE_EXTENSION_COUNT];
+      bool extensions[VK_INSTANCE_EXTENSION_COUNT];
       struct {
 %for ext in instance_extensions:
          bool ${ext.name[3:]};
@@ -60,13 +58,13 @@ struct ${driver}_instance_extension_table {
 };
 
 
-#define ${driver.upper()}_DEVICE_EXTENSION_COUNT ${len(device_extensions)}
+#define VK_DEVICE_EXTENSION_COUNT ${len(device_extensions)}
 
-extern const VkExtensionProperties ${driver}_device_extensions[];
+extern const VkExtensionProperties vk_device_extensions[];
 
-struct ${driver}_device_extension_table {
+struct vk_device_extension_table {
    union {
-      bool extensions[${driver.upper()}_DEVICE_EXTENSION_COUNT];
+      bool extensions[VK_DEVICE_EXTENSION_COUNT];
       struct {
 %for ext in device_extensions:
         bool ${ext.name[3:]};
@@ -74,16 +72,18 @@ struct ${driver}_device_extension_table {
       };
    };
 };
+%else:
+#include "vk_extensions.h"
 %endif
 
 struct ${driver}_physical_device;
 
 %if driver != 'vk':
-extern const struct ${type_prefix}_instance_extension_table ${driver}_instance_extensions_supported;
+extern const struct vk_instance_extension_table ${driver}_instance_extensions_supported;
 
 void
 ${driver}_physical_device_get_supported_extensions(const struct ${driver}_physical_device *device,
-                                             struct ${type_prefix}_device_extension_table *extensions);
+                                             struct vk_device_extension_table *extensions);
 %endif
 
 #endif /* ${driver.upper()}_EXTENSIONS_H */
@@ -98,7 +98,7 @@ _TEMPLATE_C = Template(COPYRIGHT + """
 
 #include "${driver}_extensions.h"
 
-%if type_prefix != 'vk' or driver == 'vk':
+%if driver == 'vk':
 const VkExtensionProperties ${driver}_instance_extensions[${driver.upper()}_INSTANCE_EXTENSION_COUNT] = {
 %for ext in instance_extensions:
    {"${ext.name}", ${ext.ext_version}},
@@ -148,7 +148,7 @@ VkResult ${driver}_EnumerateInstanceVersion(
     return VK_SUCCESS;
 }
 
-const struct ${type_prefix}_instance_extension_table ${driver}_instance_extensions_supported = {
+const struct vk_instance_extension_table ${driver}_instance_extensions_supported = {
 %for ext in instance_extensions:
    .${ext.name[3:]} = ${get_extension_condition(ext.name, ext.enable)},
 %endfor
@@ -174,9 +174,9 @@ ${driver}_physical_device_api_version(struct ${driver}_physical_device *device)
 
 void
 ${driver}_physical_device_get_supported_extensions(const struct ${driver}_physical_device *device,
-                                                   struct ${type_prefix}_device_extension_table *extensions)
+                                                   struct vk_device_extension_table *extensions)
 {
-   *extensions = (struct ${type_prefix}_device_extension_table) {
+   *extensions = (struct vk_device_extension_table) {
 %for ext in device_extensions:
       .${ext.name[3:]} = ${get_extension_condition(ext.name, ext.enable)},
 %endfor
@@ -186,7 +186,7 @@ ${driver}_physical_device_get_supported_extensions(const struct ${driver}_physic
 """)
 
 def gen_extensions(driver, xml_files, api_versions, max_api_version,
-                   extensions, out_c, out_h, includes = [], type_prefix = None):
+                   extensions, out_c, out_h, includes = []):
     platform_defines = []
     for filename in xml_files:
         init_exts_from_xml(filename, extensions, platform_defines)
@@ -194,12 +194,8 @@ def gen_extensions(driver, xml_files, api_versions, max_api_version,
     for ext in extensions:
         assert ext.type == 'instance' or ext.type == 'device'
 
-    if type_prefix is None:
-        type_prefix = driver
-
     template_env = {
         'driver': driver,
-        'type_prefix': type_prefix,
         'API_VERSIONS': api_versions,
         'MAX_API_VERSION': max_api_version,
         'instance_extensions': [e for e in extensions if e.type == 'instance'],