diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake
index 8b942004aa..983449ff03 100644
--- a/cmake/modules/WiresharkPlugin.cmake
+++ b/cmake/modules/WiresharkPlugin.cmake
@@ -28,7 +28,7 @@ macro(SET_MODULE_INFO _plugin _ver_major _ver_minor _ver_micro _ver_extra)
 	add_definitions(-DPLUGIN_VERSION=\"${PLUGIN_VERSION}\")
 endmacro()
 
-macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
+macro(ADD_WIRESHARK_PLUGIN_LIBRARY _plugin _subfolder)
 	add_library(${_plugin} MODULE
 		${PLUGIN_FILES}
 		${PLUGIN_RC_FILE}
@@ -53,8 +53,13 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
 	add_dependencies(plugins ${_plugin})
 endmacro()
 
+macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
+	message(WARNING "${CMAKE_PARENT_LIST_FILE}: add_plugin_library is deprecated. Use add_wireshark_plugin_library instead.")
+	ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
+endmacro()
+
 macro(ADD_LOGWOLF_PLUGIN_LIBRARY _plugin _subfolder)
-	ADD_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
+	ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
 
 	set_target_properties(${_plugin} PROPERTIES
 		LIBRARY_OUTPUT_DIRECTORY ${LOGWOLF_PLUGIN_DIR}/${_subfolder}
diff --git a/plugins/codecs/G711/CMakeLists.txt b/plugins/codecs/G711/CMakeLists.txt
index 2b0d6ff23d..cc9ff0f191 100644
--- a/plugins/codecs/G711/CMakeLists.txt
+++ b/plugins/codecs/G711/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(g711 codecs)
+add_wireshark_plugin_library(g711 codecs)
 
 target_include_directories(g711 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/G722/CMakeLists.txt b/plugins/codecs/G722/CMakeLists.txt
index 5807d4915d..37c08cd12e 100644
--- a/plugins/codecs/G722/CMakeLists.txt
+++ b/plugins/codecs/G722/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(g722 codecs)
+add_wireshark_plugin_library(g722 codecs)
 
 target_include_directories(g722 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/G726/CMakeLists.txt b/plugins/codecs/G726/CMakeLists.txt
index 8eac543891..239b67f0e5 100644
--- a/plugins/codecs/G726/CMakeLists.txt
+++ b/plugins/codecs/G726/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(g726 codecs)
+add_wireshark_plugin_library(g726 codecs)
 
 target_include_directories(g726 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/G729/CMakeLists.txt b/plugins/codecs/G729/CMakeLists.txt
index 2a301ea279..6c5330021f 100644
--- a/plugins/codecs/G729/CMakeLists.txt
+++ b/plugins/codecs/G729/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(g729 codecs)
+add_wireshark_plugin_library(g729 codecs)
 
 target_include_directories(g729 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/iLBC/CMakeLists.txt b/plugins/codecs/iLBC/CMakeLists.txt
index 7b0737f3c0..8929204301 100644
--- a/plugins/codecs/iLBC/CMakeLists.txt
+++ b/plugins/codecs/iLBC/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(ilbc codecs)
+add_wireshark_plugin_library(ilbc codecs)
 
 target_include_directories(ilbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/l16_mono/CMakeLists.txt b/plugins/codecs/l16_mono/CMakeLists.txt
index 4deb0ff2c6..f90713b70b 100644
--- a/plugins/codecs/l16_mono/CMakeLists.txt
+++ b/plugins/codecs/l16_mono/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(l16mono codecs)
+add_wireshark_plugin_library(l16mono codecs)
 
 target_include_directories(l16mono PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/opus_dec/CMakeLists.txt b/plugins/codecs/opus_dec/CMakeLists.txt
index 84e19ed974..dc3bdc2180 100644
--- a/plugins/codecs/opus_dec/CMakeLists.txt
+++ b/plugins/codecs/opus_dec/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(opus_dec codecs)
+add_wireshark_plugin_library(opus_dec codecs)
 
 target_include_directories(opus_dec PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/codecs/sbc/CMakeLists.txt b/plugins/codecs/sbc/CMakeLists.txt
index e787d188ed..d12de70d59 100644
--- a/plugins/codecs/sbc/CMakeLists.txt
+++ b/plugins/codecs/sbc/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${CODEC_SRC}
 )
 
-add_plugin_library(sbc codecs)
+add_wireshark_plugin_library(sbc codecs)
 
 target_include_directories(sbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
 
diff --git a/plugins/epan/ethercat/CMakeLists.txt b/plugins/epan/ethercat/CMakeLists.txt
index 3211c28742..afa46e8272 100644
--- a/plugins/epan/ethercat/CMakeLists.txt
+++ b/plugins/epan/ethercat/CMakeLists.txt
@@ -38,7 +38,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(ethercat epan)
+add_wireshark_plugin_library(ethercat epan)
 
 target_link_libraries(ethercat epan)
 
diff --git a/plugins/epan/falco_bridge/CMakeLists.txt b/plugins/epan/falco_bridge/CMakeLists.txt
index 9d5bac1c14..a3bbe796f4 100644
--- a/plugins/epan/falco_bridge/CMakeLists.txt
+++ b/plugins/epan/falco_bridge/CMakeLists.txt
@@ -33,7 +33,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(falco-bridge epan)
+add_logwolf_plugin_library(falco-bridge epan)
 
 # XXX Hacks; need to fix in falcosecurity-libs.
 target_compile_definitions(falco-bridge PRIVATE
diff --git a/plugins/epan/gryphon/CMakeLists.txt b/plugins/epan/gryphon/CMakeLists.txt
index 8bf5939158..e047c06911 100644
--- a/plugins/epan/gryphon/CMakeLists.txt
+++ b/plugins/epan/gryphon/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(gryphon epan)
+add_wireshark_plugin_library(gryphon epan)
 
 target_link_libraries(gryphon epan)
 
diff --git a/plugins/epan/irda/CMakeLists.txt b/plugins/epan/irda/CMakeLists.txt
index 3c8b6058ce..31bfe89720 100644
--- a/plugins/epan/irda/CMakeLists.txt
+++ b/plugins/epan/irda/CMakeLists.txt
@@ -34,7 +34,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(irda epan)
+add_wireshark_plugin_library(irda epan)
 
 target_link_libraries(irda epan)
 
diff --git a/plugins/epan/mate/CMakeLists.txt b/plugins/epan/mate/CMakeLists.txt
index 53f2ee3f1e..b445e88b94 100644
--- a/plugins/epan/mate/CMakeLists.txt
+++ b/plugins/epan/mate/CMakeLists.txt
@@ -48,7 +48,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-add_plugin_library(mate epan)
+add_wireshark_plugin_library(mate epan)
 
 target_link_libraries(mate epan)
 
diff --git a/plugins/epan/opcua/CMakeLists.txt b/plugins/epan/opcua/CMakeLists.txt
index 674b9838b5..2f43d42cf9 100644
--- a/plugins/epan/opcua/CMakeLists.txt
+++ b/plugins/epan/opcua/CMakeLists.txt
@@ -48,7 +48,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-add_plugin_library(opcua epan)
+add_wireshark_plugin_library(opcua epan)
 
 target_link_libraries(opcua epan)
 
diff --git a/plugins/epan/pluginifdemo/CMakeLists.txt b/plugins/epan/pluginifdemo/CMakeLists.txt
index 6a97cdfa64..4f7c89f7ee 100644
--- a/plugins/epan/pluginifdemo/CMakeLists.txt
+++ b/plugins/epan/pluginifdemo/CMakeLists.txt
@@ -50,7 +50,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(pluginifdemo epan)
+add_wireshark_plugin_library(pluginifdemo epan)
 
 target_link_libraries(pluginifdemo epan Qt5::Core Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia)
 
diff --git a/plugins/epan/profinet/CMakeLists.txt b/plugins/epan/profinet/CMakeLists.txt
index 1c3d41c3a4..7e6ca56bba 100644
--- a/plugins/epan/profinet/CMakeLists.txt
+++ b/plugins/epan/profinet/CMakeLists.txt
@@ -47,7 +47,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-add_plugin_library(profinet epan)
+add_wireshark_plugin_library(profinet epan)
 
 target_link_libraries(profinet epan)
 
diff --git a/plugins/epan/stats_tree/CMakeLists.txt b/plugins/epan/stats_tree/CMakeLists.txt
index ffd3129f29..7986d870bb 100644
--- a/plugins/epan/stats_tree/CMakeLists.txt
+++ b/plugins/epan/stats_tree/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${TAP_SRC}
 )
 
-add_plugin_library(stats_tree epan)
+add_wireshark_plugin_library(stats_tree epan)
 
 target_link_libraries(stats_tree epan)
 
diff --git a/plugins/epan/transum/CMakeLists.txt b/plugins/epan/transum/CMakeLists.txt
index dbf9dd28fb..d26d4e464a 100644
--- a/plugins/epan/transum/CMakeLists.txt
+++ b/plugins/epan/transum/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-add_plugin_library(transum epan)
+add_wireshark_plugin_library(transum epan)
 
 target_link_libraries(transum epan)
 
diff --git a/plugins/epan/unistim/CMakeLists.txt b/plugins/epan/unistim/CMakeLists.txt
index 8c349b8515..b44ca8bcad 100644
--- a/plugins/epan/unistim/CMakeLists.txt
+++ b/plugins/epan/unistim/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(unistim epan)
+add_wireshark_plugin_library(unistim epan)
 
 target_link_libraries(unistim epan)
 
diff --git a/plugins/epan/wimax/CMakeLists.txt b/plugins/epan/wimax/CMakeLists.txt
index 449805ec90..50c3a7a34b 100644
--- a/plugins/epan/wimax/CMakeLists.txt
+++ b/plugins/epan/wimax/CMakeLists.txt
@@ -79,7 +79,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-add_plugin_library(wimax epan)
+add_wireshark_plugin_library(wimax epan)
 
 target_link_libraries(wimax epan)
 
diff --git a/plugins/epan/wimaxasncp/CMakeLists.txt b/plugins/epan/wimaxasncp/CMakeLists.txt
index 39aa634dbf..8a35c6c566 100644
--- a/plugins/epan/wimaxasncp/CMakeLists.txt
+++ b/plugins/epan/wimaxasncp/CMakeLists.txt
@@ -36,7 +36,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(wimaxasncp epan)
+add_wireshark_plugin_library(wimaxasncp epan)
 
 target_link_libraries(wimaxasncp epan)
 
diff --git a/plugins/epan/wimaxmacphy/CMakeLists.txt b/plugins/epan/wimaxmacphy/CMakeLists.txt
index 12e940892a..b3e4e3257c 100644
--- a/plugins/epan/wimaxmacphy/CMakeLists.txt
+++ b/plugins/epan/wimaxmacphy/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${DISSECTOR_SRC}
 )
 
-add_plugin_library(wimaxmacphy epan)
+add_wireshark_plugin_library(wimaxmacphy epan)
 
 target_link_libraries(wimaxmacphy epan)
 
diff --git a/plugins/wiretap/usbdump/CMakeLists.txt b/plugins/wiretap/usbdump/CMakeLists.txt
index 25acb5d95e..14fab19de3 100644
--- a/plugins/wiretap/usbdump/CMakeLists.txt
+++ b/plugins/wiretap/usbdump/CMakeLists.txt
@@ -32,7 +32,7 @@ register_plugin_files(plugin.c
 	${WIRETAP_SRC}
 )
 
-add_plugin_library(usbdump wiretap)
+add_wireshark_plugin_library(usbdump wiretap)
 
 target_include_directories(usbdump PRIVATE ${CMAKE_SOURCE_DIR}/wiretap)