diff --git a/src/analyzer/protocol/arp/Plugin.cc b/src/analyzer/protocol/arp/Plugin.cc
index 18bba8067c..1ff5f08c63 100644
--- a/src/analyzer/protocol/arp/Plugin.cc
+++ b/src/analyzer/protocol/arp/Plugin.cc
@@ -1,10 +1,8 @@
 // See the file  in the main distribution directory for copyright.
 
-
 #include "plugin/Plugin.h"
 
-namespace plugin {
-namespace Zeek_ARP {
+namespace zeek::plugin::detail::Zeek_ARP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -17,5 +15,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_ARP
diff --git a/src/analyzer/protocol/ayiya/Plugin.cc b/src/analyzer/protocol/ayiya/Plugin.cc
index 9f263e2577..6e52239191 100644
--- a/src/analyzer/protocol/ayiya/Plugin.cc
+++ b/src/analyzer/protocol/ayiya/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_AYIYA {
+namespace zeek::plugin::detail::Zeek_AYIYA {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_AYIYA
diff --git a/src/analyzer/protocol/bittorrent/Plugin.cc b/src/analyzer/protocol/bittorrent/Plugin.cc
index 1756a43a35..6dba2f78cf 100644
--- a/src/analyzer/protocol/bittorrent/Plugin.cc
+++ b/src/analyzer/protocol/bittorrent/Plugin.cc
@@ -5,8 +5,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_BitTorrent {
+namespace zeek::plugin::plugin::Zeek_BitTorrent {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -22,5 +21,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::plugin::Zeek_BitTorrent
diff --git a/src/analyzer/protocol/conn-size/Plugin.cc b/src/analyzer/protocol/conn-size/Plugin.cc
index 919f366a1e..5470abbd1d 100644
--- a/src/analyzer/protocol/conn-size/Plugin.cc
+++ b/src/analyzer/protocol/conn-size/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_ConnSize {
+namespace zeek::plugin::detail::Zeek_ConnSize {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_ConnSize
diff --git a/src/analyzer/protocol/dce-rpc/Plugin.cc b/src/analyzer/protocol/dce-rpc/Plugin.cc
index 2d9523e428..6afa802c3b 100644
--- a/src/analyzer/protocol/dce-rpc/Plugin.cc
+++ b/src/analyzer/protocol/dce-rpc/Plugin.cc
@@ -5,8 +5,7 @@
 
 #include "DCE_RPC.h"
 
-namespace plugin {
-namespace Zeek_DCE_RPC {
+namespace zeek::plugin::detail::Zeek_DCE_RPC {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_DCE_RPC
diff --git a/src/analyzer/protocol/dhcp/Plugin.cc b/src/analyzer/protocol/dhcp/Plugin.cc
index dee7b8a2b7..6ff2db8d8f 100644
--- a/src/analyzer/protocol/dhcp/Plugin.cc
+++ b/src/analyzer/protocol/dhcp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_DHCP {
+namespace zeek::plugin::detail::Zeek_DHCP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_DHCP
diff --git a/src/analyzer/protocol/dnp3/Plugin.cc b/src/analyzer/protocol/dnp3/Plugin.cc
index af7c216284..3061fb2ce9 100644
--- a/src/analyzer/protocol/dnp3/Plugin.cc
+++ b/src/analyzer/protocol/dnp3/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_DNP3 {
+namespace zeek::plugin::detail::Zeek_DNP3 {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_DNP3
diff --git a/src/analyzer/protocol/dns/Plugin.cc b/src/analyzer/protocol/dns/Plugin.cc
index 3d58a39005..1a31bbd56a 100644
--- a/src/analyzer/protocol/dns/Plugin.cc
+++ b/src/analyzer/protocol/dns/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_DNS {
+namespace zeek::plugin::detail::Zeek_DNS {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_DNS
diff --git a/src/analyzer/protocol/file/Plugin.cc b/src/analyzer/protocol/file/Plugin.cc
index 89d94819a8..e700d1644e 100644
--- a/src/analyzer/protocol/file/Plugin.cc
+++ b/src/analyzer/protocol/file/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_File {
+namespace zeek::plugin::detail::Zeek_File {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_File
diff --git a/src/analyzer/protocol/finger/Plugin.cc b/src/analyzer/protocol/finger/Plugin.cc
index 65b77a24ea..7bc3322e29 100644
--- a/src/analyzer/protocol/finger/Plugin.cc
+++ b/src/analyzer/protocol/finger/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Finger {
+namespace zeek::plugin::detail::Zeek_Finger {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Finger
diff --git a/src/analyzer/protocol/ftp/Plugin.cc b/src/analyzer/protocol/ftp/Plugin.cc
index 578de9c7bd..5429f61152 100644
--- a/src/analyzer/protocol/ftp/Plugin.cc
+++ b/src/analyzer/protocol/ftp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_FTP {
+namespace zeek::plugin::detail::Zeek_FTP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_FTP
diff --git a/src/analyzer/protocol/gnutella/Plugin.cc b/src/analyzer/protocol/gnutella/Plugin.cc
index 5c216cff95..d3e5d2e6e5 100644
--- a/src/analyzer/protocol/gnutella/Plugin.cc
+++ b/src/analyzer/protocol/gnutella/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Gnutella {
+namespace zeek::plugin::detail::Zeek_Gnutella {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Gnutella
diff --git a/src/analyzer/protocol/gssapi/Plugin.cc b/src/analyzer/protocol/gssapi/Plugin.cc
index 12bdccf358..6d4704e60e 100644
--- a/src/analyzer/protocol/gssapi/Plugin.cc
+++ b/src/analyzer/protocol/gssapi/Plugin.cc
@@ -4,8 +4,7 @@
 
 #include "GSSAPI.h"
 
-namespace plugin {
-namespace Zeek_GSSAPI {
+namespace zeek::plugin::detail::Zeek_GSSAPI {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_GSSAPI
diff --git a/src/analyzer/protocol/gtpv1/Plugin.cc b/src/analyzer/protocol/gtpv1/Plugin.cc
index f6c68e63d7..ec0b011bf7 100644
--- a/src/analyzer/protocol/gtpv1/Plugin.cc
+++ b/src/analyzer/protocol/gtpv1/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_GTPv1 {
+namespace zeek::plugin::detail::Zeek_GTPv1 {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_GTPv1
diff --git a/src/analyzer/protocol/http/Plugin.cc b/src/analyzer/protocol/http/Plugin.cc
index f2e4dfa4a9..cb2c7a4351 100644
--- a/src/analyzer/protocol/http/Plugin.cc
+++ b/src/analyzer/protocol/http/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_HTTP {
+namespace zeek::plugin::detail::Zeek_HTTP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_HTTP
diff --git a/src/analyzer/protocol/icmp/Plugin.cc b/src/analyzer/protocol/icmp/Plugin.cc
index 3d08378f4d..2a808603e4 100644
--- a/src/analyzer/protocol/icmp/Plugin.cc
+++ b/src/analyzer/protocol/icmp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_ICMP {
+namespace zeek::plugin::detail::Zeek_ICMP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_ICMP
diff --git a/src/analyzer/protocol/ident/Plugin.cc b/src/analyzer/protocol/ident/Plugin.cc
index 54bf109a06..87c8010619 100644
--- a/src/analyzer/protocol/ident/Plugin.cc
+++ b/src/analyzer/protocol/ident/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Ident {
+namespace zeek::plugin::detail::Zeek_Ident {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Ident
diff --git a/src/analyzer/protocol/imap/Plugin.cc b/src/analyzer/protocol/imap/Plugin.cc
index 2a00b7d2fe..46dc032e7e 100644
--- a/src/analyzer/protocol/imap/Plugin.cc
+++ b/src/analyzer/protocol/imap/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_IMAP {
+namespace zeek::plugin::detail::Zeek_IMAP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_IMAP
diff --git a/src/analyzer/protocol/irc/Plugin.cc b/src/analyzer/protocol/irc/Plugin.cc
index ebc66a8241..92120e6ed0 100644
--- a/src/analyzer/protocol/irc/Plugin.cc
+++ b/src/analyzer/protocol/irc/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_IRC {
+namespace zeek::plugin::detail::Zeek_IRC {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_IRC
diff --git a/src/analyzer/protocol/krb/Plugin.cc b/src/analyzer/protocol/krb/Plugin.cc
index 11fd9df27e..8d4bfe2011 100644
--- a/src/analyzer/protocol/krb/Plugin.cc
+++ b/src/analyzer/protocol/krb/Plugin.cc
@@ -5,8 +5,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_KRB {
+namespace zeek::plugin::detail::Zeek_KRB {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_KRB
diff --git a/src/analyzer/protocol/login/Plugin.cc b/src/analyzer/protocol/login/Plugin.cc
index fb9551f47e..60aa82760c 100644
--- a/src/analyzer/protocol/login/Plugin.cc
+++ b/src/analyzer/protocol/login/Plugin.cc
@@ -7,8 +7,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Login {
+namespace zeek::plugin::detail::Zeek_Login {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -29,5 +28,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Login
diff --git a/src/analyzer/protocol/mime/Plugin.cc b/src/analyzer/protocol/mime/Plugin.cc
index fefe969098..0e06a20431 100644
--- a/src/analyzer/protocol/mime/Plugin.cc
+++ b/src/analyzer/protocol/mime/Plugin.cc
@@ -3,8 +3,7 @@
 
 #include "plugin/Plugin.h"
 
-namespace plugin {
-namespace Zeek_MIME {
+namespace zeek::plugin::detail::Zeek_MIME {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -17,5 +16,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_MIME
diff --git a/src/analyzer/protocol/modbus/Plugin.cc b/src/analyzer/protocol/modbus/Plugin.cc
index 4645280e64..ddfee8bebe 100644
--- a/src/analyzer/protocol/modbus/Plugin.cc
+++ b/src/analyzer/protocol/modbus/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Modbus {
+namespace zeek::plugin::detail::Zeek_Modbus {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Modbus
diff --git a/src/analyzer/protocol/mqtt/Plugin.cc b/src/analyzer/protocol/mqtt/Plugin.cc
index cc0b7dcb47..cac61029fc 100644
--- a/src/analyzer/protocol/mqtt/Plugin.cc
+++ b/src/analyzer/protocol/mqtt/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_MQTT {
+namespace zeek::plugin::detail::Zeek_MQTT {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_MQTT
diff --git a/src/analyzer/protocol/mysql/Plugin.cc b/src/analyzer/protocol/mysql/Plugin.cc
index 0712ef79e3..98c8c9cdda 100644
--- a/src/analyzer/protocol/mysql/Plugin.cc
+++ b/src/analyzer/protocol/mysql/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_MySQL {
+namespace zeek::plugin::detail::Zeek_MySQL {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,5 +18,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_MySQL
diff --git a/src/analyzer/protocol/ncp/Plugin.cc b/src/analyzer/protocol/ncp/Plugin.cc
index c621188d78..8fad308bf1 100644
--- a/src/analyzer/protocol/ncp/Plugin.cc
+++ b/src/analyzer/protocol/ncp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_NCP {
+namespace zeek::plugin::detail::Zeek_NCP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_NCP
diff --git a/src/analyzer/protocol/netbios/Plugin.cc b/src/analyzer/protocol/netbios/Plugin.cc
index 56b1e973f4..519430bb65 100644
--- a/src/analyzer/protocol/netbios/Plugin.cc
+++ b/src/analyzer/protocol/netbios/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_NetBIOS {
+namespace zeek::plugin::detail::Zeek_NetBIOS {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_NetBIOS
diff --git a/src/analyzer/protocol/ntlm/Plugin.cc b/src/analyzer/protocol/ntlm/Plugin.cc
index 12c774a32f..bf40e72a89 100644
--- a/src/analyzer/protocol/ntlm/Plugin.cc
+++ b/src/analyzer/protocol/ntlm/Plugin.cc
@@ -4,8 +4,7 @@
 
 #include "NTLM.h"
 
-namespace plugin {
-namespace Zeek_NTLM {
+namespace zeek::plugin::detail::Zeek_NTLM {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_NTLM
diff --git a/src/analyzer/protocol/ntp/Plugin.cc b/src/analyzer/protocol/ntp/Plugin.cc
index c35349abcd..d6587fe688 100644
--- a/src/analyzer/protocol/ntp/Plugin.cc
+++ b/src/analyzer/protocol/ntp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_NTP {
+namespace zeek::plugin::detail::Zeek_NTP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_NTP
diff --git a/src/analyzer/protocol/pia/Plugin.cc b/src/analyzer/protocol/pia/Plugin.cc
index d06498c4bf..6f42a90c62 100644
--- a/src/analyzer/protocol/pia/Plugin.cc
+++ b/src/analyzer/protocol/pia/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_PIA {
+namespace zeek::plugin::detail::Zeek_PIA {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_PIA
diff --git a/src/analyzer/protocol/pop3/Plugin.cc b/src/analyzer/protocol/pop3/Plugin.cc
index c30d39b422..3b46a02471 100644
--- a/src/analyzer/protocol/pop3/Plugin.cc
+++ b/src/analyzer/protocol/pop3/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_POP3 {
+namespace zeek::plugin::detail::Zeek_POP3 {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_POP3
diff --git a/src/analyzer/protocol/radius/Plugin.cc b/src/analyzer/protocol/radius/Plugin.cc
index 59de16e915..4b2a4df5cf 100644
--- a/src/analyzer/protocol/radius/Plugin.cc
+++ b/src/analyzer/protocol/radius/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_RADIUS {
+namespace zeek::plugin::detail::Zeek_RADIUS {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_RADIUS
diff --git a/src/analyzer/protocol/rdp/Plugin.cc b/src/analyzer/protocol/rdp/Plugin.cc
index e557782114..042315cd8a 100644
--- a/src/analyzer/protocol/rdp/Plugin.cc
+++ b/src/analyzer/protocol/rdp/Plugin.cc
@@ -3,8 +3,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_RDP {
+namespace zeek::plugin::detail::Zeek_RDP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_RDP
diff --git a/src/analyzer/protocol/rfb/Plugin.cc b/src/analyzer/protocol/rfb/Plugin.cc
index 00dd18b06c..3a77cdab50 100644
--- a/src/analyzer/protocol/rfb/Plugin.cc
+++ b/src/analyzer/protocol/rfb/Plugin.cc
@@ -2,8 +2,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_RFB {
+namespace zeek::plugin::detail::Zeek_RFB {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,5 +18,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_RFB
diff --git a/src/analyzer/protocol/rpc/Plugin.cc b/src/analyzer/protocol/rpc/Plugin.cc
index 8e23d746ec..3d740a9ed0 100644
--- a/src/analyzer/protocol/rpc/Plugin.cc
+++ b/src/analyzer/protocol/rpc/Plugin.cc
@@ -7,8 +7,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_RPC {
+namespace zeek::plugin::detail::Zeek_RPC {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -27,5 +26,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_RPC
diff --git a/src/analyzer/protocol/sip/Plugin.cc b/src/analyzer/protocol/sip/Plugin.cc
index 0e0177d644..a85e8d9a13 100644
--- a/src/analyzer/protocol/sip/Plugin.cc
+++ b/src/analyzer/protocol/sip/Plugin.cc
@@ -5,8 +5,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SIP {
+namespace zeek::plugin::detail::Zeek_SIP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -24,5 +23,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SIP
diff --git a/src/analyzer/protocol/smb/Plugin.cc b/src/analyzer/protocol/smb/Plugin.cc
index 5cdeff29ef..e67f2ff091 100644
--- a/src/analyzer/protocol/smb/Plugin.cc
+++ b/src/analyzer/protocol/smb/Plugin.cc
@@ -4,8 +4,7 @@
 
 #include "SMB.h"
 
-namespace plugin {
-namespace Zeek_SMB {
+namespace zeek::plugin::detail::Zeek_SMB {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -21,5 +20,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SMB
diff --git a/src/analyzer/protocol/smtp/Plugin.cc b/src/analyzer/protocol/smtp/Plugin.cc
index 152fd5966a..5f5ea626d8 100644
--- a/src/analyzer/protocol/smtp/Plugin.cc
+++ b/src/analyzer/protocol/smtp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SMTP {
+namespace zeek::plugin::detail::Zeek_SMTP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SMTP
diff --git a/src/analyzer/protocol/snmp/Plugin.cc b/src/analyzer/protocol/snmp/Plugin.cc
index 6e388b5731..b42dc4de3f 100644
--- a/src/analyzer/protocol/snmp/Plugin.cc
+++ b/src/analyzer/protocol/snmp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SNMP {
+namespace zeek::plugin::detail::Zeek_SNMP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SNMP
diff --git a/src/analyzer/protocol/socks/Plugin.cc b/src/analyzer/protocol/socks/Plugin.cc
index 851ac5a5a4..3c694c4ed6 100644
--- a/src/analyzer/protocol/socks/Plugin.cc
+++ b/src/analyzer/protocol/socks/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SOCKS {
+namespace zeek::plugin::detail::Zeek_SOCKS {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SOCKS
diff --git a/src/analyzer/protocol/ssh/Plugin.cc b/src/analyzer/protocol/ssh/Plugin.cc
index a63553d805..37344cabec 100644
--- a/src/analyzer/protocol/ssh/Plugin.cc
+++ b/src/analyzer/protocol/ssh/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SSH {
+namespace zeek::plugin::detail::Zeek_SSH {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 	} plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SSH
diff --git a/src/analyzer/protocol/ssl/Plugin.cc b/src/analyzer/protocol/ssl/Plugin.cc
index 4faaff8889..394b675701 100644
--- a/src/analyzer/protocol/ssl/Plugin.cc
+++ b/src/analyzer/protocol/ssl/Plugin.cc
@@ -5,8 +5,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SSL {
+namespace zeek::plugin::detail::Zeek_SSL {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -22,5 +21,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SSL
diff --git a/src/analyzer/protocol/stepping-stone/Plugin.cc b/src/analyzer/protocol/stepping-stone/Plugin.cc
index a9bc5c1ed4..d43318525a 100644
--- a/src/analyzer/protocol/stepping-stone/Plugin.cc
+++ b/src/analyzer/protocol/stepping-stone/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_SteppingStone {
+namespace zeek::plugin::detail::Zeek_SteppingStone {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_SteppingStone
diff --git a/src/analyzer/protocol/syslog/Plugin.cc b/src/analyzer/protocol/syslog/Plugin.cc
index 744a74b328..c38a291cb1 100644
--- a/src/analyzer/protocol/syslog/Plugin.cc
+++ b/src/analyzer/protocol/syslog/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Syslog {
+namespace zeek::plugin::detail::Zeek_Syslog {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Syslog
diff --git a/src/analyzer/protocol/tcp/Plugin.cc b/src/analyzer/protocol/tcp/Plugin.cc
index d7b5b1572f..4780aaa183 100644
--- a/src/analyzer/protocol/tcp/Plugin.cc
+++ b/src/analyzer/protocol/tcp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_TCP {
+namespace zeek::plugin::detail::Zeek_TCP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -23,5 +22,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_TCP
diff --git a/src/analyzer/protocol/teredo/Plugin.cc b/src/analyzer/protocol/teredo/Plugin.cc
index d28adc9760..998880ec78 100644
--- a/src/analyzer/protocol/teredo/Plugin.cc
+++ b/src/analyzer/protocol/teredo/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_Teredo {
+namespace zeek::plugin::detail::Zeek_Teredo {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_Teredo
diff --git a/src/analyzer/protocol/udp/Plugin.cc b/src/analyzer/protocol/udp/Plugin.cc
index a427436418..403ccc464b 100644
--- a/src/analyzer/protocol/udp/Plugin.cc
+++ b/src/analyzer/protocol/udp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_UDP {
+namespace zeek::plugin::detail::Zeek_UDP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_UDP
diff --git a/src/analyzer/protocol/vxlan/Plugin.cc b/src/analyzer/protocol/vxlan/Plugin.cc
index dbaf45b856..d6bc81a2aa 100644
--- a/src/analyzer/protocol/vxlan/Plugin.cc
+++ b/src/analyzer/protocol/vxlan/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_VXLAN {
+namespace zeek::plugin::detail::Zeek_VXLAN {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_VXLAN
diff --git a/src/analyzer/protocol/xmpp/Plugin.cc b/src/analyzer/protocol/xmpp/Plugin.cc
index ba767339c9..5df3cda31c 100644
--- a/src/analyzer/protocol/xmpp/Plugin.cc
+++ b/src/analyzer/protocol/xmpp/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_XMPP {
+namespace zeek::plugin::detail::Zeek_XMPP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_XMPP
diff --git a/src/analyzer/protocol/zip/Plugin.cc b/src/analyzer/protocol/zip/Plugin.cc
index 7ad3604a7d..b7c3d5b770 100644
--- a/src/analyzer/protocol/zip/Plugin.cc
+++ b/src/analyzer/protocol/zip/Plugin.cc
@@ -4,8 +4,7 @@
 #include "plugin/Plugin.h"
 #include "analyzer/Component.h"
 
-namespace plugin {
-namespace Zeek_ZIP {
+namespace zeek::plugin::detail::Zeek_ZIP {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,5 +19,4 @@ public:
 		}
 } plugin;
 
-}
-}
+} // namespace zeek::plugin::detail::Zeek_ZIP
diff --git a/src/input/readers/ascii/Plugin.cc b/src/input/readers/ascii/Plugin.cc
index aa16423124..0078a8ebd0 100644
--- a/src/input/readers/ascii/Plugin.cc
+++ b/src/input/readers/ascii/Plugin.cc
@@ -4,7 +4,7 @@
 
 #include "Ascii.h"
 
-namespace zeek::plugin::Zeek_AsciiReader {
+namespace zeek::plugin::detail::Zeek_AsciiReader {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,4 +19,4 @@ public:
 		}
 } plugin;
 
-}
+} // namespace zeek::plugin::detail::Zeek_AsciiReader
diff --git a/src/input/readers/benchmark/Plugin.cc b/src/input/readers/benchmark/Plugin.cc
index 4b5e5d176a..acf251f0b5 100644
--- a/src/input/readers/benchmark/Plugin.cc
+++ b/src/input/readers/benchmark/Plugin.cc
@@ -4,7 +4,7 @@
 
 #include "Benchmark.h"
 
-namespace zeek::plugin::Zeek_BenchmarkReader {
+namespace zeek::plugin::detail::Zeek_BenchmarkReader {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,4 +19,4 @@ public:
 		}
 } plugin;
 
-}
+} // namespace zeek::plugin::detail::Zeek_BenchmarkReader
diff --git a/src/input/readers/binary/Plugin.cc b/src/input/readers/binary/Plugin.cc
index 2a03fa7cd3..765f52d4dc 100644
--- a/src/input/readers/binary/Plugin.cc
+++ b/src/input/readers/binary/Plugin.cc
@@ -4,7 +4,7 @@
 
 #include "Binary.h"
 
-namespace zeek::plugin::Zeek_BinaryReader {
+namespace zeek::plugin::detail::Zeek_BinaryReader {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,4 +19,4 @@ public:
 		}
 } plugin;
 
-}
+} // namespace zeek::plugin::detail::Zeek_BinaryReader
diff --git a/src/input/readers/config/Plugin.cc b/src/input/readers/config/Plugin.cc
index 3bb99632bb..34128f2d01 100644
--- a/src/input/readers/config/Plugin.cc
+++ b/src/input/readers/config/Plugin.cc
@@ -4,7 +4,7 @@
 
 #include "Config.h"
 
-namespace zeek::plugin::Zeek_ConfigReader {
+namespace zeek::plugin::detail::Zeek_ConfigReader {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,4 +19,4 @@ public:
 		}
 } plugin;
 
-}
+} // namespace zeek::plugin::detail::Zeek_ConfigReader
diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc
index 99f4bbf5a4..6e48208b1f 100644
--- a/src/input/readers/raw/Plugin.cc
+++ b/src/input/readers/raw/Plugin.cc
@@ -2,7 +2,7 @@
 
 #include "Plugin.h"
 
-namespace zeek::plugin::Zeek_RawReader {
+namespace zeek::plugin::detail::Zeek_RawReader {
 
 Plugin plugin;
 
@@ -33,4 +33,4 @@ std::unique_lock<std::mutex> Plugin::ForkMutex()
 	return std::unique_lock<std::mutex>(fork_mutex, std::defer_lock);
 	}
 
-} // namespace zeek::plugin::Zeek_RawReader
+} // namespace zeek::plugin::detail::Zeek_RawReader
diff --git a/src/input/readers/raw/Plugin.h b/src/input/readers/raw/Plugin.h
index dbbd652648..43f937a8be 100644
--- a/src/input/readers/raw/Plugin.h
+++ b/src/input/readers/raw/Plugin.h
@@ -8,7 +8,7 @@
 
 #include "Raw.h"
 
-namespace zeek::plugin::Zeek_RawReader {
+namespace zeek::plugin::detail::Zeek_RawReader {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -28,4 +28,4 @@ private:
 
 extern Plugin plugin;
 
-} // namespace zeek::plugin::Zeek_RawReader
+} // namespace zeek::plugin::detail::Zeek_RawReader
diff --git a/src/input/readers/raw/Raw.cc b/src/input/readers/raw/Raw.cc
index d57e231229..11177d8573 100644
--- a/src/input/readers/raw/Raw.cc
+++ b/src/input/readers/raw/Raw.cc
@@ -100,7 +100,7 @@ bool Raw::SetFDFlags(int fd, int cmd, int flags)
 
 std::unique_lock<std::mutex> Raw::AcquireForkMutex()
 	{
-	auto lock = plugin::Zeek_RawReader::plugin.ForkMutex();
+	auto lock = plugin::detail::Zeek_RawReader::plugin.ForkMutex();
 
 	try
 		{
diff --git a/src/input/readers/sqlite/Plugin.cc b/src/input/readers/sqlite/Plugin.cc
index 3fa8f47154..a5bb1a91a8 100644
--- a/src/input/readers/sqlite/Plugin.cc
+++ b/src/input/readers/sqlite/Plugin.cc
@@ -4,7 +4,7 @@
 
 #include "SQLite.h"
 
-namespace zeek::plugin::Zeek_SQLiteReader {
+namespace zeek::plugin::detail::Zeek_SQLiteReader {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -19,4 +19,4 @@ public:
 		}
 } plugin;
 
-}
+} // namespae zeek::plugin::detail::Zeek_SQLiteReader
diff --git a/src/iosource/pcap/Plugin.cc b/src/iosource/pcap/Plugin.cc
index 5250b032b3..c23a77a137 100644
--- a/src/iosource/pcap/Plugin.cc
+++ b/src/iosource/pcap/Plugin.cc
@@ -5,7 +5,7 @@
 #include "plugin/Plugin.h"
 #include "iosource/Component.h"
 
-namespace zeek::plugin::Zeek_Pcap {
+namespace zeek::plugin::detail::Zeek_Pcap {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -24,4 +24,4 @@ public:
 		}
 } plugin;
 
-} // namespace zeek::plugin::Zeek_Pcap
+} // namespace zeek::plugin::detail::Zeek_Pcap
diff --git a/src/logging/writers/ascii/Ascii.h b/src/logging/writers/ascii/Ascii.h
index 735236d32f..49b55bb1f5 100644
--- a/src/logging/writers/ascii/Ascii.h
+++ b/src/logging/writers/ascii/Ascii.h
@@ -10,7 +10,7 @@
 #include "Desc.h"
 #include "zlib.h"
 
-namespace zeek::plugin::Zeek_AsciiWriter { class Plugin; }
+namespace zeek::plugin::detail::Zeek_AsciiWriter { class Plugin; }
 
 namespace zeek::logging::writer::detail {
 
@@ -37,7 +37,7 @@ protected:
 	bool DoHeartbeat(double network_time, double current_time) override;
 
 private:
-	friend class plugin::Zeek_AsciiWriter::Plugin;
+	friend class zeek::plugin::detail::Zeek_AsciiWriter::Plugin;
 
 	static void RotateLeftoverLogs();
 
diff --git a/src/logging/writers/ascii/Plugin.cc b/src/logging/writers/ascii/Plugin.cc
index c005ce5e2f..43d151837a 100644
--- a/src/logging/writers/ascii/Plugin.cc
+++ b/src/logging/writers/ascii/Plugin.cc
@@ -5,7 +5,7 @@
 
 #include "Ascii.h"
 
-namespace zeek::plugin::Zeek_AsciiWriter {
+namespace zeek::plugin::detail::Zeek_AsciiWriter {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -26,4 +26,4 @@ protected:
 
 } plugin;
 
-} // namespace zeek::plugin::Zeek_AsciiWriter
+} // namespace zeek::plugin::detail::Zeek_AsciiWriter
diff --git a/src/logging/writers/none/Plugin.cc b/src/logging/writers/none/Plugin.cc
index b30cafd715..07a46a0820 100644
--- a/src/logging/writers/none/Plugin.cc
+++ b/src/logging/writers/none/Plugin.cc
@@ -5,7 +5,7 @@
 
 #include "None.h"
 
-namespace zeek::plugin::Zeek_NoneWriter {
+namespace zeek::plugin::detail::Zeek_NoneWriter {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,4 +20,4 @@ public:
 		}
 } plugin;
 
-} // namespace zeek::plugin::Zeek_NoneWriter
+} // namespace zeek::plugin::detail::Zeek_NoneWriter
diff --git a/src/logging/writers/sqlite/Plugin.cc b/src/logging/writers/sqlite/Plugin.cc
index 86a033a1e2..1c40a608d2 100644
--- a/src/logging/writers/sqlite/Plugin.cc
+++ b/src/logging/writers/sqlite/Plugin.cc
@@ -5,7 +5,7 @@
 
 #include "SQLite.h"
 
-namespace zeek::plugin::Zeek_SQLiteWriter {
+namespace zeek::plugin::detail::Zeek_SQLiteWriter {
 
 class Plugin : public zeek::plugin::Plugin {
 public:
@@ -20,4 +20,4 @@ public:
 		}
 } plugin;
 
-} // namespace zeek::plugin::Zeek_SQLiteWriter
+} // namespace zeek::plugin::detail::Zeek_SQLiteWriter