Layers: changed layer names to conform to spec
diff --git a/layers/device_limits.h b/layers/device_limits.h
index 77de294..ea73b43 100644
--- a/layers/device_limits.h
+++ b/layers/device_limits.h
@@ -24,7 +24,7 @@
  */
 #include "vulkan/vk_layer.h"
 #include <vector>
-#include "vulkan/vk_debug_report_lunarg.h"
+#include "vulkan/vk_lunarg_debug_report.h"
 
 using namespace std;
 
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 3b3e140..ce77bea 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -26,7 +26,7 @@
 #include "vulkan/vk_layer.h"
 #include <vector>
 #include <memory>
-#include "vulkan/vk_debug_report_lunarg.h"
+#include "vulkan/vk_lunarg_debug_report.h"
 
 using namespace std;
 
diff --git a/layers/linux/api_dump.json b/layers/linux/api_dump.json
index 66b349d..a2de51a 100644
--- a/layers/linux/api_dump.json
+++ b/layers/linux/api_dump.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "APIDump",
+        "name": "VK_LAYER_LUNARG_APIDump",
         "type": "GLOBAL",
         "library_path": "./libVKLayerAPIDump.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG debug layer"
     }
 }
diff --git a/layers/linux/basic.json b/layers/linux/basic.json
index 0fa81d3..9d051f5 100644
--- a/layers/linux/basic.json
+++ b/layers/linux/basic.json
@@ -1,15 +1,15 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Basic",
+        "name": "VK_LAYER_LUNARG_Basic",
         "type": "GLOBAL",
         "library_path": "./libVKLayerBasic.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample Layer",
         "device_extensions": [
              {
-                 "name": "vkLayerExtension1",
+                 "name": "VK_LUNARG_LayerExtension1",
                  "spec_version": "0"
              }
          ]
diff --git a/layers/linux/device_limits.json b/layers/linux/device_limits.json
index ddcdc84..db4ae5c 100644
--- a/layers/linux/device_limits.json
+++ b/layers/linux/device_limits.json
@@ -1,15 +1,15 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "DeviceLimits",
+        "name": "VK_LAYER_LUNARG_DeviceLimits",
         "type": "GLOBAL",
         "library_path": "./libVKLayerDeviceLimits.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "device_extensions": [
              {
-                 "name": "DEBUG_MARKER",
+                 "name": "VK_LUNARG_DEBUG_MARKER",
                  "spec_version": "0"
              }
          ]
diff --git a/layers/linux/draw_state.json b/layers/linux/draw_state.json
index 39d0bc5..0dfe556 100644
--- a/layers/linux/draw_state.json
+++ b/layers/linux/draw_state.json
@@ -1,15 +1,15 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "DrawState",
+        "name": "VK_LAYER_LUNARG_DrawState",
         "type": "GLOBAL",
         "library_path": "./libVKLayerDrawState.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "device_extensions": [
              {
-                 "name": "DEBUG_MARKER",
+                 "name": "VK_LUNARG_DEBUG_MARKER",
                  "spec_version": "0"
              }
          ]
diff --git a/layers/linux/generic.json b/layers/linux/generic.json
index 823780f..44ec124 100644
--- a/layers/linux/generic.json
+++ b/layers/linux/generic.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Generic",
+        "name": "VK_LAYER_LUNARG_Generic",
         "type": "GLOBAL",
         "library_path": "./libVKLayerGeneric.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample Layer"
     }
 }
diff --git a/layers/linux/image.json b/layers/linux/image.json
index d0c56a4..e765de7 100644
--- a/layers/linux/image.json
+++ b/layers/linux/image.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Image",
+        "name": "VK_LAYER_LUNARG_Image",
         "type": "GLOBAL",
         "library_path": "./libVKLayerImage.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/linux/mem_tracker.json b/layers/linux/mem_tracker.json
index e444dfe..20d8371 100644
--- a/layers/linux/mem_tracker.json
+++ b/layers/linux/mem_tracker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "MemTracker",
+        "name": "VK_LAYER_LUNARG_MemTracker",
         "type": "GLOBAL",
         "library_path": "./libVKLayerMemTracker.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/linux/multi.json b/layers/linux/multi.json
