diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d14396b..aae98ac6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,8 +273,8 @@ target_sources(slang-rhi PRIVATE
     src/debug-layer/debug-shader-object.cpp
     src/debug-layer/debug-shader-program.cpp
     src/debug-layer/debug-surface.cpp
-    src/debug-layer/debug-texture.cpp
     src/debug-layer/debug-texture-view.cpp
+    src/debug-layer/debug-texture.cpp
     src/debug-layer/debug-transient-heap.cpp
 )
 
@@ -291,10 +291,10 @@ if(SLANG_RHI_ENABLE_CPU)
         src/cpu/cpu-helper-functions.cpp
         src/cpu/cpu-pipeline.cpp
         src/cpu/cpu-query.cpp
-        src/cpu/cpu-shader-object.cpp
         src/cpu/cpu-shader-object-layout.cpp
-        src/cpu/cpu-texture.cpp
+        src/cpu/cpu-shader-object.cpp
         src/cpu/cpu-texture-view.cpp
+        src/cpu/cpu-texture.cpp
     )
 endif()
 
@@ -313,8 +313,8 @@ if(SLANG_RHI_ENABLE_D3D11)
         src/d3d11/d3d11-pipeline.cpp
         src/d3d11/d3d11-query.cpp
         src/d3d11/d3d11-scopeNVAPI.cpp
-        src/d3d11/d3d11-shader-object.cpp
         src/d3d11/d3d11-shader-object-layout.cpp
+        src/d3d11/d3d11-shader-object.cpp
         src/d3d11/d3d11-shader-program.cpp
         src/d3d11/d3d11-surface.cpp
         src/d3d11/d3d11-texture.cpp
@@ -337,14 +337,14 @@ if(SLANG_RHI_ENABLE_D3D12)
         src/d3d12/d3d12-query.cpp
         src/d3d12/d3d12-resource.cpp
         src/d3d12/d3d12-sampler.cpp
-        src/d3d12/d3d12-shader-object.cpp
         src/d3d12/d3d12-shader-object-layout.cpp
+        src/d3d12/d3d12-shader-object.cpp
         src/d3d12/d3d12-shader-program.cpp
         src/d3d12/d3d12-shader-table.cpp
         src/d3d12/d3d12-submitter.cpp
         src/d3d12/d3d12-surface.cpp
-        src/d3d12/d3d12-texture.cpp
         src/d3d12/d3d12-texture-view.cpp
+        src/d3d12/d3d12-texture.cpp
         src/d3d12/d3d12-transient-heap.cpp
     )
 endif()
@@ -358,21 +358,21 @@ if(SLANG_RHI_ENABLE_VULKAN)
         src/vulkan/vk-command-encoder.cpp
         src/vulkan/vk-command-queue.cpp
         src/vulkan/vk-descriptor-allocator.cpp
-        src/vulkan/vk-device.cpp
         src/vulkan/vk-device-queue.cpp
+        src/vulkan/vk-device.cpp
         src/vulkan/vk-fence.cpp
         src/vulkan/vk-helper-functions.cpp
         src/vulkan/vk-module.cpp
         src/vulkan/vk-pipeline.cpp
         src/vulkan/vk-query.cpp
         src/vulkan/vk-sampler.cpp
-        src/vulkan/vk-shader-object.cpp
         src/vulkan/vk-shader-object-layout.cpp
+        src/vulkan/vk-shader-object.cpp
         src/vulkan/vk-shader-program.cpp
         src/vulkan/vk-shader-table.cpp
         src/vulkan/vk-surface.cpp
-        src/vulkan/vk-texture.cpp
         src/vulkan/vk-texture-view.cpp
+        src/vulkan/vk-texture.cpp
         src/vulkan/vk-transient-heap.cpp
         src/vulkan/vk-util.cpp
     )
@@ -392,19 +392,19 @@ if(SLANG_RHI_ENABLE_METAL)
         src/metal/metal-device.cpp
         src/metal/metal-fence.cpp
         src/metal/metal-helper-functions.cpp
+        src/metal/metal-input-layout.cpp
         src/metal/metal-pipeline.cpp
         src/metal/metal-query.cpp
         src/metal/metal-sampler.cpp
-        src/metal/metal-shader-object.cpp
         src/metal/metal-shader-object-layout.cpp
+        src/metal/metal-shader-object.cpp
         src/metal/metal-shader-program.cpp
         src/metal/metal-shader-table.cpp
         src/metal/metal-surface.cpp
-        src/metal/metal-texture.cpp
         src/metal/metal-texture-view.cpp
+        src/metal/metal-texture.cpp
         src/metal/metal-transient-heap.cpp
         src/metal/metal-util.cpp
-        src/metal/metal-vertex-layout.cpp
     )
     add_library(slang-rhi-metal-cpp INTERFACE)
     target_include_directories(slang-rhi-metal-cpp INTERFACE external/metal-cpp)
@@ -424,8 +424,8 @@ if(SLANG_RHI_ENABLE_CUDA)
         src/cuda/cuda-helper-functions.cpp
         src/cuda/cuda-pipeline.cpp
         src/cuda/cuda-query.cpp
