diff --git a/layersvt/cputiming_handwritten_functions.h b/layersvt/cputiming_handwritten_functions.h
index afc1eb9217..a7b74d87e9 100644
--- a/layersvt/cputiming_handwritten_functions.h
+++ b/layersvt/cputiming_handwritten_functions.h
@@ -107,7 +107,7 @@ EXPORT_FUNCTION VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerPropertie
                                                                                   VkLayerProperties* pProperties) {
     Timer timer(CPUTimingCategory::Other, "vkEnumerateInstanceLayerProperties");
     static const VkLayerProperties layerProperties[] = {{
-        "CPUTiming",
+        "VK_LAYER_GOOGLE_CPUTiming",
         VK_MAKE_VERSION(1, 4, VK_HEADER_VERSION),  // specVersion
         VK_MAKE_VERSION(0, 2, 0),                  // implementationVersion
         "layer: CPUTiming",
@@ -121,7 +121,7 @@ EXPORT_FUNCTION VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(
                                                                                 VkLayerProperties* pProperties) {
     Timer timer(CPUTimingCategory::VkPhysicalDevice, "vkEnumerateDeviceLayerProperties");
     static const VkLayerProperties layerProperties[] = {{
-        "CPUTiming",
+        "VK_LAYER_GOOGLE_CPUTiming",
         VK_MAKE_VERSION(1, 4, VK_HEADER_VERSION),
         VK_MAKE_VERSION(0, 2, 0),
         "layer: CPUTiming",
diff --git a/layersvt/json/VkLayer_CPUTiming.json.in b/layersvt/json/VkLayer_CPUTiming.json.in
index caa24d0b84..25456f3e8d 100644
--- a/layersvt/json/VkLayer_CPUTiming.json.in
+++ b/layersvt/json/VkLayer_CPUTiming.json.in
@@ -1,7 +1,7 @@
 {
     "file_format_version" : "1.2.0",
     "layer": {
-        "name": "CPUTiming",
+        "name": "VK_LAYER_GOOGLE_CPUTiming",
         "type": "GLOBAL",
         "library_path": "@JSON_LIBRARY_PATH@",
         "api_version": "@JSON_VERSION@",
diff --git a/layersvt/test/test_cputiming.cpp b/layersvt/test/test_cputiming.cpp
index b4e55d0d16..89fad3b46d 100644
--- a/layersvt/test/test_cputiming.cpp
+++ b/layersvt/test/test_cputiming.cpp
@@ -20,7 +20,7 @@
 
 #include <gtest/gtest.h>
 
-static const char* kLayerName = "CPUTiming";
+static const char* kLayerName = "VK_LAYER_GOOGLE_CPUTiming";
 
 class CpuTimingTests : public VkTestFramework {
    public:
diff --git a/scripts/github_ci_linux.py b/scripts/github_ci_linux.py
old mode 100644
new mode 100755