diff --git a/.gitignore b/.gitignore
index 3d24eae13..177e6a8db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,8 +59,6 @@ llama-batched-swift
 /rpc-server
 out/
 tmp/
-ggml-vulkan-shaders.hpp
-ggml-vulkan-shaders.cpp
 
 # CI
 
diff --git a/Makefile b/Makefile
index 987352816..8bc13b7d6 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ ifdef GGML_RPC
 endif
 
 ifdef GGML_VULKAN
-	BUILD_TARGETS += vulkan-gen-shaders
+	BUILD_TARGETS += vulkan-shaders-gen
 endif
 
 default: $(BUILD_TARGETS)
@@ -717,26 +717,26 @@ ifdef GGML_VULKAN_RUN_TESTS
 endif
 
 GLSLC_CMD  = glslc
-_llama_vk_genshaders_cmd = $(shell pwd)/vulkan-gen-shaders
-_llama_vk_header = ggml/src/ggml-vulkan-shaders.hpp
-_llama_vk_source = ggml/src/ggml-vulkan-shaders.cpp
-_llama_vk_input_dir = ggml/src/vulkan-shaders
-_llama_vk_shader_deps = $(echo $(_llama_vk_input_dir)/*.comp)
+_ggml_vk_genshaders_cmd = $(shell pwd)/vulkan-shaders-gen
+_ggml_vk_header = ggml/src/ggml-vulkan-shaders.hpp
+_ggml_vk_source = ggml/src/ggml-vulkan-shaders.cpp
+_ggml_vk_input_dir = ggml/src/vulkan-shaders
+_ggml_vk_shader_deps = $(echo $(_ggml_vk_input_dir)/*.comp)
 
-ggml/src/ggml-vulkan.o: ggml/src/ggml-vulkan.cpp ggml/include/ggml-vulkan.h $(_llama_vk_header) $(_llama_vk_source)
+ggml/src/ggml-vulkan.o: ggml/src/ggml-vulkan.cpp ggml/include/ggml-vulkan.h $(_ggml_vk_header) $(_ggml_vk_source)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-$(_llama_vk_header): $(_llama_vk_source)
+$(_ggml_vk_header): $(_ggml_vk_source)
 
-$(_llama_vk_source): $(_llama_vk_shader_deps) vulkan-gen-shaders
-	$(_llama_vk_genshaders_cmd) \
+$(_ggml_vk_source): $(_ggml_vk_shader_deps) vulkan-shaders-gen
+	$(_ggml_vk_genshaders_cmd) \
 		--glslc      $(GLSLC_CMD) \
-		--input-dir  $(_llama_vk_input_dir) \
-		--target-hpp $(_llama_vk_header) \
-		--target-cpp $(_llama_vk_source)
+		--input-dir  $(_ggml_vk_input_dir) \
+		--target-hpp $(_ggml_vk_header) \
+		--target-cpp $(_ggml_vk_source)
 
-vulkan-gen-shaders: ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp
-	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp
+vulkan-shaders-gen: ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
+	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
 
 endif # GGML_VULKAN
 
@@ -1108,7 +1108,7 @@ clean:
 	rm -vrf ggml/src/ggml-cuda/template-instances/*.o
 	rm -rvf $(BUILD_TARGETS)
 	rm -rvf $(TEST_TARGETS)
-	rm -f vulkan-gen-shaders ggml/src/ggml-vulkan-shaders.hpp ggml/src/ggml-vulkan-shaders.cpp
+	rm -f vulkan-shaders-gen ggml/src/ggml-vulkan-shaders.hpp ggml/src/ggml-vulkan-shaders.cpp
 	find examples pocs -type f -name "*.o" -delete
 
 #
diff --git a/ggml/.gitignore b/ggml/.gitignore
new file mode 100644
index 000000000..c82d8e692
--- /dev/null
+++ b/ggml/.gitignore
@@ -0,0 +1,2 @@
+src/ggml-vulkan-shaders.hpp
+src/ggml-vulkan-shaders.cpp
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index ea7dfa773..d4e487874 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -558,34 +558,34 @@ if (GGML_VULKAN)
             add_compile_definitions(GGML_VULKAN_RUN_TESTS)
         endif()
 
-        add_subdirectory(vulkan-gen-shaders)
+        add_subdirectory(vulkan-shaders)
 
-        set (_llama_vk_genshaders_cmd vulkan-gen-shaders)
-        set (_llama_vk_header     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
-        set (_llama_vk_source     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
-        set (_llama_vk_input_dir  ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
-        set (_llama_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
+        set (_ggml_vk_genshaders_cmd vulkan-shaders-gen)
+        set (_ggml_vk_header     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
+        set (_ggml_vk_source     ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
+        set (_ggml_vk_input_dir  ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
+        set (_ggml_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
 
-        file(GLOB _llama_vk_shader_deps "${_llama_vk_input_dir}/*.comp")
+        file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
 
         add_custom_command(
-            OUTPUT ${_llama_vk_header}
-                   ${_llama_vk_source}
+            OUTPUT ${_ggml_vk_header}
+                   ${_ggml_vk_source}
 
-            COMMAND ${_llama_vk_genshaders_cmd}
+            COMMAND ${_ggml_vk_genshaders_cmd}
                 --glslc      ${Vulkan_GLSLC_EXECUTABLE}
-                --input-dir  ${_llama_vk_input_dir}
-                --output-dir ${_llama_vk_output_dir}
-                --target-hpp ${_llama_vk_header}
-                --target-cpp ${_llama_vk_source}
+                --input-dir  ${_ggml_vk_input_dir}
+                --output-dir ${_ggml_vk_output_dir}
+                --target-hpp ${_ggml_vk_header}
+                --target-cpp ${_ggml_vk_source}
                 --no-clean
 
-            DEPENDS ${_llama_vk_shader_deps}
+            DEPENDS ${_ggml_vk_shader_deps}
             COMMENT "Generate vulkan shaders"
         )
 
-        set(GGML_HEADERS_VULKAN ${CMAKE_CURRENT_SOURCE_DIR}/../include/ggml-vulkan.h ${_llama_vk_header})
-        set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_llama_vk_source})
+        set(GGML_HEADERS_VULKAN ${CMAKE_CURRENT_SOURCE_DIR}/../include/ggml-vulkan.h ${_ggml_vk_header})
+        set(GGML_SOURCES_VULKAN ggml-vulkan.cpp ${_ggml_vk_source})
 
         set(GGML_EXTRA_LIBS     ${GGML_EXTRA_LIBS} Vulkan::Vulkan)
         set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/ggml/src/vulkan-gen-shaders/CMakeLists.txt b/ggml/src/vulkan-shaders/CMakeLists.txt
similarity index 52%
rename from ggml/src/vulkan-gen-shaders/CMakeLists.txt
rename to ggml/src/vulkan-shaders/CMakeLists.txt
index 6c7d1f92a..41551e009 100644
--- a/ggml/src/vulkan-gen-shaders/CMakeLists.txt
+++ b/ggml/src/vulkan-shaders/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set(TARGET vulkan-gen-shaders)
-add_executable(${TARGET} vulkan-gen-shaders.cpp)
+set(TARGET vulkan-shaders-gen)
+add_executable(${TARGET} vulkan-shaders-gen.cpp)
 install(TARGETS ${TARGET} RUNTIME)
 target_compile_features(${TARGET} PRIVATE cxx_std_11)
diff --git a/ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp b/ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
similarity index 100%
rename from ggml/src/vulkan-gen-shaders/vulkan-gen-shaders.cpp
rename to ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp