diff --git a/src/index/base.cpp b/src/index/base.cpp
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@@ -13,14 +13,14 @@
 #include <tinyformat.h>
 #include <util/system.h>
 #include <util/translation.h>
-#include <validation.h> // For g_chainman
+#include <validation.h> // For CChainState
 #include <warnings.h>
 
 #include <functional>
 
 constexpr char DB_BEST_BLOCK = 'B';
 
-constexpr int64_t SYNC_LOG_INTERVAL = 30;           // seconds
+constexpr int64_t SYNC_LOG_INTERVAL = 30;           // secon
 constexpr int64_t SYNC_LOCATOR_WRITE_INTERVAL = 30; // seconds
 
 template <typename... Args>
@@ -343,7 +343,7 @@
 
     {
         // Skip the queue-draining stuff if we know we're caught up with
-        // ::ChainActive().Tip().
+        // m_chain.Tip().
         LOCK(cs_main);
         const CBlockIndex *chain_tip = m_chainstate->m_chain.Tip();
         const CBlockIndex *best_block_index = m_best_block_index.load();
diff --git a/src/txmempool.h b/src/txmempool.h
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -557,10 +557,10 @@
      * By design, it is guaranteed that:
      *
      * 1. Locking both `cs_main` and `mempool.cs` will give a view of mempool
-     *    that is consistent with current chain tip (`::ChainActive()` and
+     *    that is consistent with current chain tip (`ActiveChain()` and
      *    `CoinsTip()`) and is fully populated. Fully populated means that if
-     * the current active chain is missing transactions that were present in a
-     *    previously active chain, all the missing transactions will have been
+     *    the current active chain is missing transactions that were present in
+     *    a previously active chain, all the missing transactions will have been
      *    re-added to the mempool and should be present if they meet size and
      *    consistency constraints.
      *
diff --git a/src/validation.h b/src/validation.h
--- a/src/validation.h
+++ b/src/validation.h
@@ -112,7 +112,7 @@
 static const int64_t DEFAULT_MIN_FINALIZATION_DELAY = 2 * 60 * 60;
 /**
  * Block files containing a block-height within MIN_BLOCKS_TO_KEEP of
- * ::ChainActive().Tip() will not be pruned.
+ * ActiveChain().Tip() will not be pruned.
  */
 static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
 static const signed int DEFAULT_CHECKBLOCKS = 6;
@@ -1182,7 +1182,7 @@
     //! - "Fast forward" the tip of the new chainstate to the base of the
     //!   snapshot, faking nTx* block index data along the way.
     //! - Move the new chainstate to `m_snapshot_chainstate` and make it our
-    //!   ChainstateActive().
+    //!   ActiveChainstate().
     [[nodiscard]] bool ActivateSnapshot(CAutoFile &coins_file,
                                         const SnapshotMetadata &metadata,
                                         bool in_memory);
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -174,7 +174,7 @@
     // If there are no relative lock times, the LockPoints don't depend on the
     // chain
     if (lp->maxInputBlock) {
-        // Check whether ::ChainActive() is an extension of the block at which
+        // Check whether active_chain is an extension of the block at which
         // the LockPoints calculation was valid. If not LockPoints are no longer
         // valid.
         if (!active_chain.Contains(lp->maxInputBlock)) {
@@ -2351,7 +2351,6 @@
 
     m_chain.SetTip(pindexDelete->pprev);
 
-    // Update ::ChainActive() and related variables.
     UpdateTip(m_mempool, pindexDelete->pprev, params, *this);
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1391,7 +1391,7 @@
 void CWallet::BlockUntilSyncedToCurrentChain() const {
     AssertLockNotHeld(cs_wallet);
     // Skip the queue-draining stuff if we know we're caught up with
-    // chainActive.Tip(), otherwise put a callback in the validation interface
+    // chain().Tip(), otherwise put a callback in the validation interface
     // queue and wait for the queue to drain enough to execute it (indicating we
     // are caught up at least with the time we entered this function).
     const BlockHash last_block_hash =