diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 0aafb2b..f363ed2 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -168,7 +168,7 @@
         "VK_LAYER_LUNARG_device_limits",
         VK_API_VERSION,
         1,
-        "Validation layer: Device Limits",
+        "LunarG Validation Layer",
     }
 };
 
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index fadb98f..b957ff5 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -3621,7 +3621,7 @@
         "VK_LAYER_LUNARG_draw_state",
         VK_API_VERSION,
         1,
-        "Validation layer: draw_state",
+        "LunarG Validation Layer",
     }
 };
 
@@ -3646,7 +3646,7 @@
         "VK_LAYER_LUNARG_draw_state",
         VK_API_VERSION,
         1,
-        "Validation layer: draw_state",
+        "LunarG Validation Layer",
     }
 };
 
diff --git a/layers/image.cpp b/layers/image.cpp
index 60b8569..56197c9 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -263,7 +263,7 @@
         "VK_LAYER_LUNARG_image",
         VK_API_VERSION,
         1,
-        "Validation layer: image",
+        "LunarG Validation Layer",
     }
 };
 
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 76fee5c..930df00 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1292,7 +1292,7 @@
         "VK_LAYER_LUNARG_mem_tracker",
         VK_API_VERSION,
         1,
-        "Validation layer: mem_tracker",
+        "LunarG Validation Layer",
     }
 };
 
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 9ed3a35..692723b 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -193,7 +193,7 @@
         "VK_LAYER_LUNARG_param_checker",
         VK_API_VERSION,
         1,
-        "Validation layer: param_checker",
+        "LunarG Validation Layer",
     }
 };
 
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 2fffbab..68a8738 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -64,7 +64,7 @@
         "VK_LAYER_LUNARG_swapchain",
         VK_API_VERSION,
         1,
-        "Validation layer: swapchain",
+        "LunarG Validation Layer",
     }
 };
 
diff --git a/layers/threading.cpp b/layers/threading.cpp
index db59aa9..032e7c8 100644
--- a/layers/threading.cpp
+++ b/layers/threading.cpp
@@ -204,7 +204,7 @@
         "Threading",
         VK_API_VERSION, // specVersion
         VK_MAKE_VERSION(0, 1, 0), // implVersion
-        "layer: Threading",
+        "Google Validation Layer",
     }
 };
 
@@ -219,9 +219,10 @@
         "Threading",
         VK_API_VERSION,
         VK_MAKE_VERSION(0, 1, 0),
-        "layer: Threading",
+        "Google Validation Layer",
     }
 };
+
 VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pCount, VkLayerProperties* pProperties)
 {
     return util_GetLayerProperties(ARRAY_SIZE(deviceLayerProps), deviceLayerProps, pCount, pProperties);
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 9499d66..8f44ee1 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -387,7 +387,7 @@
         ggep_body.append('        "VK_LAYER_LUNARG_%s",' % layer_name)
         ggep_body.append('        VK_API_VERSION, // specVersion')
         ggep_body.append('        1, // implementationVersion')
-        ggep_body.append('        "layer: %s",' % layer)
+        ggep_body.append('        "LunarG Validation Layer"')
         ggep_body.append('    }')
         ggep_body.append('};')
         ggep_body.append('')
@@ -407,7 +407,7 @@
         gpdlp_body.append('        "VK_LAYER_LUNARG_%s",' % layer)
         gpdlp_body.append('        VK_API_VERSION,')
         gpdlp_body.append('        1,')
-        gpdlp_body.append('        "layer: %s",' % layer)
+        gpdlp_body.append('        "LunarG Validation Layer"')
         gpdlp_body.append('    }')
         gpdlp_body.append('};')
         gpdlp_body.append('VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pCount, VkLayerProperties* pProperties)')