diff --git a/include/vk_debug_marker_layer.h b/include/vk_debug_marker_layer.h
index 6de0ebf..d9b1d7d 100644
--- a/include/vk_debug_marker_layer.h
+++ b/include/vk_debug_marker_layer.h
@@ -32,7 +32,7 @@
 
 #include "vulkan.h"
 #include "vk_debug_marker_lunarg.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 
 
 typedef struct VkLayerDebugMarkerDispatchTable_
diff --git a/include/vkIcd.h b/include/vk_icd.h
similarity index 100%
rename from include/vkIcd.h
rename to include/vk_icd.h
diff --git a/include/vkLayer.h b/include/vk_layer.h
similarity index 100%
rename from include/vkLayer.h
rename to include/vk_layer.h
diff --git a/layers/basic.cpp b/layers/basic.cpp
index de2755b..b9bf17d 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include "loader_platform.h"
 #include "vk_dispatch_table_helper.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "layers_table.h"
 // The following is #included again to catch certain OS-specific functions
 // being used:
diff --git a/layers/draw_state.h b/layers/draw_state.h
index c46a28a..fb62fb1 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include <vector>
 
 using namespace std;
diff --git a/layers/image.cpp b/layers/image.cpp
index d2c449e..8012e9b 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -32,7 +32,7 @@
 #include <unordered_map>
 
 #include "loader_platform.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "layers_config.h"
 #include "vk_enum_validate_helper.h"
 #include "vk_struct_validate_helper.h"
diff --git a/layers/layer_logging.h b/layers/layer_logging.h
index 68f5f89..8a7e292 100644
--- a/layers/layer_logging.h
+++ b/layers/layer_logging.h
@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <unordered_map>
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "layer_data.h"
 #include "layers_table.h"
 
diff --git a/layers/layers_config.cpp b/layers/layers_config.cpp
index 642e0b4..ad49e4d 100644
--- a/layers/layers_config.cpp
+++ b/layers/layers_config.cpp
@@ -26,7 +26,7 @@
 #include <string>
 #include <map>
 #include <string.h>
-#include <vkLayer.h>
+#include <vk_layer.h>
 #include "loader_platform.h"
 #include "layers_config.h"
 // The following is #included again to catch certain OS-specific functions
diff --git a/layers/layers_msg.h b/layers/layers_msg.h
index f73e4d3..2d0e31d 100644
--- a/layers/layers_msg.h
+++ b/layers/layers_msg.h
@@ -23,7 +23,7 @@
  */
 #include <stdio.h>
 #include <stdbool.h>
-#include "vkLayer.h"
+#include "vk_layer.h"
 
 static VkLayerDbgFunctionNode *g_pDbgFunctionHead = NULL;
 static VkFlags g_reportFlags = (VkFlags) 0;
diff --git a/layers/layers_table.cpp b/layers/layers_table.cpp
index 5d1b9cf..363cd01 100644
--- a/layers/layers_table.cpp
+++ b/layers/layers_table.cpp
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <unordered_map>
 #include "vk_dispatch_table_helper.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "layers_table.h"
 static device_table_map tableMap;
 static instance_table_map tableInstanceMap;
diff --git a/layers/mem_tracker.h b/layers/mem_tracker.h
index c7083ad..8caf008 100644
--- a/layers/mem_tracker.h
+++ b/layers/mem_tracker.h
@@ -23,7 +23,7 @@
  */
 #pragma once
 #include <vector>
-#include "vkLayer.h"
+#include "vk_layer.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/layers/multi.cpp b/layers/multi.cpp
index 28dacf9..4705b0c 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -29,7 +29,7 @@
 #include <unordered_map>
 #include "loader_platform.h"
 #include "vk_dispatch_table_helper.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 // The following is #included again to catch certain OS-specific functions
 // being used:
 #include "loader_platform.h"
diff --git a/layers/object_track.h b/layers/object_track.h
index ebd7be1..62bfa48 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "vk_enum_string_helper.h"
 
 // Object Tracker ERROR codes
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 3074ab1..2fb0757 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -33,7 +33,7 @@
 #include <vector>
 
 #include "loader_platform.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "layers_config.h"
 #include "vk_enum_validate_helper.h"
 #include "vk_struct_validate_helper.h"
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index df89d3c..854ccc6 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -31,7 +31,7 @@
 #include <string>
 #include "loader_platform.h"
 #include "vk_dispatch_table_helper.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "layers_config.h"
 #include "layers_msg.h"
 #include "layers_table.h"
