diff --git a/include/bitcoin/database/impl/query/archive_read.ipp b/include/bitcoin/database/impl/query/archive_read.ipp
index 8f8b9c0a..7e30b4b4 100644
--- a/include/bitcoin/database/impl/query/archive_read.ipp
+++ b/include/bitcoin/database/impl/query/archive_read.ipp
@@ -77,12 +77,6 @@ inline bool CLASS::is_confirmable(const header_link& link) const NOEXCEPT
     return get_header_state(link) == error::block_confirmable;
 }
 
-TEMPLATE
-inline bool CLASS::is_valid(const header_link& link) const NOEXCEPT
-{
-    return get_header_state(link) == error::block_valid;
-}
-
 // Empty/null_hash implies fault, zero count implies unassociated.
 // ----------------------------------------------------------------------------
 
diff --git a/include/bitcoin/database/impl/query/validate.ipp b/include/bitcoin/database/impl/query/validate.ipp
index 4b14445d..4b78ff86 100644
--- a/include/bitcoin/database/impl/query/validate.ipp
+++ b/include/bitcoin/database/impl/query/validate.ipp
@@ -161,6 +161,14 @@ uint64_t CLASS::get_tx_fee(const tx_link& link) const NOEXCEPT
     return tx && populate_without_metadata(*tx) ? tx->fee() : max_uint64;
 }
 
+TEMPLATE
+inline bool CLASS::is_validated(const header_link& link) const NOEXCEPT
+{
+    // Validated and not invalid (checkpoint/milestone shows false).
+    const auto state = get_header_state(link);
+    return state == error::block_valid || state == error::block_confirmable;
+}
+
 TEMPLATE
 bool CLASS::is_block_validated(code& state, const header_link& link,
     size_t height, size_t checkpoint) const NOEXCEPT
diff --git a/include/bitcoin/database/query.hpp b/include/bitcoin/database/query.hpp
index 230225cc..04f159ba 100644
--- a/include/bitcoin/database/query.hpp
+++ b/include/bitcoin/database/query.hpp
@@ -328,7 +328,7 @@ class query
     inline bool is_milestone(const header_link& link) const NOEXCEPT;
     inline bool is_associated(const header_link& link) const NOEXCEPT;
     inline bool is_confirmable(const header_link& link) const NOEXCEPT;
-    inline bool is_valid(const header_link& link) const NOEXCEPT;
+    inline bool is_validated(const header_link& link) const NOEXCEPT;
 
     /// Empty/null_hash implies fault, zero count implies unassociated.
     hash_digest get_top_confirmed_hash() const NOEXCEPT;