diff --git a/kitty/blit_common_vertex.glsl b/kitty/blit_common.glsl
similarity index 100%
rename from kitty/blit_common_vertex.glsl
rename to kitty/blit_common.glsl
diff --git a/kitty/blit_vertex.glsl b/kitty/blit_vertex.glsl
index 57408a3b4..41ec78ff0 100644
--- a/kitty/blit_vertex.glsl
+++ b/kitty/blit_vertex.glsl
@@ -1,2 +1,2 @@
 uniform vec4 src_rect, dest_rect;
-#pragma kitty_include_shader <blit_common_vertex.glsl>
+#pragma kitty_include_shader <blit_common.glsl>
diff --git a/kitty/graphics_vertex.glsl b/kitty/graphics_vertex.glsl
index 57408a3b4..41ec78ff0 100644
--- a/kitty/graphics_vertex.glsl
+++ b/kitty/graphics_vertex.glsl
@@ -1,2 +1,2 @@
 uniform vec4 src_rect, dest_rect;
-#pragma kitty_include_shader <blit_common_vertex.glsl>
+#pragma kitty_include_shader <blit_common.glsl>
diff --git a/setup.py b/setup.py
index b7610c75f..93e661d12 100755
--- a/setup.py
+++ b/setup.py
@@ -1151,7 +1151,7 @@ def build_uniforms_header(skip_generation: bool = False) -> str:
 
     for x in sorted(glob.glob('kitty/*.glsl')):
         name = os.path.basename(x).partition('.')[0]
-        name, sep, shader_type = name.partition('_')
+        name, sep, shader_type = name.rpartition('_')
         if not sep or shader_type not in ('fragment', 'vertex'):
             continue
         class_names[name] = f'{name.capitalize()}Uniforms'