diff --git a/test/fuzzer/fuzz_crash_17 b/test/fuzzer/crash_0c006fc7bbbab8ba82abca1f01cc1f95714aaf98
similarity index 100%
rename from test/fuzzer/fuzz_crash_17
rename to test/fuzzer/crash_0c006fc7bbbab8ba82abca1f01cc1f95714aaf98
diff --git a/test/fuzzer/fuzz_crash_11 b/test/fuzzer/crash_0f300b1e2028a520e74e06b9d598b97d15b34062
similarity index 100%
rename from test/fuzzer/fuzz_crash_11
rename to test/fuzzer/crash_0f300b1e2028a520e74e06b9d598b97d15b34062
diff --git a/test/fuzzer/fuzz_crash_1 b/test/fuzzer/crash_1938b2d283474afb40ccd2be49000bea75774c48
similarity index 100%
rename from test/fuzzer/fuzz_crash_1
rename to test/fuzzer/crash_1938b2d283474afb40ccd2be49000bea75774c48
diff --git a/test/fuzzer/fuzz_crash_22 b/test/fuzzer/crash_1c1af162b560e3a3f2dbd5b16db30265f2c4cc10
similarity index 100%
rename from test/fuzzer/fuzz_crash_22
rename to test/fuzzer/crash_1c1af162b560e3a3f2dbd5b16db30265f2c4cc10
diff --git a/test/fuzzer/fuzz_crash_14 b/test/fuzzer/crash_27e9bb6ee0b0d3a3bf838c52fe0de801cde1244b
similarity index 100%
rename from test/fuzzer/fuzz_crash_14
rename to test/fuzzer/crash_27e9bb6ee0b0d3a3bf838c52fe0de801cde1244b
diff --git a/test/fuzzer/fuzz_crash_10 b/test/fuzzer/crash_28029d5df72ebdd793dcd3032fe12afa7ae8524b
similarity index 100%
rename from test/fuzzer/fuzz_crash_10
rename to test/fuzzer/crash_28029d5df72ebdd793dcd3032fe12afa7ae8524b
diff --git a/test/fuzzer/fuzz_crash_19 b/test/fuzzer/crash_2808240ac98ecfb63e0d9730e5ee3fb53682a52b
similarity index 100%
rename from test/fuzzer/fuzz_crash_19
rename to test/fuzzer/crash_2808240ac98ecfb63e0d9730e5ee3fb53682a52b
diff --git a/test/fuzzer/fuzz_crash_18 b/test/fuzzer/crash_30b3ea0927886055d8817318bba33847a1a0d212
similarity index 100%
rename from test/fuzzer/fuzz_crash_18
rename to test/fuzzer/crash_30b3ea0927886055d8817318bba33847a1a0d212
diff --git a/test/fuzzer/fuzz_crash_7 b/test/fuzzer/crash_413a274deb971cdb406dac257e180dd935580505
similarity index 100%
rename from test/fuzzer/fuzz_crash_7
rename to test/fuzzer/crash_413a274deb971cdb406dac257e180dd935580505
diff --git a/test/fuzzer/fuzz_crash_9 b/test/fuzzer/crash_4d490a2f06704698f75883f5f053946921b5d4cc
similarity index 100%
rename from test/fuzzer/fuzz_crash_9
rename to test/fuzzer/crash_4d490a2f06704698f75883f5f053946921b5d4cc
diff --git a/test/fuzzer/fuzz_crash_6 b/test/fuzzer/crash_89fecf91d67a312d1ef19c559146b40cbfaa82d8
similarity index 100%
rename from test/fuzzer/fuzz_crash_6
rename to test/fuzzer/crash_89fecf91d67a312d1ef19c559146b40cbfaa82d8
diff --git a/test/fuzzer/fuzz_crash_4 b/test/fuzzer/crash_8ec28d2e3e155d341c61188291ad437bee2fc58d
similarity index 100%
rename from test/fuzzer/fuzz_crash_4
rename to test/fuzzer/crash_8ec28d2e3e155d341c61188291ad437bee2fc58d
diff --git a/test/fuzzer/fuzz_crash_2 b/test/fuzzer/crash_912e7cee20e182e8f7f85ebd844bfa998b3800b3
similarity index 100%
rename from test/fuzzer/fuzz_crash_2
rename to test/fuzzer/crash_912e7cee20e182e8f7f85ebd844bfa998b3800b3
diff --git a/test/fuzzer/fuzz_crash_5 b/test/fuzzer/crash_a45a78dd8471a4fb501d65557641fdc3ba270a3c
similarity index 100%
rename from test/fuzzer/fuzz_crash_5
rename to test/fuzzer/crash_a45a78dd8471a4fb501d65557641fdc3ba270a3c
diff --git a/test/fuzzer/fuzz_crash_15 b/test/fuzzer/crash_c4192decccf07b476e5d200d40f180f042ef8380
similarity index 100%
rename from test/fuzzer/fuzz_crash_15
rename to test/fuzzer/crash_c4192decccf07b476e5d200d40f180f042ef8380
diff --git a/test/fuzzer/fuzz_crash_12 b/test/fuzzer/crash_cadde0fee8feaf097549ef550a5d5967393945df
similarity index 100%
rename from test/fuzzer/fuzz_crash_12
rename to test/fuzzer/crash_cadde0fee8feaf097549ef550a5d5967393945df
diff --git a/test/fuzzer/fuzz_crash_8 b/test/fuzzer/crash_d636c46db3865f401b3e49e9ba1f95327576b8e2
similarity index 100%
rename from test/fuzzer/fuzz_crash_8
rename to test/fuzzer/crash_d636c46db3865f401b3e49e9ba1f95327576b8e2
diff --git a/test/fuzzer/fuzz_crash_16 b/test/fuzzer/crash_e28e4256647bd3a59110dfa8bd20e73f8f316fae
similarity index 100%
rename from test/fuzzer/fuzz_crash_16
rename to test/fuzzer/crash_e28e4256647bd3a59110dfa8bd20e73f8f316fae
diff --git a/test/fuzzer/fuzz_crash_3 b/test/fuzzer/crash_e4d6f2e2cc5db10a41af1d2a271778825cb24ef4
similarity index 100%
rename from test/fuzzer/fuzz_crash_3
rename to test/fuzzer/crash_e4d6f2e2cc5db10a41af1d2a271778825cb24ef4
diff --git a/test/fuzzer/fuzz_crash_21 b/test/fuzzer/crash_e6ffcaad48c4a1ecad7cae0cc3a0776e2fa356c8
similarity index 100%
rename from test/fuzzer/fuzz_crash_21
rename to test/fuzzer/crash_e6ffcaad48c4a1ecad7cae0cc3a0776e2fa356c8
diff --git a/test/fuzzer/fuzz_crash_13 b/test/fuzzer/crash_e770c992b26a129aaeea42993b2a9b06ba91faca
similarity index 100%
rename from test/fuzzer/fuzz_crash_13
rename to test/fuzzer/crash_e770c992b26a129aaeea42993b2a9b06ba91faca
diff --git a/test/fuzzer/fuzz_crash_20 b/test/fuzzer/crash_f7bc33d88bbc6a270c32bc6969059a0c44c49dd4
similarity index 100%
rename from test/fuzzer/fuzz_crash_20
rename to test/fuzzer/crash_f7bc33d88bbc6a270c32bc6969059a0c44c49dd4
diff --git a/test/fuzzer/fuzz_leak_1 b/test/fuzzer/leak_2f97e04d5e7167856ba0827c10939690d203cb54
similarity index 100%
rename from test/fuzzer/fuzz_leak_1
rename to test/fuzzer/leak_2f97e04d5e7167856ba0827c10939690d203cb54
diff --git a/test/fuzzer/meson.build b/test/fuzzer/meson.build
index b2017100..33be067b 100644
--- a/test/fuzzer/meson.build
+++ b/test/fuzzer/meson.build
@@ -1,27 +1,27 @@
 fuzzer_repro = files(
-    'fuzz_crash_1',
-    'fuzz_crash_10',
-    'fuzz_crash_11',
-    'fuzz_crash_12',
-    'fuzz_crash_13',
-    'fuzz_crash_14',
-    'fuzz_crash_15',
-    'fuzz_crash_16',
-    'fuzz_crash_17',
-    'fuzz_crash_18',
-    'fuzz_crash_19',
-    'fuzz_crash_2',
-    'fuzz_crash_20',
-    'fuzz_crash_21',
-    'fuzz_crash_22',
-    'fuzz_crash_3',
-    'fuzz_crash_4',
-    'fuzz_crash_5',
-    'fuzz_crash_6',
-    'fuzz_crash_7',
-    'fuzz_crash_8',
-    'fuzz_crash_9',
-    'fuzz_leak_1',
+    'crash_0c006fc7bbbab8ba82abca1f01cc1f95714aaf98',
+    'crash_0f300b1e2028a520e74e06b9d598b97d15b34062',
+    'crash_1938b2d283474afb40ccd2be49000bea75774c48',
+    'crash_1c1af162b560e3a3f2dbd5b16db30265f2c4cc10',
+    'crash_27e9bb6ee0b0d3a3bf838c52fe0de801cde1244b',
+    'crash_28029d5df72ebdd793dcd3032fe12afa7ae8524b',
+    'crash_2808240ac98ecfb63e0d9730e5ee3fb53682a52b',
+    'crash_30b3ea0927886055d8817318bba33847a1a0d212',
+    'crash_413a274deb971cdb406dac257e180dd935580505',
+    'crash_4d490a2f06704698f75883f5f053946921b5d4cc',
+    'crash_89fecf91d67a312d1ef19c559146b40cbfaa82d8',
+    'crash_8ec28d2e3e155d341c61188291ad437bee2fc58d',
+    'crash_912e7cee20e182e8f7f85ebd844bfa998b3800b3',
+    'crash_a45a78dd8471a4fb501d65557641fdc3ba270a3c',
+    'crash_c4192decccf07b476e5d200d40f180f042ef8380',
+    'crash_cadde0fee8feaf097549ef550a5d5967393945df',
+    'crash_d636c46db3865f401b3e49e9ba1f95327576b8e2',
+    'crash_e28e4256647bd3a59110dfa8bd20e73f8f316fae',
+    'crash_e4d6f2e2cc5db10a41af1d2a271778825cb24ef4',
+    'crash_e6ffcaad48c4a1ecad7cae0cc3a0776e2fa356c8',
+    'crash_e770c992b26a129aaeea42993b2a9b06ba91faca',
+    'crash_f7bc33d88bbc6a270c32bc6969059a0c44c49dd4',
+    'leak_2f97e04d5e7167856ba0827c10939690d203cb54',
 )
 
 utest_dep = dependency('utest')
diff --git a/test/fuzzer/repro_codegen.c b/test/fuzzer/repro_codegen.c
index ca744af9..c60c4070 100644
--- a/test/fuzzer/repro_codegen.c
+++ b/test/fuzzer/repro_codegen.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <ctype.h>
 #include <libgen.h>
 #include <stdio.h>
 
@@ -26,9 +27,16 @@ main(int argc, char *argv[]) {
 		 "");
 	puts(HEADER);
 	for (int i = 1; i < argc; i++) {
-		printf(TEST_PRE_FORMAT, basename(argv[i]));
 		FILE *f = fopen(argv[i], "rb");
 		assert(f);
+
+		char *name = basename(argv[i]);
+		for (char *p = name; *p; p++) {
+			if (!isalnum(*p)) {
+				*p = '_';
+			}
+		}
+		printf(TEST_PRE_FORMAT, name);
 		int c;
 		while ((c = fgetc(f)) != EOF) {
 			printf("0x%02x, ", c);