diff --git a/src/packet_analysis/Manager.h b/src/packet_analysis/Manager.h
index 30a1facb94..f5130e1b2a 100644
--- a/src/packet_analysis/Manager.h
+++ b/src/packet_analysis/Manager.h
@@ -142,7 +142,7 @@ public:
 	Analyzer* InstantiateAnalyzer(const std::string& name);
 
 	/**
-	 * Processes a packet by applying the configured low layer analyzers.
+	 * Processes a packet by applying the configured packet analyzers.
 	 *
 	 * @param packet The packet to process.
 	 */
diff --git a/src/packet_analysis/protocol/arp/ARP.cc b/src/packet_analysis/protocol/arp/ARP.cc
index d0aa620dde..204e9b54c4 100644
--- a/src/packet_analysis/protocol/arp/ARP.cc
+++ b/src/packet_analysis/protocol/arp/ARP.cc
@@ -11,9 +11,9 @@ ARPAnalyzer::ARPAnalyzer()
 
 std::tuple<zeek::packet_analysis::AnalyzerResult, zeek::packet_analysis::identifier_t> ARPAnalyzer::Analyze(Packet* packet)
 	{
-	// TODO: Make ARP analyzer a native LL analyzer
+	// TODO: Make ARP analyzer a native packet analyzer
 	packet->l3_proto = L3_ARP;
 
-	// Leave LL analyzer land
+	// Leave packet analyzer land
 	return { AnalyzerResult::Terminate, 0 };
 	}
diff --git a/src/packet_analysis/protocol/ipv4/IPv4.cc b/src/packet_analysis/protocol/ipv4/IPv4.cc
index c8b03a3b37..6c04a93e59 100644
--- a/src/packet_analysis/protocol/ipv4/IPv4.cc
+++ b/src/packet_analysis/protocol/ipv4/IPv4.cc
@@ -13,6 +13,6 @@ std::tuple<zeek::packet_analysis::AnalyzerResult, zeek::packet_analysis::identif
 	{
 	packet->l3_proto = L3_IPV4;
 
-	// Leave LL analyzer land
+	// Leave packet analyzer land
 	return { AnalyzerResult::Terminate, 0 };
 	}
diff --git a/src/packet_analysis/protocol/ipv6/IPv6.cc b/src/packet_analysis/protocol/ipv6/IPv6.cc
index 65ed530ee6..e7712d60e3 100644
--- a/src/packet_analysis/protocol/ipv6/IPv6.cc
+++ b/src/packet_analysis/protocol/ipv6/IPv6.cc
@@ -13,6 +13,6 @@ std::tuple<zeek::packet_analysis::AnalyzerResult, zeek::packet_analysis::identif
 	{
 	packet->l3_proto = L3_IPV6;
 
-	// Leave LL analyzer land
+	// Leave packet analyzer land
 	return { AnalyzerResult::Terminate, 0 };
 	}
diff --git a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
index ada222d35d..1cfc2492cd 100644
--- a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
@@ -3,7 +3,7 @@
 #empty_field	(empty)
 #unset_field	-
 #path	loaded_scripts
-#open	2020-06-24-22-11-31
+#open	2020-07-13-15-09-39
 #fields	name
 #types	string
 scripts/base/init-bare.zeek
@@ -19,29 +19,29 @@ scripts/base/init-bare.zeek
   build/scripts/base/bif/plugins/Zeek_SNMP.types.bif.zeek
   build/scripts/base/bif/plugins/Zeek_KRB.types.bif.zeek
   build/scripts/base/bif/event.bif.zeek
-  scripts/base/llprotocols/__load__.zeek
-    scripts/base/llprotocols/default/__load__.zeek
-      scripts/base/llprotocols/default/main.zeek
-    scripts/base/llprotocols/ethernet/__load__.zeek
-      scripts/base/llprotocols/ethernet/main.zeek
-    scripts/base/llprotocols/fddi/__load__.zeek
-      scripts/base/llprotocols/fddi/main.zeek
-    scripts/base/llprotocols/ieee802_11/__load__.zeek
-      scripts/base/llprotocols/ieee802_11/main.zeek
-    scripts/base/llprotocols/ieee802_11_radio/__load__.zeek
-      scripts/base/llprotocols/ieee802_11_radio/main.zeek
-    scripts/base/llprotocols/linux_sll/__load__.zeek
-      scripts/base/llprotocols/linux_sll/main.zeek
-    scripts/base/llprotocols/nflog/__load__.zeek
-      scripts/base/llprotocols/nflog/main.zeek
-    scripts/base/llprotocols/null/__load__.zeek
-      scripts/base/llprotocols/null/main.zeek
-    scripts/base/llprotocols/ppp_serial/__load__.zeek
-      scripts/base/llprotocols/ppp_serial/main.zeek
-    scripts/base/llprotocols/pppoe/__load__.zeek
-      scripts/base/llprotocols/pppoe/main.zeek
-    scripts/base/llprotocols/vlan/__load__.zeek
-      scripts/base/llprotocols/vlan/main.zeek
+  scripts/base/packet-protocols/__load__.zeek
+    scripts/base/packet-protocols/default/__load__.zeek
+      scripts/base/packet-protocols/default/main.zeek
+    scripts/base/packet-protocols/ethernet/__load__.zeek
+      scripts/base/packet-protocols/ethernet/main.zeek
+    scripts/base/packet-protocols/fddi/__load__.zeek
+      scripts/base/packet-protocols/fddi/main.zeek
+    scripts/base/packet-protocols/ieee802_11/__load__.zeek
+      scripts/base/packet-protocols/ieee802_11/main.zeek
+    scripts/base/packet-protocols/ieee802_11_radio/__load__.zeek
+      scripts/base/packet-protocols/ieee802_11_radio/main.zeek
+    scripts/base/packet-protocols/linux_sll/__load__.zeek
+      scripts/base/packet-protocols/linux_sll/main.zeek
+    scripts/base/packet-protocols/nflog/__load__.zeek
+      scripts/base/packet-protocols/nflog/main.zeek
+    scripts/base/packet-protocols/null/__load__.zeek
+      scripts/base/packet-protocols/null/main.zeek
+    scripts/base/packet-protocols/ppp_serial/__load__.zeek
+      scripts/base/packet-protocols/ppp_serial/main.zeek
+    scripts/base/packet-protocols/pppoe/__load__.zeek
+      scripts/base/packet-protocols/pppoe/main.zeek
+    scripts/base/packet-protocols/vlan/__load__.zeek
+      scripts/base/packet-protocols/vlan/main.zeek
 scripts/base/init-frameworks-and-bifs.zeek
   scripts/base/frameworks/logging/__load__.zeek
     scripts/base/frameworks/logging/main.zeek