index 3039933..610b302 100644
--- a/layers/linux/multi.json
+++ b/layers/linux/multi.json
@@ -1,22 +1,22 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "multi1",
+        "name": "VK_LAYER_LUNARG_multi1",
         "type": "DEVICE",
         "library_path": "./libVKLayerMulti.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample multiple layer per library",
         "functions" : {
           "vkGetDeviceProcAddr" : "multi1GetDeviceProcAddr"
         }
     },
     "layer" : {
-        "name": "multi2",
+        "name": "VK_LUNARG_multi2",
         "type": "INSTANCE",
         "library_path": "./libVKLayerMulti.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample multiple layer per library",
         "functions" : {
           "vkGetInstanceProcAddr" : "multi2GetInstanceProcAddr"
diff --git a/layers/linux/object_tracker.json b/layers/linux/object_tracker.json
index e094d1c..486327d 100644
--- a/layers/linux/object_tracker.json
+++ b/layers/linux/object_tracker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ObjectTracker",
+        "name": "VK_LAYER_LUNARG_ObjectTracker",
         "type": "GLOBAL",
         "library_path": "./libVKLayerObjectTracker.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/linux/param_checker.json b/layers/linux/param_checker.json
index f83ebcd..8ba8981 100644
--- a/layers/linux/param_checker.json
+++ b/layers/linux/param_checker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ParamChecker",
+        "name": "VK_LAYER_LUNARG_ParamChecker",
         "type": "GLOBAL",
         "library_path": "./libVKLayerParamChecker.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/linux/screenshot.json b/layers/linux/screenshot.json
index cb98198..4b622da 100644
--- a/layers/linux/screenshot.json
+++ b/layers/linux/screenshot.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ScreenShot",
+        "name": "VK_LAYER_LUNARG_ScreenShot",
         "type": "GLOBAL",
         "library_path": "./libVKLayerScreenShot.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG image capture layer"
     }
 }
diff --git a/layers/linux/shader_checker.json b/layers/linux/shader_checker.json
index 58cd034..946dbde 100644
--- a/layers/linux/shader_checker.json
+++ b/layers/linux/shader_checker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ShaderChecker",
+        "name": "VK_LAYER_LUNARG_ShaderChecker",
         "type": "GLOBAL",
         "library_path": "./libVKLayerShaderChecker.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/linux/swapchain.json b/layers/linux/swapchain.json
index d333bf7..0ec4f0b 100644
--- a/layers/linux/swapchain.json
+++ b/layers/linux/swapchain.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Swapchain",
+        "name": "VK_LAYER_LUNARG_Swapchain",
         "type": "GLOBAL",
         "library_path": "./libVKLayerSwapchain.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/linux/threading.json b/layers/linux/threading.json
index cab7bef..3815a18 100644
--- a/layers/linux/threading.json
+++ b/layers/linux/threading.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Threading",
+        "name": "VK_LAYER_LUNARG_Threading",
         "type": "GLOBAL",
         "library_path": "./libVKLayerThreading.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/mem_tracker.h b/layers/mem_tracker.h
index cfc3342..d32690b 100644
--- a/layers/mem_tracker.h
+++ b/layers/mem_tracker.h
@@ -26,7 +26,7 @@
 #pragma once
 #include <vector>
 #include "vulkan/vk_layer.h"
-#include "vulkan/vk_debug_report_lunarg.h"
+#include "vulkan/vk_lunarg_debug_report.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/layers/shader_checker.h b/layers/shader_checker.h
index 6a1ef65..47806f4 100644
--- a/layers/shader_checker.h
+++ b/layers/shader_checker.h
@@ -23,7 +23,7 @@
  * Author: Chris Forbes <chrisf@ijw.co.nz>
  */
 #include "vulkan/vk_layer.h"
-#include "vulkan/vk_debug_report_lunarg.h"
+#include "vulkan/vk_lunarg_debug_report.h"
 #include "vk_layer_logging.h"
 
 /* Shader checker error codes */
diff --git a/layers/swapchain.h b/layers/swapchain.h
index 3820f92..da918ca 100644
--- a/layers/swapchain.h
+++ b/layers/swapchain.h
@@ -28,7 +28,7 @@
 #define SWAPCHAIN_H
 
 #include "vulkan/vk_layer.h"
-#include "vulkan/vk_debug_report_lunarg.h"
+#include "vulkan/vk_lunarg_debug_report.h"
 #include "vk_layer_config.h"
 #include "vk_layer_logging.h"
 #include <vector>
diff --git a/layers/windows/api_dump.json b/layers/windows/api_dump.json
index 915d04e..db86b69 100644
--- a/layers/windows/api_dump.json
+++ b/layers/windows/api_dump.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "APIDump",
+        "name": "VK_LAYER_LUNARG_APIDump",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerAPIDump.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG debug layer"
     }
 }
diff --git a/layers/windows/basic.json b/layers/windows/basic.json
index deb928c..d7a224f 100644
--- a/layers/windows/basic.json
+++ b/layers/windows/basic.json
@@ -1,15 +1,15 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Basic",
+        "name": "VK_LAYER_LUNARG_Basic",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerBasic.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample Layer",
         "device_extensions": [
              {
-                 "name": "vkLayerExtension1",
+                 "name": "VK_LUNARG_LayerExtension1",
                  "spec_version": "0"
              }
          ]
