diff --git a/src/xrpld/app/consensus/ConsensusSpanNames.h b/src/xrpld/app/consensus/ConsensusSpanNames.h
index 40e8eb4117..9304599e30 100644
--- a/src/xrpld/app/consensus/ConsensusSpanNames.h
+++ b/src/xrpld/app/consensus/ConsensusSpanNames.h
@@ -223,6 +223,15 @@ inline constexpr auto disputesCount = join(xrplConsensus, makeStr("disputes_coun
 inline constexpr auto trusted = join(xrplConsensus, makeStr("trusted"));
 }  // namespace attr
 
+// ===== Event names ===========================================================
+
+namespace event {
+/// "dispute.resolve"
+inline constexpr auto disputeResolve = join(makeStr("dispute"), makeStr("resolve"));
+/// "tx.included"
+inline constexpr auto txIncluded = join(makeStr("tx"), makeStr("included"));
+}  // namespace event
+
 // ===== Attribute values ======================================================
 
 namespace val {
diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index bf0e50eb33..7106348689 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -612,7 +612,9 @@ RCLConsensus::Adaptor::doAccept(
             JLOG(j_.debug()) << "    Tx: " << item.key();
             ++txCount;
             auto const txHash = to_string(item.key());
-            doAcceptSpan.addEvent("tx.included", {{telemetry::cons_span::attr::txId, txHash}});
+            doAcceptSpan.addEvent(
+                telemetry::cons_span::event::txIncluded,
+                {{telemetry::cons_span::attr::txId, txHash}});
         }
         catch (std::exception const& ex)
         {
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index e2d1501b9c..bbaf1d9999 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -1557,7 +1557,7 @@ Consensus<Adaptor>::updateOurPositions(std::unique_ptr<std::stringstream> const&
                 auto const yaysStr = std::to_string(dispute.getYays());
                 auto const naysStr = std::to_string(dispute.getNays());
                 span.addEvent(
-                    "dispute.resolve",
+                    cons_span::event::disputeResolve,
                     {{cons_span::attr::txId, to_string(txId)},
                      {cons_span::attr::disputeOurVote, dispute.getOurVote() ? "yes" : "no"},
                      {cons_span::attr::disputeYays, yaysStr},
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 2a637f991f..adb67b804e 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -1946,13 +1946,6 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
         }
     }
 
-    {
-        using namespace telemetry;
-        auto span = SpanGuard::span(
-            TraceCategory::Consensus, seg::consensus, cons_span::op::proposalReceive);
-        span.setAttribute(cons_span::attr::trusted, isTrusted);
-    }
-
     JLOG(p_journal_.trace()) << "Proposal: " << (isTrusted ? "trusted" : "untrusted");
 
     auto proposal = RCLCxPeerPos(
@@ -1970,8 +1963,8 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
     // Create a receive span that links to the sender's trace context
     // (if propagated). shared_ptr keeps it alive across the job boundary.
     auto span = std::make_shared<telemetry::SpanGuard>(telemetry::proposalReceiveSpan(set));
-    span->setAttribute("xrpl.consensus.trusted", isTrusted);
-    span->setAttribute("xrpl.consensus.round", static_cast<int64_t>(set.proposeseq()));
+    span->setAttribute(telemetry::cons_span::attr::trusted, isTrusted);
+    span->setAttribute(telemetry::cons_span::attr::round, static_cast<int64_t>(set.proposeseq()));
 
     std::weak_ptr<PeerImp> const weak = shared_from_this();
     app_.getJobQueue().addJob(