-        src/cuda/cuda-shader-object.cpp
         src/cuda/cuda-shader-object-layout.cpp
+        src/cuda/cuda-shader-object.cpp
         src/cuda/cuda-shader-program.cpp
         src/cuda/cuda-texture.cpp
     )
@@ -445,8 +445,8 @@ if(SLANG_RHI_ENABLE_WGPU)
         src/wgpu/wgpu-pipeline.cpp
         src/wgpu/wgpu-query.cpp
         src/wgpu/wgpu-sampler.cpp
-        src/wgpu/wgpu-shader-object.cpp
         src/wgpu/wgpu-shader-object-layout.cpp
+        src/wgpu/wgpu-shader-object.cpp
         src/wgpu/wgpu-shader-program.cpp
         src/wgpu/wgpu-surface.cpp
         src/wgpu/wgpu-texture.cpp
@@ -490,7 +490,6 @@ if(SLANG_RHI_BUILD_TESTS)
         tests/test-create-buffer-from-handle.cpp
         tests/test-existing-device-handle.cpp
         tests/test-formats.cpp
-        tests/testing.cpp
         tests/test-instanced-draw.cpp
         tests/test-link-time-constant.cpp
         tests/test-link-time-default.cpp
@@ -499,9 +498,9 @@ if(SLANG_RHI_BUILD_TESTS)
         tests/test-mutable-shader-object.cpp
         tests/test-native-handle.cpp
         tests/test-nested-parameter-block.cpp
-        tests/test-precompiled-module.cpp
         tests/test-precompiled-module-2.cpp
         tests/test-precompiled-module-cache.cpp
+        tests/test-precompiled-module.cpp
         tests/test-ray-tracing.cpp
         tests/test-resolve-resource-tests.cpp
         tests/test-resource-states.cpp
@@ -514,6 +513,7 @@ if(SLANG_RHI_BUILD_TESTS)
         tests/test-swapchain.cpp
         tests/test-texture-types.cpp
         tests/test-uint16-structured-buffer.cpp
