diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index fbaf0a4..632947a 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -240,7 +240,7 @@
     }
 };
 
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
         const char *pLayerName,
         uint32_t *pCount,
         VkExtensionProperties* pProperties)
@@ -249,7 +249,7 @@
     return util_GetExtensionProperties(0, NULL, pCount, pProperties);
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalLayerProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties(
         uint32_t *pCount,
         VkLayerProperties*    pProperties)
 {
@@ -258,7 +258,7 @@
                                    pCount, pProperties);
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties(
         VkPhysicalDevice                            physicalDevice,
         const char*                                 pLayerName,
         uint32_t*                                   pCount,
@@ -268,7 +268,7 @@
     return util_GetExtensionProperties(0, NULL, pCount, pProperties);
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceLayerProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties(
         VkPhysicalDevice                            physicalDevice,
         uint32_t*                                   pCount,
         VkLayerProperties*                          pProperties)
@@ -1117,10 +1117,10 @@
 
     ADD_HOOK(vkCreateInstance);
     ADD_HOOK(vkDestroyInstance);
-    ADD_HOOK(vkGetGlobalExtensionProperties);
-    ADD_HOOK(vkGetPhysicalDeviceExtensionProperties);
-    ADD_HOOK(vkGetGlobalLayerProperties);
-    ADD_HOOK(vkGetPhysicalDeviceLayerProperties);
+    ADD_HOOK(vkEnumerateInstanceExtensionProperties);
+    ADD_HOOK(vkEnumerateDeviceExtensionProperties);
+    ADD_HOOK(vkEnumerateInstanceLayerProperties);
+    ADD_HOOK(vkEnumerateDeviceLayerProperties);
 #undef ADD_HOOK