diff --git a/fuzzing/Makefile b/fuzzing/Makefile
index cb5d1920..c94f12d2 100644
--- a/fuzzing/Makefile
+++ b/fuzzing/Makefile
@@ -5,7 +5,7 @@ all:
 	zip -r corpora/db_dump_seed_corpus.zip ../test/apps/db_dump/data/
 	$(MAKE) -C apps $@
 	$(MAKE) -C broker $@
-	$(MAKE) -C lib $@
+	$(MAKE) -C libcommon $@
 	$(MAKE) -C plugins $@
 
 clean:
@@ -14,5 +14,5 @@ clean:
 	-rm -f corpora/db_dump_seed_corpus.zip
 	$(MAKE) -C apps $@
 	$(MAKE) -C broker $@
-	$(MAKE) -C lib $@
+	$(MAKE) -C libcommon $@
 	$(MAKE) -C plugins $@
diff --git a/fuzzing/lib/Makefile b/fuzzing/libcommon/Makefile
similarity index 57%
rename from fuzzing/lib/Makefile
rename to fuzzing/libcommon/Makefile
index 5ee17f00..82081ff9 100644
--- a/fuzzing/lib/Makefile
+++ b/fuzzing/libcommon/Makefile
@@ -4,26 +4,26 @@ include ${R}/fuzzing/config.mk
 .PHONY: all clean
 
 FUZZERS:= \
-	lib_fuzz_pub_topic_check2 \
-	lib_fuzz_sub_topic_check2 \
-	lib_fuzz_utf8
+	libcommon_fuzz_pub_topic_check2 \
+	libcommon_fuzz_sub_topic_check2 \
+	libcommon_fuzz_utf8
 
 LOCAL_CPPFLAGS+=-I${R}/include/
 LOCAL_CXXFLAGS+=-g -Wall -Werror -pthread
 LOCAL_LDFLAGS+=
-LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) ${R}/lib/libmosquitto.a -lssl -lcrypto ${R}/libcommon/libmosquitto_common.a -Wl,-Bstatic -largon2 -Wl,-Bdynamic
+LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) -lssl -lcrypto ${R}/libcommon/libmosquitto_common.a -Wl,-Bstatic -largon2 -Wl,-Bdynamic
 
 all: $(FUZZERS)
 
-lib_fuzz_pub_topic_check2 : lib_fuzz_pub_topic_check2.cpp
+libcommon_fuzz_pub_topic_check2 : libcommon_fuzz_pub_topic_check2.cpp
 	$(CXX) $(LOCAL_CXXFLAGS) $(LOCAL_CPPFLAGS) $(LOCAL_LDFLAGS) -o $@ $^ $(LOCAL_LIBADD)
 	install $@ ${OUT}/$@
 
-lib_fuzz_sub_topic_check2 : lib_fuzz_sub_topic_check2.cpp
+libcommon_fuzz_sub_topic_check2 : libcommon_fuzz_sub_topic_check2.cpp
 	$(CXX) $(LOCAL_CXXFLAGS) $(LOCAL_CPPFLAGS) $(LOCAL_LDFLAGS) -o $@ $^ $(LOCAL_LIBADD)
 	install $@ ${OUT}/$@
 
-lib_fuzz_utf8 : lib_fuzz_utf8.cpp
+libcommon_fuzz_utf8 : libcommon_fuzz_utf8.cpp
 	$(CXX) $(LOCAL_CXXFLAGS) $(LOCAL_CPPFLAGS) $(LOCAL_LDFLAGS) -o $@ $^ $(LOCAL_LIBADD)
 	install $@ ${OUT}/$@
 
diff --git a/fuzzing/lib/lib_fuzz_pub_topic_check2.cpp b/fuzzing/libcommon/libcommon_fuzz_pub_topic_check2.cpp
similarity index 100%
rename from fuzzing/lib/lib_fuzz_pub_topic_check2.cpp
rename to fuzzing/libcommon/libcommon_fuzz_pub_topic_check2.cpp
diff --git a/fuzzing/lib/lib_fuzz_sub_topic_check2.cpp b/fuzzing/libcommon/libcommon_fuzz_sub_topic_check2.cpp
similarity index 100%
rename from fuzzing/lib/lib_fuzz_sub_topic_check2.cpp
rename to fuzzing/libcommon/libcommon_fuzz_sub_topic_check2.cpp
diff --git a/fuzzing/lib/lib_fuzz_utf8.cpp b/fuzzing/libcommon/libcommon_fuzz_utf8.cpp
similarity index 100%
rename from fuzzing/lib/lib_fuzz_utf8.cpp
rename to fuzzing/libcommon/libcommon_fuzz_utf8.cpp