diff --git a/tests-fuzz/.gitignore b/tests-fuzz/.gitignore
index bd841d057bd255b312c9d52ac3a9241bcffcc56d..ecc866b48a917c0bd456e9a2f9a3c811681a863c 100644
--- a/tests-fuzz/.gitignore
+++ b/tests-fuzz/.gitignore
@@ -6,5 +6,5 @@
 
 /*.trs
 /*.log
-/packet_libfuzzer
-/zscanner_libfuzzer
+/fuzz_packet
+/fuzz_zscanner
diff --git a/tests-fuzz/Makefile.am b/tests-fuzz/Makefile.am
index c2941b12fe0071e957a26464d0ee553e712d7fb8..9400f4250fa6d222445e71a3229eb1eaae3bbf1c 100644
--- a/tests-fuzz/Makefile.am
+++ b/tests-fuzz/Makefile.am
@@ -2,37 +2,37 @@ AM_CPPFLAGS = \
 	-include $(top_builddir)/src/config.h	\
 	-I$(top_srcdir)/src			\
 	-I$(top_srcdir)/src/dnssec/lib		\
-	-DCONFIG_DIR='"${config_dir}"'          \
-	-DSTORAGE_DIR='"${storage_dir}"'        \
+	-DCONFIG_DIR='"${config_dir}"'		\
+	-DSTORAGE_DIR='"${storage_dir}"'	\
 	-DRUN_DIR='"${run_dir}"'		\
 	-DSRCDIR=\"$(abs_srcdir)\"
 
 FUZZERS = \
-	packet_libfuzzer	\
-	zscanner_libfuzzer
+	fuzz_packet	\
+	fuzz_zscanner
 
 check_PROGRAMS = $(FUZZERS)
 
-packet_libfuzzer_SOURCES = packet_libfuzzer.c
-packet_libfuzzer_LDADD = $(top_builddir)/src/libknot.la
+fuzz_packet_SOURCES = fuzz_packet.c
+fuzz_packet_LDADD = $(top_builddir)/src/libknot.la
 
-zscanner_libfuzzer_SOURCES = zscanner_libfuzzer.c
-zscanner_libfuzzer_LDADD = $(top_builddir)/src/zscanner/libzscanner.la
+fuzz_zscanner_SOURCES = fuzz_zscanner.c
+fuzz_zscanner_LDADD = $(top_builddir)/src/zscanner/libzscanner.la
 
 if OSS_FUZZ
 
 # CFLAGS, LDFLAGS, etc. are defined by the oss-fuzz environment; just link
 # in the fuzzing engine
 
-packet_libfuzzer_LDADD += ${LIB_FUZZING_ENGINE} -lc++
-zscanner_libfuzzer_LDADD += ${LIB_FUZZING_ENGINE} -lc++
+fuzz_packet_LDADD += ${LIB_FUZZING_ENGINE} -lc++
+fuzz_zscanner_LDADD += ${LIB_FUZZING_ENGINE} -lc++
 
 else
 
 if SANITIZE_FUZZER
 
-packet_libfuzzer_LDFLAGS = -fsanitize=fuzzer
-zscanner_libfuzzer_LDFLAGS = -fsanitize=fuzzer
+fuzz_packet_LDFLAGS = -fsanitize=fuzzer
+fuzz_zscanner_LDFLAGS = -fsanitize=fuzzer
 
 # Ensure that fuzzers execute successfully with a benign input
 
@@ -41,8 +41,8 @@ EXTRA_DIST = check/check_fuzzers.test
 
 else
 
-packet_libfuzzer_SOURCES += main.c
-zscanner_libfuzzer_SOURCES += main.c
+fuzz_packet_SOURCES += main.c
+fuzz_zscanner_SOURCES += main.c
 AM_CPPFLAGS += -DTEST_RUN
 TESTS = $(FUZZERS)
 
diff --git a/tests-fuzz/check/check_fuzzers.test b/tests-fuzz/check/check_fuzzers.test
index 9193eec00f5ab96b5d99e8f760d91d994c9f8e29..aa46f5f2d2596bca0b6732aa7b92555f6331aeef 100755
--- a/tests-fuzz/check/check_fuzzers.test
+++ b/tests-fuzz/check/check_fuzzers.test
@@ -5,5 +5,5 @@
 
 set -e
 
-./packet_libfuzzer check/sample-seed.pkt
-./zscanner_libfuzzer check/sample-seed.pkt
+./fuzz_packet check/sample-seed.pkt
+./fuzz_zscanner check/sample-seed.pkt
diff --git a/tests-fuzz/packet_libfuzzer.c b/tests-fuzz/fuzz_packet.c
similarity index 100%
rename from tests-fuzz/packet_libfuzzer.c
rename to tests-fuzz/fuzz_packet.c
diff --git a/tests-fuzz/zscanner_libfuzzer.c b/tests-fuzz/fuzz_zscanner.c
similarity index 100%
rename from tests-fuzz/zscanner_libfuzzer.c
rename to tests-fuzz/fuzz_zscanner.c