diff --git a/zebra-chain/src/block/header.rs b/zebra-chain/src/block/header.rs
index 078cb653f..110b859ae 100644
--- a/zebra-chain/src/block/header.rs
+++ b/zebra-chain/src/block/header.rs
@@ -68,11 +68,12 @@ pub struct Header {
     pub solution: Solution,
 }
 
-/// TODO: Inline this error into zebra_consensus::error::BlockError.
+/// TODO: Use this error as the source for zebra_consensus::error::BlockError::Time,
+/// and make `BlockError::Time` add additional context.
 /// See https://github.com/ZcashFoundation/zebra/issues/1021 for more details.
 #[derive(Error, Debug)]
 pub enum BlockTimeError {
-    #[error("invalid time {0:?} in block header {1:?} {2:?}: must be less than 2 hours in the future ({3:?}). Hint: check your machine's date, time, and time zone.")]
+    #[error("invalid time {0:?} in block header {1:?} {2:?}: block time is more than 2 hours in the future ({3:?}). Hint: check your machine's date, time, and time zone.")]
     InvalidBlockTime(
         DateTime<Utc>,
         crate::block::Height,
diff --git a/zebra-consensus/src/block.rs b/zebra-consensus/src/block.rs
index 704931a23..821c0985a 100644
--- a/zebra-consensus/src/block.rs
+++ b/zebra-consensus/src/block.rs
@@ -109,7 +109,7 @@ where
             let hash = block.hash();
 
             // The height is already included in the ChainVerifier span
-            let span = tracing::debug_span!("BlockVerifier.call", ?hash);
+            let span = tracing::debug_span!("BlockVerifier::call", ?hash);
             let _entered = span.enter();
 
             // Check that this block is actually a new block.
diff --git a/zebra-consensus/src/chain.rs b/zebra-consensus/src/chain.rs
index 446848b03..ffe26f54d 100644
--- a/zebra-consensus/src/chain.rs
+++ b/zebra-consensus/src/chain.rs
@@ -77,7 +77,7 @@ where
 
     fn call(&mut self, block: Arc<Block>) -> Self::Future {
         let height = block.coinbase_height();
-        let span = tracing::info_span!("ChainVerifier.call", ?height);
+        let span = tracing::info_span!("ChainVerifier::call", ?height);
         let _entered = span.enter();
         tracing::debug!("verifying new block");