diff --git a/layers/shader_checker.h b/layers/shader_checker.h
index a952ac7..4e7eddf 100644
--- a/layers/shader_checker.h
+++ b/layers/shader_checker.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "vkLayer.h"
+#include "vk_layer.h"
 #include "vk_debug_report_lunarg.h"
 
 
diff --git a/loader/debug_report.c b/loader/debug_report.c
index 498faf8..9a0396b 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -34,7 +34,7 @@
 #include <alloca.h>
 #endif
 #include "debug_report.h"
-#include "vkLayer.h"
+#include "vk_layer.h"
 
 typedef void (VKAPI *PFN_stringCallback)(char *message);
 
diff --git a/loader/loader.c b/loader/loader.c
index 577024b..d59df6c 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -46,7 +46,7 @@
 #include "gpa_helper.h"
 #include "table_ops.h"
 #include "debug_report.h"
-#include "vkIcd.h"
+#include "vk_icd.h"
 #include "cJSON.h"
 
 void loader_add_to_ext_list(
diff --git a/loader/loader.h b/loader/loader.h
index c89ad0f..6fd8768 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -31,8 +31,8 @@
 #include <vulkan.h>
 #include <vk_debug_report_lunarg.h>
 #include <vk_wsi_lunarg.h>
-#include <vkLayer.h>
-#include <vkIcd.h>
+#include <vk_layer.h>
+#include <vk_icd.h>
 #include <assert.h>
 
 #if defined(__GNUC__) && __GNUC__ >= 4
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 39370f3..84f0339 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -23,7 +23,7 @@
  */
 
 #include <vulkan.h>
-#include <vkLayer.h>
+#include <vk_layer.h>
 #include <string.h>
 #include "loader.h"
 #include "loader_platform.h"
diff --git a/vk-generate.py b/vk-generate.py
index d6f9c8d..1434165 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -107,7 +107,7 @@
 
     def generate_header(self):
         return "\n".join(["#include <vulkan.h>",
-                          "#include <vkLayer.h>",
+                          "#include <vk_layer.h>",
                           "#include <string.h>"])
 
     def _generate_init_dispatch(self, type):
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 76589b2..276f0fe 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -575,7 +575,7 @@
 
 class LayerFuncsSubcommand(Subcommand):
     def generate_header(self):
-        return '#include <vkLayer.h>\n#include "loader.h"'
+        return '#include <vk_layer.h>\n#include "loader.h"'
 
     def generate_body(self):
         return self._generate_dispatch_entrypoints("static")
@@ -595,7 +595,7 @@
         gen_header.append('#include <string.h>')
         gen_header.append('#include <unordered_map>')
         gen_header.append('#include "loader_platform.h"')
-        gen_header.append('#include "vkLayer.h"')
+        gen_header.append('#include "vk_layer.h"')
         gen_header.append('//The following is #included again to catch certain OS-specific functions being used:')
         gen_header.append('')
         gen_header.append('#include "loader_platform.h"')
@@ -742,7 +742,7 @@
         header_txt.append('')
         header_txt.append('%s' % self.lineinfo.get())
         header_txt.append('#include "loader_platform.h"')
-        header_txt.append('#include "vkLayer.h"')
+        header_txt.append('#include "vk_layer.h"')
         header_txt.append('#include "vk_struct_string_helper_cpp.h"')
         header_txt.append('#include "layers_table.h"')
         header_txt.append('#include <unordered_map>')
@@ -1226,7 +1226,7 @@
         header_txt.append('#include <string.h>')
         header_txt.append('#include <unordered_map>')
         header_txt.append('#include "loader_platform.h"')
-        header_txt.append('#include "vkLayer.h"')
+        header_txt.append('#include "vk_layer.h"')
         header_txt.append('#include "threading.h"')
         header_txt.append('#include "layers_config.h"')
         header_txt.append('#include "vk_enum_validate_helper.h"')