+        tests/testing.cpp
         tests/texture-utils.cpp
     )
     target_compile_definitions(slang-rhi-tests
diff --git a/src/d3d11/d3d11-device.cpp b/src/d3d11/d3d11-device.cpp
index caa11750..93a776d2 100644
--- a/src/d3d11/d3d11-device.cpp
+++ b/src/d3d11/d3d11-device.cpp
@@ -11,7 +11,7 @@
 #include "d3d11-surface.h"
 #include "d3d11-texture.h"
 #include "d3d11-texture-view.h"
-#include "d3d11-vertex-layout.h"
+#include "d3d11-input-layout.h"
 
 #include "core/string.h"
 
diff --git a/src/d3d11/d3d11-vertex-layout.h b/src/d3d11/d3d11-input-layout.h
similarity index 100%
rename from src/d3d11/d3d11-vertex-layout.h
rename to src/d3d11/d3d11-input-layout.h
diff --git a/src/d3d11/d3d11-pipeline.cpp b/src/d3d11/d3d11-pipeline.cpp
index bc4e7cb4..9d3879b7 100644
--- a/src/d3d11/d3d11-pipeline.cpp
+++ b/src/d3d11/d3d11-pipeline.cpp
@@ -1,7 +1,7 @@
 #include "d3d11-pipeline.h"
 #include "d3d11-device.h"
 #include "d3d11-shader-program.h"
-#include "d3d11-vertex-layout.h"
+#include "d3d11-input-layout.h"
 #include "d3d11-helper-functions.h"
 
 namespace rhi::d3d11 {
diff --git a/src/d3d12/d3d12-command-encoder.cpp b/src/d3d12/d3d12-command-encoder.cpp
index f00ab70f..a7385d47 100644
--- a/src/d3d12/d3d12-command-encoder.cpp
+++ b/src/d3d12/d3d12-command-encoder.cpp
@@ -9,7 +9,7 @@
 #include "d3d12-shader-table.h"
 #include "d3d12-texture.h"
 #include "d3d12-transient-heap.h"
-#include "d3d12-vertex-layout.h"
+#include "d3d12-input-layout.h"
 #include "d3d12-texture-view.h"
 #include "d3d12-acceleration-structure.h"
 
diff --git a/src/d3d12/d3d12-device.cpp b/src/d3d12/d3d12-device.cpp
index 98347562..d5f52deb 100644
--- a/src/d3d12/d3d12-device.cpp
+++ b/src/d3d12/d3d12-device.cpp
@@ -11,7 +11,7 @@
 #include "d3d12-shader-program.h"
 #include "d3d12-shader-table.h"
 #include "d3d12-surface.h"
-#include "d3d12-vertex-layout.h"
+#include "d3d12-input-layout.h"
 #include "d3d12-acceleration-structure.h"
 
 #include "core/short_vector.h"
diff --git a/src/d3d12/d3d12-vertex-layout.h b/src/d3d12/d3d12-input-layout.h
similarity index 100%
rename from src/d3d12/d3d12-vertex-layout.h
rename to src/d3d12/d3d12-input-layout.h
diff --git a/src/d3d12/d3d12-pipeline.cpp b/src/d3d12/d3d12-pipeline.cpp
index 98eaab47..9ff38aad 100644
--- a/src/d3d12/d3d12-pipeline.cpp
+++ b/src/d3d12/d3d12-pipeline.cpp
@@ -2,7 +2,7 @@
 #include "d3d12-device.h"
 #include "d3d12-pipeline-state-stream.h"
 #include "d3d12-shader-program.h"
-#include "d3d12-vertex-layout.h"
+#include "d3d12-input-layout.h"
 
 #ifdef SLANG_RHI_NVAPI
 #include "../nvapi/nvapi-include.h"
diff --git a/src/debug-layer/debug-device.cpp b/src/debug-layer/debug-device.cpp
index 9d10da13..1dfd1d00 100644
--- a/src/debug-layer/debug-device.cpp
+++ b/src/debug-layer/debug-device.cpp
@@ -12,7 +12,7 @@
 #include "debug-texture.h"
 #include "debug-texture-view.h"
 #include "debug-transient-heap.h"
-#include "debug-vertex-layout.h"
+#include "debug-input-layout.h"
 
 #include "core/short_vector.h"
 
diff --git a/src/debug-layer/debug-helper-functions.h b/src/debug-layer/debug-helper-functions.h
index a7dd75a5..7d4505fc 100644
--- a/src/debug-layer/debug-helper-functions.h
+++ b/src/debug-layer/debug-helper-functions.h
@@ -15,7 +15,7 @@
 #include "debug-texture.h"
 #include "debug-texture-view.h"
 #include "debug-transient-heap.h"
-#include "debug-vertex-layout.h"
+#include "debug-input-layout.h"
 
 #include <vector>
 
diff --git a/src/debug-layer/debug-vertex-layout.h b/src/debug-layer/debug-input-layout.h
similarity index 100%
rename from src/debug-layer/debug-vertex-layout.h
rename to src/debug-layer/debug-input-layout.h
diff --git a/src/metal/metal-device.cpp b/src/metal/metal-device.cpp
index 1de35df0..b4b15c82 100644
--- a/src/metal/metal-device.cpp
+++ b/src/metal/metal-device.cpp
@@ -4,7 +4,7 @@
 #include "metal-shader-program.h"
 #include "metal-texture.h"
 #include "metal-util.h"
-#include "metal-vertex-layout.h"
+#include "metal-input-layout.h"
 // #include "metal-command-queue.h"
 #include "metal-fence.h"
 #include "metal-query.h"
diff --git a/src/metal/metal-vertex-layout.cpp b/src/metal/metal-input-layout.cpp
similarity index 98%
rename from src/metal/metal-vertex-layout.cpp
rename to src/metal/metal-input-layout.cpp
index be63dc1f..851041da 100644
--- a/src/metal/metal-vertex-layout.cpp
+++ b/src/metal/metal-input-layout.cpp
@@ -1,4 +1,4 @@
-#include "metal-vertex-layout.h"
+#include "metal-input-layout.h"
 #include "metal-util.h"
 
 namespace rhi::metal {
diff --git a/src/metal/metal-vertex-layout.h b/src/metal/metal-input-layout.h
similarity index 100%
rename from src/metal/metal-vertex-layout.h
rename to src/metal/metal-input-layout.h
diff --git a/src/metal/metal-pipeline.cpp b/src/metal/metal-pipeline.cpp
index 19e8e192..bf7de91a 100644
--- a/src/metal/metal-pipeline.cpp
+++ b/src/metal/metal-pipeline.cpp
@@ -3,7 +3,7 @@
 #include "metal-shader-object-layout.h"
 #include "metal-shader-program.h"
 #include "metal-util.h"
-#include "metal-vertex-layout.h"
+#include "metal-input-layout.h"
 
 namespace rhi::metal {
 
diff --git a/src/vulkan/vk-device.cpp b/src/vulkan/vk-device.cpp
index 898cbc01..45f4f1fc 100644
--- a/src/vulkan/vk-device.cpp
+++ b/src/vulkan/vk-device.cpp
@@ -11,7 +11,7 @@
 #include "vk-shader-program.h"
 #include "vk-shader-table.h"
 #include "vk-transient-heap.h"
-#include "vk-vertex-layout.h"
+#include "vk-input-layout.h"
 #include "vk-acceleration-structure.h"
 
 #include "core/common.h"
diff --git a/src/vulkan/vk-vertex-layout.h b/src/vulkan/vk-input-layout.h
similarity index 100%
rename from src/vulkan/vk-vertex-layout.h
rename to src/vulkan/vk-input-layout.h
diff --git a/src/vulkan/vk-pipeline.cpp b/src/vulkan/vk-pipeline.cpp
index 6b6926e9..8d9f40a7 100644
--- a/src/vulkan/vk-pipeline.cpp
+++ b/src/vulkan/vk-pipeline.cpp
@@ -3,7 +3,7 @@
 #include "vk-helper-functions.h"
 #include "vk-shader-object-layout.h"
 #include "vk-shader-program.h"
-#include "vk-vertex-layout.h"
+#include "vk-input-layout.h"
 
 #include "core/static_vector.h"