diff --git a/server/Makefile.am b/server/Makefile.am
index db1cbc3a..e52c7801 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -154,10 +154,10 @@ libspice_server_la_SOURCES +=	\
 endif
 
 EXTRA_DIST =					\
-	red_bitmap_utils_tmpl.c			\
-	cache_item.tmpl.c			\
-	glz_encode_match_tmpl.c			\
-	glz_encode_tmpl.c			\
+	spice-bitmap-utils.tmpl.c			\
+	cache-item.tmpl.c			\
+	glz-encode-match.tmpl.c			\
+	glz-encode.tmpl.c			\
 	spice-server.syms			\
 	$(NULL)
 
diff --git a/server/cache_item.tmpl.c b/server/cache-item.tmpl.c
similarity index 100%
rename from server/cache_item.tmpl.c
rename to server/cache-item.tmpl.c
diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index aafc8073..9d722996 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -86,7 +86,7 @@ struct CursorChannelClient {
 #define RCC_TO_CCC(rcc) SPICE_CONTAINEROF((rcc), CursorChannelClient, common.base)
 
 #define CLIENT_CURSOR_CACHE
-#include "cache_item.tmpl.c"
+#include "cache-item.tmpl.c"
 #undef CLIENT_CURSOR_CACHE
 
 static CursorItem *cursor_item_new(QXLInstance *qxl, RedCursorCmd *cmd, uint32_t group_id)
diff --git a/server/dcc.c b/server/dcc.c
index 6c089da7..198c7ab2 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -1170,7 +1170,7 @@ int dcc_compress_image(DisplayChannelClient *dcc,
 }
 
 #define CLIENT_PALETTE_CACHE
-#include "cache_item.tmpl.c"
+#include "cache-item.tmpl.c"
 #undef CLIENT_PALETTE_CACHE
 
 void dcc_palette_cache_palette(DisplayChannelClient *dcc, SpicePalette *palette,
diff --git a/server/glz_encode_match_tmpl.c b/server/glz-encode-match.tmpl.c
similarity index 100%
rename from server/glz_encode_match_tmpl.c
rename to server/glz-encode-match.tmpl.c
diff --git a/server/glz_encode_tmpl.c b/server/glz-encode.tmpl.c
similarity index 100%
rename from server/glz_encode_tmpl.c
rename to server/glz-encode.tmpl.c
diff --git a/server/glz_encoder.c b/server/glz_encoder.c
index d9d6be11..65f44784 100644
--- a/server/glz_encoder.c
+++ b/server/glz_encoder.c
@@ -203,24 +203,24 @@ typedef uint16_t rgb16_pixel_t;
 
 
 #define GLZ_ENCODE_SIZE
-#include "glz_encode_match_tmpl.c"
+#include "glz-encode-match.tmpl.c"
 #define GLZ_ENCODE_MATCH
-#include "glz_encode_match_tmpl.c"
+#include "glz-encode-match.tmpl.c"
 
 #define LZ_PLT
-#include "glz_encode_tmpl.c"
+#include "glz-encode.tmpl.c"
 
 #define LZ_RGB16
-#include "glz_encode_tmpl.c"
+#include "glz-encode.tmpl.c"
 
 #define LZ_RGB24
-#include "glz_encode_tmpl.c"
+#include "glz-encode.tmpl.c"
 
 #define LZ_RGB32
-#include "glz_encode_tmpl.c"
+#include "glz-encode.tmpl.c"
 
 #define LZ_RGB_ALPHA
-#include "glz_encode_tmpl.c"
+#include "glz-encode.tmpl.c"
 
 
 int glz_encode(GlzEncoderContext *opaque_encoder,
diff --git a/server/spice-bitmap-utils.c b/server/spice-bitmap-utils.c
index c4ec625a..03d76944 100644
--- a/server/spice-bitmap-utils.c
+++ b/server/spice-bitmap-utils.c
@@ -21,11 +21,11 @@
 #include "spice-bitmap-utils.h"
 
 #define RED_BITMAP_UTILS_RGB16
-#include "red_bitmap_utils_tmpl.c"
+#include "spice-bitmap-utils.tmpl.c"
 #define RED_BITMAP_UTILS_RGB24
-#include "red_bitmap_utils_tmpl.c"
+#include "spice-bitmap-utils.tmpl.c"
 #define RED_BITMAP_UTILS_RGB32
-#include "red_bitmap_utils_tmpl.c"
+#include "spice-bitmap-utils.tmpl.c"
 
 #define GRADUAL_HIGH_RGB24_TH -0.03
 #define GRADUAL_HIGH_RGB16_TH 0
diff --git a/server/red_bitmap_utils_tmpl.c b/server/spice-bitmap-utils.tmpl.c
similarity index 100%
rename from server/red_bitmap_utils_tmpl.c
rename to server/spice-bitmap-utils.tmpl.c