diff --git a/layersvt/VkLayer_api_dump.def b/layersvt/VkLayer_api_dump.def
index 87234565b3..d7fa87c8f4 100644
--- a/layersvt/VkLayer_api_dump.def
+++ b/layersvt/VkLayer_api_dump.def
@@ -27,5 +27,5 @@ vkGetInstanceProcAddr
 vkGetDeviceProcAddr
 vkEnumerateInstanceLayerProperties
 vkEnumerateInstanceExtensionProperties
-vkEnumerateDeviceExtensionProperties
+layer_vkEnumerateDeviceExtensionProperties
 vkEnumerateDeviceLayerProperties
diff --git a/layersvt/api_dump_handwritten_functions.h b/layersvt/api_dump_handwritten_functions.h
index 57bd193096..144c59f5cb 100644
--- a/layersvt/api_dump_handwritten_functions.h
+++ b/layersvt/api_dump_handwritten_functions.h
@@ -164,10 +164,10 @@ EXPORT_FUNCTION VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionPrope
     }
 }
 
-EXPORT_FUNCTION VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
-                                                                                    const char* pLayerName,
-                                                                                    uint32_t* pPropertyCount,
-                                                                                    VkExtensionProperties* pProperties) {
+EXPORT_FUNCTION VKAPI_ATTR VkResult VKAPI_CALL layer_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
+                                                                                          const char* pLayerName,
+                                                                                          uint32_t* pPropertyCount,
+                                                                                          VkExtensionProperties* pProperties) {
     static const VkExtensionProperties extensionProperties[] = {{
         "VK_EXT_tooling_info",
         1,
diff --git a/layersvt/generated/api_dump_dispatch.h b/layersvt/generated/api_dump_dispatch.h
index f6e651daf9..d7b0a89a09 100644
--- a/layersvt/generated/api_dump_dispatch.h
+++ b/layersvt/generated/api_dump_dispatch.h
@@ -16513,7 +16513,7 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL api_dump_known_instance_functions(VkIns
     if (strcmp(pName, "vkEnumerateInstanceExtensionProperties") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceExtensionProperties);
     if (strcmp(pName, "vkEnumerateDeviceExtensionProperties") == 0)
-        return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateDeviceExtensionProperties);
+        return reinterpret_cast<PFN_vkVoidFunction>(layer_vkEnumerateDeviceExtensionProperties);
     if (strcmp(pName, "vkEnumerateInstanceLayerProperties") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceLayerProperties);
     if (strcmp(pName, "vkEnumerateDeviceLayerProperties") == 0)
diff --git a/scripts/generators/api_dump_generator.py b/scripts/generators/api_dump_generator.py
index ee528a5c84..8a5a9b215e 100644
--- a/scripts/generators/api_dump_generator.py
+++ b/scripts/generators/api_dump_generator.py
@@ -522,7 +522,7 @@ def generate_dispatch_codegen(self):
             self.write(f'if(strcmp(pName, "{command.name}") == 0)')
             if command.name in NON_TEMPLATEDTED_FUNCTIONS:
                 cmd = command.name
-                if cmd == 'vkGetInstanceProcAddr':
+                if cmd in ['vkGetInstanceProcAddr','vkEnumerateDeviceExtensionProperties']:
                     cmd = 'layer_' + cmd
                 self.write(f'return reinterpret_cast<PFN_vkVoidFunction>({cmd});')
             else: