diff --git a/test/fuzz/fuzz-dhcp-server-relay/7d924e16295cd14e12a01a5631ea94a3d11d1b52 b/test/fuzz/fuzz-dhcp-server-relay/sample1
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server-relay/7d924e16295cd14e12a01a5631ea94a3d11d1b52
rename to test/fuzz/fuzz-dhcp-server-relay/sample1
diff --git a/test/fuzz/fuzz-dhcp-server-relay/fe4344e65d495388540dc1bf8eae70c46f8b867c b/test/fuzz/fuzz-dhcp-server-relay/sample2
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server-relay/fe4344e65d495388540dc1bf8eae70c46f8b867c
rename to test/fuzz/fuzz-dhcp-server-relay/sample2
diff --git a/test/fuzz/fuzz-dhcp-server/crash-64c861ad981838e509920e8538640ef46feaae66 b/test/fuzz/fuzz-dhcp-server/buffer-overflow-1
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server/crash-64c861ad981838e509920e8538640ef46feaae66
rename to test/fuzz/fuzz-dhcp-server/buffer-overflow-1
diff --git a/test/fuzz/fuzz-dhcp-server/crash-e13ccbc34d0fa5add0ee1eb69ed630dd2cdfb1ca b/test/fuzz/fuzz-dhcp-server/buffer-overflow-2
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server/crash-e13ccbc34d0fa5add0ee1eb69ed630dd2cdfb1ca
rename to test/fuzz/fuzz-dhcp-server/buffer-overflow-2
diff --git a/test/fuzz/fuzz-dns-packet/crash-497be373856c321a8a7b06589df9b2ff2e0d866a b/test/fuzz/fuzz-dns-packet/crash-null
similarity index 100%
rename from test/fuzz/fuzz-dns-packet/crash-497be373856c321a8a7b06589df9b2ff2e0d866a
rename to test/fuzz/fuzz-dns-packet/crash-null
diff --git a/test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 b/test/fuzz/fuzz-ndisc-rs/infinite-loop-recv
similarity index 100%
rename from test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1
rename to test/fuzz/fuzz-ndisc-rs/infinite-loop-recv
diff --git a/test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b b/test/fuzz/fuzz-ndisc-rs/infinite-loop-timeout
similarity index 100%
rename from test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b
rename to test/fuzz/fuzz-ndisc-rs/infinite-loop-timeout
diff --git a/test/fuzz/fuzz-netdev-parser/25-bond-active-backup-slave.netdev b/test/fuzz/fuzz-netdev-parser/25-bond-backup.netdev
similarity index 100%
rename from test/fuzz/fuzz-netdev-parser/25-bond-active-backup-slave.netdev
rename to test/fuzz/fuzz-netdev-parser/25-bond-backup.netdev
diff --git a/test/fuzz/fuzz-netdev-parser/25-ipip-tunnel-independent.netdev b/test/fuzz/fuzz-netdev-parser/25-ipip-tunnel2.netdev
similarity index 100%
rename from test/fuzz/fuzz-netdev-parser/25-ipip-tunnel-independent.netdev
rename to test/fuzz/fuzz-netdev-parser/25-ipip-tunnel2.netdev
diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-critical-connection b/test/fuzz/fuzz-network-parser/dhcp-critical-connection
similarity index 100%
rename from test/fuzz/fuzz-network-parser/dhcp-client-critical-connection
rename to test/fuzz/fuzz-network-parser/dhcp-critical-connection
diff --git a/test/fuzz/fuzz-nspawn-oci/crash-bffbd2085d4e95c47e9749b3f4a2dbc0580c20d3 b/test/fuzz/fuzz-nspawn-oci/double-free
similarity index 100%
rename from test/fuzz/fuzz-nspawn-oci/crash-bffbd2085d4e95c47e9749b3f4a2dbc0580c20d3
rename to test/fuzz/fuzz-nspawn-oci/double-free
diff --git a/test/fuzz/fuzz-nspawn-oci/crash-db0595479ee2e625fa5419a821009b5eb4d809b7 b/test/fuzz/fuzz-nspawn-oci/no-mount-source
similarity index 100%
rename from test/fuzz/fuzz-nspawn-oci/crash-db0595479ee2e625fa5419a821009b5eb4d809b7
rename to test/fuzz/fuzz-nspawn-oci/no-mount-source
diff --git a/test/fuzz/fuzz-varlink/timeout-d8a88bf4adea54537d21e3afb396e1a55c5b58bf b/test/fuzz/fuzz-varlink/timeout
similarity index 100%
rename from test/fuzz/fuzz-varlink/timeout-d8a88bf4adea54537d21e3afb396e1a55c5b58bf
rename to test/fuzz/fuzz-varlink/timeout
diff --git a/test/fuzz/fuzz-xdg-desktop/org.gnome.SettingsDaemon.Power.desktop b/test/fuzz/fuzz-xdg-desktop/SettingsDaemon.desktop
similarity index 100%
rename from test/fuzz/fuzz-xdg-desktop/org.gnome.SettingsDaemon.Power.desktop
rename to test/fuzz/fuzz-xdg-desktop/SettingsDaemon.desktop