diff --git a/layers/windows/device_limits.json b/layers/windows/device_limits.json
index 2c7bfa8..37e0e35 100644
--- a/layers/windows/device_limits.json
+++ b/layers/windows/device_limits.json
@@ -1,15 +1,15 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "DeviceLimits",
+        "name": "VK_LAYER_LUNARG_DeviceLimits",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerDeviceLimits.",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "device_extensions": [
              {
-                 "name": "DEBUG_MARKER",
+                 "name": "VK_LUNARG_DEBUG_MARKER",
                  "spec_version": "0"
              }
          ]
diff --git a/layers/windows/draw_state.json b/layers/windows/draw_state.json
index 0899f83..b7f70ae 100644
--- a/layers/windows/draw_state.json
+++ b/layers/windows/draw_state.json
@@ -1,15 +1,15 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "DrawState",
+        "name": "VK_LAYER_LUNARG_DrawState",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerDrawState.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "device_extensions": [
              {
-                 "name": "DEBUG_MARKER",
+                 "name": "VK_LUNARG_DEBUG_MARKER",
                  "spec_version": "0"
              }
          ]
diff --git a/layers/windows/generic.json b/layers/windows/generic.json
index 823780f..44ec124 100644
--- a/layers/windows/generic.json
+++ b/layers/windows/generic.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Generic",
+        "name": "VK_LAYER_LUNARG_Generic",
         "type": "GLOBAL",
         "library_path": "./libVKLayerGeneric.so",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample Layer"
     }
 }
diff --git a/layers/windows/image.json b/layers/windows/image.json
index f5c78b3..47a0ef9 100644
--- a/layers/windows/image.json
+++ b/layers/windows/image.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Image",
+        "name": "VK_LAYER_LUNARG_Image",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerImage.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/windows/mem_tracker.json b/layers/windows/mem_tracker.json
index 61875c2..8338bcb 100644
--- a/layers/windows/mem_tracker.json
+++ b/layers/windows/mem_tracker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "MemTracker",
+        "name": "VK_LAYER_LUNARG_MemTracker",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerMemTracker.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/windows/multi.json b/layers/windows/multi.json
index 8316610..856d4b7 100644
--- a/layers/windows/multi.json
+++ b/layers/windows/multi.json
@@ -1,22 +1,22 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "multi1",
+        "name": "VK_LAYER_LUNARG_multi1",
         "type": "DEVICE",
         "library_path": ".\\VKLayerMulti.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample multiple layer per library",
         "functions" : {
           "vkGetDeviceProcAddr" : "multi1GetDeviceProcAddr"
         }
     },
     "layer" : {
-        "name": "multi2",
+        "name": "VK_LAYER_LUNARG_multi2",
         "type": "INSTANCE",
         "library_path": ".\\VKLayerMulti.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Sample multiple layer per library",
         "functions" : {
           "vkGetInstanceProcAddr" : "multi2GetInstanceProcAddr"
diff --git a/layers/windows/object_tracker.json b/layers/windows/object_tracker.json
index 25c84aa..60a5e89 100644
--- a/layers/windows/object_tracker.json
+++ b/layers/windows/object_tracker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ObjectTracker",
+        "name": "VK_LAYER_LUNARG_ObjectTracker",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerObjectTracker.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/windows/param_checker.json b/layers/windows/param_checker.json
index 6553f61..1c1c158 100644
--- a/layers/windows/param_checker.json
+++ b/layers/windows/param_checker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ParamChecker",
+        "name": "VK_LAYER_LUNARG_ParamChecker",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerParamChecker.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/windows/screenshot.json b/layers/windows/screenshot.json
index 2fa8c17..3de9211 100644
--- a/layers/windows/screenshot.json
+++ b/layers/windows/screenshot.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ScreenShot",
+        "name": "VK_LAYER_LUNARG_ScreenShot",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerScreenShot.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG image capture layer"
     }
 }
diff --git a/layers/windows/shader_checker.json b/layers/windows/shader_checker.json
index abefb06..57975d1 100644
--- a/layers/windows/shader_checker.json
+++ b/layers/windows/shader_checker.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "ShaderChecker",
+        "name": "VK_LAYER_LUNARG_ShaderChecker",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerShaderChecker.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/windows/swapchain.json b/layers/windows/swapchain.json
index dbba897..f9ed3af 100644
--- a/layers/windows/swapchain.json
+++ b/layers/windows/swapchain.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Swapchain",
+        "name": "VK_LAYER_LUNARG_Swapchain",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerSwapchain.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }
diff --git a/layers/windows/threading.json b/layers/windows/threading.json
index 2a7f715..056cfef 100644
--- a/layers/windows/threading.json
+++ b/layers/windows/threading.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "1.0.0",
     "layer" : {
-        "name": "Threading",
+        "name": "VK_LAYER_LUNARG_Threading",
         "type": "GLOBAL",
         "library_path": ".\\VKLayerThreading.dll",
         "api_version": "0.210.0",
-        "implementation_version": "0",
+        "implementation_version": "1",
         "description": "LunarG Validation Layer"
     }
 }