diff --git a/src/Event.cc b/src/Event.cc
index caae05eb9b..c5fba1304a 100644
--- a/src/Event.cc
+++ b/src/Event.cc
@@ -199,7 +199,7 @@ void EventMgr::Drain()
 
 	// Make sure all of the triggers get processed every time the events
 	// drain.
-	trigger_mgr->Process();
+	zeek::detail::trigger_mgr->Process();
 	}
 
 void EventMgr::Describe(ODesc* d) const
diff --git a/src/Stats.cc b/src/Stats.cc
index ccf8433ae3..42ee960dbd 100644
--- a/src/Stats.cc
+++ b/src/Stats.cc
@@ -198,7 +198,7 @@ void ProfileLogger::Log()
 					dstats.cached_hosts, dstats.cached_addresses));
 
 	zeek::detail::trigger::Manager::Stats tstats;
-	trigger_mgr->GetStats(&tstats);
+	zeek::detail::trigger_mgr->GetStats(&tstats);
 
 	file->Write(fmt("%.06f Triggers: total=%lu pending=%lu\n", network_time, tstats.total, tstats.pending));
 
diff --git a/src/Trigger.cc b/src/Trigger.cc
index 062a4c82bf..c6ec3b0a27 100644
--- a/src/Trigger.cc
+++ b/src/Trigger.cc
@@ -454,7 +454,7 @@ bool Trigger::Cache(const zeek::detail::CallExpr* expr, Val* v)
 
 	Ref(v);
 
-	trigger_mgr->Queue(this);
+	zeek::detail::trigger_mgr->Queue(this);
 	return true;
 	}
 
@@ -480,7 +480,7 @@ void Trigger::Describe(ODesc* d) const
 
 void Trigger::Modified(zeek::notifier::detail::Modifiable* m)
 	{
-	trigger_mgr->Queue(this);
+	zeek::detail::trigger_mgr->Queue(this);
 	}
 
 const char* Trigger::Name() const
diff --git a/src/Trigger.h b/src/Trigger.h
index 3bbecd8137..04f8337363 100644
--- a/src/Trigger.h
+++ b/src/Trigger.h
@@ -18,7 +18,9 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
 
-namespace zeek::detail::trigger {
+namespace zeek::detail {
+namespace trigger {
+
 
 // Triggers are the heart of "when" statements: expressions that when
 // they become true execute a body of statements.
@@ -143,11 +145,15 @@ private:
 	unsigned long total_triggers = 0;
 	};
 
-} // namespace zeek::detail::trigger
+} // namespace trigger
+
+extern trigger::Manager* trigger_mgr;
+
+} // namespace zeek::detail
 
 namespace trigger {
-	using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger instead")]] = zeek::detail::trigger::Trigger;
-	using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager instead")]] = zeek::detail::trigger::Manager;
+	using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger.")]] = zeek::detail::trigger::Trigger;
+	using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager.")]] = zeek::detail::trigger::Manager;
 }
 
-extern zeek::detail::trigger::Manager* trigger_mgr;
+extern zeek::detail::trigger::Manager*& trigger_mgr [[deprecated("Remove in v4.1. Use zeek::detail::trigger_mgr.")]];
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index fe150f8774..bc1638aeeb 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -116,7 +116,8 @@ zeek::iosource::Manager*& iosource_mgr = zeek::iosource_mgr;
 zeek::Broker::Manager* zeek::broker_mgr = nullptr;
 zeek::Broker::Manager*& broker_mgr = zeek::broker_mgr;
 zeek::Supervisor* zeek::supervisor_mgr = nullptr;
-zeek::detail::trigger::Manager* trigger_mgr = nullptr;
+zeek::detail::trigger::Manager* zeek::detail::trigger_mgr = nullptr;
+zeek::detail::trigger::Manager*& trigger_mgr = zeek::detail::trigger_mgr;
 
 std::vector<std::string> zeek_script_prefixes;
 zeek::detail::Stmt* stmts;
@@ -583,14 +584,14 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
 	zeek::detail::dns_mgr->SetDir(".state");
 
 	zeek::iosource_mgr = new iosource::Manager();
-	event_registry = new EventRegistry();
+	zeek::event_registry = new EventRegistry();
 	zeek::analyzer_mgr = new analyzer::Manager();
 	zeek::log_mgr = new logging::Manager();
 	zeek::input_mgr = new input::Manager();
 	zeek::file_mgr = new file_analysis::Manager();
 	auto broker_real_time = ! options.pcap_file && ! options.deterministic_mode;
-	broker_mgr = new zeek::Broker::Manager(broker_real_time);
-	trigger_mgr = new zeek::detail::trigger::Manager();
+	zeek::broker_mgr = new zeek::Broker::Manager(broker_real_time);
+	zeek::detail::trigger_mgr = new zeek::detail::trigger::Manager();
 
 	zeek::plugin_mgr->InitPreScript();
 	zeek::analyzer_mgr->InitPreScript();
@@ -819,7 +820,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
 		zeek::event_mgr.Enqueue(zeek_init, zeek::Args{});
 
 	EventRegistry::string_list dead_handlers =
-		event_registry->UnusedHandlers();
+		zeek::event_registry->UnusedHandlers();
 
 	if ( ! dead_handlers.empty() && check_for_unused_event_handlers )
 		{