diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-5609602292252672 b/test/fuzz/fuzz-manager-serialize/activation-details-path
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-5609602292252672
rename to test/fuzz/fuzz-manager-serialize/activation-details-path
diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6207619447259136.fuzz b/test/fuzz/fuzz-manager-serialize/activation-details-service
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6207619447259136.fuzz
rename to test/fuzz/fuzz-manager-serialize/activation-details-service
diff --git a/test/fuzz/fuzz-manager-serialize/crash-fc5f5254c946097a774cccec5427289b748e6f2a b/test/fuzz/fuzz-manager-serialize/empty-attachment-path
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/crash-fc5f5254c946097a774cccec5427289b748e6f2a
rename to test/fuzz/fuzz-manager-serialize/empty-attachment-path
diff --git a/test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961 b/test/fuzz/fuzz-manager-serialize/invalid-varlink-sock
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961
rename to test/fuzz/fuzz-manager-serialize/invalid-varlink-sock
diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-4847017160212480.fuzz b/test/fuzz/fuzz-manager-serialize/netns-invalid-socket
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-4847017160212480.fuzz
rename to test/fuzz/fuzz-manager-serialize/netns-invalid-socket
diff --git a/test/fuzz/fuzz-manager-serialize/crash-9eec6b7ef6fd5c9568189f9259e6ce0546752085 b/test/fuzz/fuzz-manager-serialize/service-accept-socket
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/crash-9eec6b7ef6fd5c9568189f9259e6ce0546752085
rename to test/fuzz/fuzz-manager-serialize/service-accept-socket
diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6018678331408384 b/test/fuzz/fuzz-manager-serialize/socket-int-max
similarity index 100%
rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6018678331408384
rename to test/fuzz/fuzz-manager-serialize/socket-int-max
diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-ipv4-dhcp-settings b/test/fuzz/fuzz-network-parser/dhcpv4-client-settings
similarity index 100%
rename from test/fuzz/fuzz-network-parser/dhcp-client-ipv4-dhcp-settings
rename to test/fuzz/fuzz-network-parser/dhcpv4-client-settings
diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-ipv6-rapid-commit b/test/fuzz/fuzz-network-parser/dhcpv6-client-rapid-commit
similarity index 100%
rename from test/fuzz/fuzz-network-parser/dhcp-client-ipv6-rapid-commit
rename to test/fuzz/fuzz-network-parser/dhcpv6-client-rapid-commit
diff --git a/test/fuzz/fuzz-network-parser/25-ipv6-address-label-section b/test/fuzz/fuzz-network-parser/ipv6-address-label-section
similarity index 100%
rename from test/fuzz/fuzz-network-parser/25-ipv6-address-label-section
rename to test/fuzz/fuzz-network-parser/ipv6-address-label-section
diff --git a/test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free.input b/test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free
similarity index 100%
rename from test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free.input
rename to test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free
diff --git "a/test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap" "b/test/fuzz/fuzz-unit-file/dm-back\\x2dslash.swap"
similarity index 100%
rename from "test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap"
rename to "test/fuzz/fuzz-unit-file/dm-back\\x2dslash.swap"