diff --git a/include/vulkan/vk_lunarg_debug_marker.h b/include/vulkan/vk_lunarg_debug_marker.h
index 3887bbf..9e42780 100644
--- a/include/vulkan/vk_lunarg_debug_marker.h
+++ b/include/vulkan/vk_lunarg_debug_marker.h
@@ -47,7 +47,7 @@
 ***************************************************************************************************
 */
 
-#define DEBUG_MARKER_EXTENSION_NAME "DEBUG_MARKER"
+#define DEBUG_MARKER_EXTENSION_NAME "VK_LUNARG_DEBUG_MARKER"
 
 // ------------------------------------------------------------------------------------------------
 // Enumerations
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 4cccdd1..590f4bb 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2645,8 +2645,9 @@
         }
         if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], DEBUG_MARKER_EXTENSION_NAME) == 0) {
             /* Found a matching extension name, mark it enabled and init dispatch table*/
-            initDebugMarkerTable(device);
             dev_data->device_extensions.debug_marker_enabled = true;
+            initDebugMarkerTable(device);
+
         }
     }
 }