@@ -210,4 +210,4 @@ scripts/base/init-frameworks-and-bifs.zeek
     build/scripts/base/bif/plugins/Zeek_SQLiteWriter.sqlite.bif.zeek
 scripts/policy/misc/loaded-scripts.zeek
   scripts/base/utils/paths.zeek
-#close	2020-06-24-22-11-31
+#close	2020-07-13-15-09-39
diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
index a67b3644ff..8c8f58b0bd 100644
--- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
@@ -3,7 +3,7 @@
 #empty_field	(empty)
 #unset_field	-
 #path	loaded_scripts
-#open	2020-09-11-03-21-10
+#open	2020-09-22-16-54-06
 #fields	name
 #types	string
 scripts/base/init-bare.zeek
@@ -19,29 +19,29 @@ scripts/base/init-bare.zeek
   build/scripts/base/bif/plugins/Zeek_SNMP.types.bif.zeek
   build/scripts/base/bif/plugins/Zeek_KRB.types.bif.zeek
   build/scripts/base/bif/event.bif.zeek
-  scripts/base/llprotocols/__load__.zeek
-    scripts/base/llprotocols/default/__load__.zeek
-      scripts/base/llprotocols/default/main.zeek
-    scripts/base/llprotocols/ethernet/__load__.zeek
-      scripts/base/llprotocols/ethernet/main.zeek
-    scripts/base/llprotocols/fddi/__load__.zeek
-      scripts/base/llprotocols/fddi/main.zeek
-    scripts/base/llprotocols/ieee802_11/__load__.zeek
-      scripts/base/llprotocols/ieee802_11/main.zeek
-    scripts/base/llprotocols/ieee802_11_radio/__load__.zeek
-      scripts/base/llprotocols/ieee802_11_radio/main.zeek
-    scripts/base/llprotocols/linux_sll/__load__.zeek
-      scripts/base/llprotocols/linux_sll/main.zeek
-    scripts/base/llprotocols/nflog/__load__.zeek
-      scripts/base/llprotocols/nflog/main.zeek
-    scripts/base/llprotocols/null/__load__.zeek
-      scripts/base/llprotocols/null/main.zeek
-    scripts/base/llprotocols/ppp_serial/__load__.zeek
-      scripts/base/llprotocols/ppp_serial/main.zeek
-    scripts/base/llprotocols/pppoe/__load__.zeek
-      scripts/base/llprotocols/pppoe/main.zeek
-    scripts/base/llprotocols/vlan/__load__.zeek
-      scripts/base/llprotocols/vlan/main.zeek
+  scripts/base/packet-protocols/__load__.zeek
+    scripts/base/packet-protocols/default/__load__.zeek
+      scripts/base/packet-protocols/default/main.zeek
+    scripts/base/packet-protocols/ethernet/__load__.zeek
+      scripts/base/packet-protocols/ethernet/main.zeek
+    scripts/base/packet-protocols/fddi/__load__.zeek
+      scripts/base/packet-protocols/fddi/main.zeek
+    scripts/base/packet-protocols/ieee802_11/__load__.zeek
+      scripts/base/packet-protocols/ieee802_11/main.zeek
+    scripts/base/packet-protocols/ieee802_11_radio/__load__.zeek
+      scripts/base/packet-protocols/ieee802_11_radio/main.zeek
+    scripts/base/packet-protocols/linux_sll/__load__.zeek
+      scripts/base/packet-protocols/linux_sll/main.zeek
+    scripts/base/packet-protocols/nflog/__load__.zeek
+      scripts/base/packet-protocols/nflog/main.zeek
+    scripts/base/packet-protocols/null/__load__.zeek
+      scripts/base/packet-protocols/null/main.zeek
+    scripts/base/packet-protocols/ppp_serial/__load__.zeek
+      scripts/base/packet-protocols/ppp_serial/main.zeek
+    scripts/base/packet-protocols/pppoe/__load__.zeek
+      scripts/base/packet-protocols/pppoe/main.zeek
+    scripts/base/packet-protocols/vlan/__load__.zeek
+      scripts/base/packet-protocols/vlan/main.zeek
 scripts/base/init-frameworks-and-bifs.zeek
   scripts/base/frameworks/logging/__load__.zeek
     scripts/base/frameworks/logging/main.zeek
@@ -406,4 +406,4 @@ scripts/base/init-default.zeek
   scripts/base/misc/find-filtered-trace.zeek
   scripts/base/misc/version.zeek
 scripts/policy/misc/loaded-scripts.zeek
-#close	2020-09-11-03-21-10
+#close	2020-09-22-16-54-06