diff --git a/src/EventTrace.cc b/src/EventTrace.cc
index b240334c30..6bdd083654 100644
--- a/src/EventTrace.cc
+++ b/src/EventTrace.cc
@@ -13,7 +13,7 @@
 
 namespace zeek::detail {
 
-std::unique_ptr<EventTraceMgr> etm;
+std::unique_ptr<EventTraceMgr> event_trace_mgr;
 
 // Helper function for generating a correct script-level representation
 // of a string constant.
diff --git a/src/EventTrace.h b/src/EventTrace.h
index 8474733f77..2c86efb7b2 100644
--- a/src/EventTrace.h
+++ b/src/EventTrace.h
@@ -467,6 +467,6 @@ private:
 };
 
 // If non-nil then we're doing event tracing.
-extern std::unique_ptr<EventTraceMgr> etm;
+extern std::unique_ptr<EventTraceMgr> event_trace_mgr;
 
 } // namespace zeek::detail
diff --git a/src/Expr.cc b/src/Expr.cc
index 9e872d846f..b21c7181b5 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -3868,8 +3868,8 @@ ValPtr ScheduleExpr::Eval(Frame* f) const {
     if ( args ) {
         auto handler = event->Handler();
 
-        if ( etm )
-            etm->ScriptEventQueued(handler);
+        if ( event_trace_mgr )
+            event_trace_mgr->ScriptEventQueued(handler);
 
         timer_mgr->Add(new ScheduleTimer(handler, std::move(*args), dt));
     }
@@ -4474,8 +4474,8 @@ ValPtr EventExpr::Eval(Frame* f) const {
     auto v = eval_list(f, args.get());
 
     if ( handler ) {
-        if ( etm )
-            etm->ScriptEventQueued(handler);
+        if ( event_trace_mgr )
+            event_trace_mgr->ScriptEventQueued(handler);
 
         event_mgr.Enqueue(handler, std::move(*v));
     }
diff --git a/src/Func.cc b/src/Func.cc
index e45a4fdcca..c9f116dfb6 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -354,8 +354,8 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         return nullptr;
     }
 
-    if ( etm && Flavor() == FUNC_FLAVOR_EVENT )
-        etm->StartEvent(this, args);
+    if ( event_trace_mgr && Flavor() == FUNC_FLAVOR_EVENT )
+        event_trace_mgr->StartEvent(this, args);
 
     if ( g_trace_state.DoTrace() ) {
         ODesc d;
@@ -432,8 +432,8 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
             result = val_mgr->True();
     }
 
-    else if ( etm && Flavor() == FUNC_FLAVOR_EVENT )
-        etm->EndEvent(this, args);
+    else if ( event_trace_mgr && Flavor() == FUNC_FLAVOR_EVENT )
+        event_trace_mgr->EndEvent(this, args);
 
     // Warn if the function returns something, but we returned from
     // the function without an explicit return, or without a value.
diff --git a/src/Stmt.cc b/src/Stmt.cc
index 47e839e189..4dbcbf18ce 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -905,8 +905,8 @@ ValPtr EventStmt::Exec(Frame* f, StmtFlowType& flow) {
     auto h = event_expr->Handler();
 
     if ( args && h ) {
-        if ( etm )
-            etm->ScriptEventQueued(h);
+        if ( event_trace_mgr )
+            event_trace_mgr->ScriptEventQueued(h);
 
         event_mgr.Enqueue(h, std::move(*args));
     }
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index 0055cf1b3a..b2fd19431c 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -400,8 +400,8 @@ static void terminate_zeek() {
 
     script_coverage_mgr.WriteStats();
 
-    if ( etm )
-        etm->Generate();
+    if ( event_trace_mgr )
+        event_trace_mgr->Generate();
 
     delete zeekygen_mgr;
     delete packet_mgr;
@@ -774,7 +774,7 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
         auto ipbb = make_intrusive<BuiltinFunc>(init_bifs, ipbid->Name(), false);
 
         if ( options.event_trace_file )
-            etm = std::make_unique<EventTraceMgr>(*options.event_trace_file);
+            event_trace_mgr = std::make_unique<EventTraceMgr>(*options.event_trace_file);
 
         // Parsing involves reading input files, including any input
         // interactively provided by the user at the console. Temporarily