diff --git a/src/core/jsonschema/bundle.cc b/src/core/jsonschema/bundle.cc
index 11e4fdb20..9db37f517 100644
--- a/src/core/jsonschema/bundle.cc
+++ b/src/core/jsonschema/bundle.cc
@@ -48,7 +48,7 @@ auto is_official_metaschema_reference(const sourcemeta::core::Pointer &pointer,
                                       const std::string &destination) -> bool {
   return !pointer.empty() && pointer.back().is_property() &&
          pointer.back().to_property() == "$schema" &&
-         sourcemeta::core::official_resolver(destination).has_value();
+         sourcemeta::core::schema_official_resolver(destination).has_value();
 }
 
 auto bundle_schema(sourcemeta::core::JSON &root, const std::string &container,
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h
index 92318b289..b36615a64 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h
@@ -74,7 +74,7 @@ enum class SchemaIdentificationStrategy : std::uint8_t {
 /// })JSON");
 ///
 /// std::optional<std::string> id{sourcemeta::core::identify(
-///   document, sourcemeta::core::official_resolver)};
+///   document, sourcemeta::core::schema_official_resolver)};
 /// assert(id.has_value());
 /// assert(id.value() == "https://sourcemeta.com/example-schema");
 /// ```
@@ -121,7 +121,7 @@ auto identify(const JSON &schema, const std::string &base_dialect,
 ///   "https://json-schema.org/draft/2020-12/schema");
 ///
 /// std::optional<std::string> id{sourcemeta::core::identify(
-///   document, sourcemeta::core::official_resolver)};
+///   document, sourcemeta::core::schema_official_resolver)};
 /// assert(!id.has_value());
 /// ```
 SOURCEMETA_CORE_JSONSCHEMA_EXPORT
@@ -145,10 +145,10 @@ auto anonymize(JSON &schema, const std::string &base_dialect) -> void;
 ///
 /// sourcemeta::core::reidentify(document,
 ///   "https://example.com/my-new-id",
-///   sourcemeta::core::official_resolver);
+///   sourcemeta::core::schema_official_resolver);
 ///
 /// std::optional<std::string> id{sourcemeta::core::identify(
-///   document, sourcemeta::core::official_resolver)};
+///   document, sourcemeta::core::schema_official_resolver)};
 /// assert(id.has_value());
 /// assert(id.value() == "https://example.com/my-new-id");
 /// ```
@@ -210,7 +210,7 @@ auto dialect(const JSON &schema,
 ///
 /// const sourcemeta::core::JSON metaschema{
 ///   sourcemeta::core::metaschema(
-///     document, sourcemeta::core::official_resolver)};
+///     document, sourcemeta::core::schema_official_resolver)};
 ///
 /// sourcemeta::core::prettify(metaschema, std::cout);
 /// std::cout << std::endl;
@@ -242,7 +242,7 @@ auto metaschema(
 ///
 /// const std::optional<std::string> base_dialect{
 ///   sourcemeta::core::base_dialect(
-///     document, sourcemeta::core::official_resolver)};
+///     document, sourcemeta::core::schema_official_resolver)};
 ///
 /// assert(base_dialect.has_value());
 /// assert(base_dialect.value() ==
@@ -275,7 +275,7 @@ auto base_dialect(const JSON &schema, const SchemaResolver &resolver,
 ///
 /// const std::map<std::string, bool> vocabularies{
 ///   sourcemeta::core::vocabularies(
-///     document, sourcemeta::core::official_resolver)};
+///     document, sourcemeta::core::schema_official_resolver)};
 ///
 /// assert(vocabularies.at("https://json-schema.org/draft/2020-12/vocab/core"));
 /// assert(vocabularies.at("https://json-schema.org/draft/2020-12/vocab/applicator"));
@@ -341,7 +341,7 @@ auto schema_format_compare(const JSON::String &left, const JSON::String &right)
 ///
 /// sourcemeta::core::unidentify(schema,
 ///   sourcemeta::core::schema_official_walker,
-///   sourcemeta::core::official_resolver);
+///   sourcemeta::core::schema_official_resolver);
 ///
 /// const sourcemeta::core::JSON expected =
 ///   sourcemeta::core::parse_json(R"JSON({
@@ -387,7 +387,7 @@ using SchemaVisitorReference = std::function<void(
 ///
 /// sourcemeta::core::reference_visit(schema,
 ///   sourcemeta::core::schema_official_walker,
-///   sourcemeta::core::official_resolver,
+///   sourcemeta::core::schema_official_resolver,
 ///   sourcemeta::core::reference_visitor_relativize);
 ///
 /// const sourcemeta::core::JSON expected =
@@ -437,7 +437,7 @@ auto reference_visitor_relativize(JSON &subschema, const URI &base,
 ///
 /// sourcemeta::core::reference_visit(schema,
 ///   sourcemeta::core::schema_official_walker,
-///   sourcemeta::core::official_resolver,
+///   sourcemeta::core::schema_official_resolver,
 ///   visitor);
 /// ```
 SOURCEMETA_CORE_JSONSCHEMA_EXPORT
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_bundle.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_bundle.h
index 0003ff6f0..cff5c3d7c 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_bundle.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_bundle.h
@@ -38,7 +38,7 @@ namespace sourcemeta::core {
 ///       "type": "string"
 ///     })JSON");
 ///   } else {
-///     return sourcemeta::core::official_resolver(identifier);
+///     return sourcemeta::core::schema_official_resolver(identifier);
 ///   }
 /// }
 ///
@@ -94,7 +94,7 @@ auto bundle(sourcemeta::core::JSON &schema, const SchemaWalker &walker,
 ///       "type": "string"
 ///     })JSON");
 ///   } else {
-///     return sourcemeta::core::official_resolver(identifier);
+///     return sourcemeta::core::schema_official_resolver(identifier);
 ///   }
 /// }
 ///
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
index 98adfda7d..e302fff86 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h
@@ -47,7 +47,7 @@ namespace sourcemeta::core {
 /// sourcemeta::core::SchemaSchemaFrame frame;
 /// frame.analyse(document,
 ///   sourcemeta::core::schema_official_walker,
-///   sourcemeta::core::official_resolver);
+///   sourcemeta::core::schema_official_resolver);
 ///
 /// // IDs
 /// assert(frame.locations().contains({sourcemeta::core::SchemaReferenceType::Static,
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
index a72708708..16d75e3cd 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h
@@ -24,7 +24,7 @@ namespace sourcemeta::core {
 ///
 /// For convenience, we provide the following default resolvers:
 ///
-/// - sourcemeta::core::official_resolver
+/// - sourcemeta::core::schema_official_resolver
 ///
 /// You can implement resolvers to read from a local storage, to send HTTP
 /// requests, or anything your application might require. Unless your resolver
@@ -35,7 +35,7 @@ using SchemaResolver = std::function<std::optional<JSON>(std::string_view)>;
 /// @ingroup jsonschema
 /// A default resolver that relies on built-in official schemas.
 SOURCEMETA_CORE_JSONSCHEMA_EXPORT
-auto official_resolver(std::string_view identifier)
+auto schema_official_resolver(std::string_view identifier)
     -> std::optional<sourcemeta::core::JSON>;
 
 /// @ingroup jsonschema
@@ -48,7 +48,7 @@ auto official_resolver(std::string_view identifier)
 ///
 /// // (1) Create a map resolver that falls back to the official resolver
 /// sourcemeta::core::SchemaMapResolver
-///   resolver{sourcemeta::core::official_resolver};
+///   resolver{sourcemeta::core::schema_official_resolver};
 ///
 /// const sourcemeta::core::JSON schema =
 ///   sourcemeta::core::parse_json(R"JSON({
@@ -105,7 +105,7 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaMapResolver {
 ///
 /// // (1) Create a flat file resolver that falls back to the official resolver
 /// sourcemeta::core::SchemaFlatFileResolver
-///   resolver{sourcemeta::core::official_resolver};
+///   resolver{sourcemeta::core::schema_official_resolver};
 ///
 /// // (2) Register a schema by path
 /// resolver.add("path/to/example.schema.json");
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
index 33a67d589..862ebb2d8 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h
@@ -164,7 +164,7 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaTransformRule {
 ///
 /// // Apply the transformation bundle to the schema
 /// bundle.apply(schema, sourcemeta::core::schema_official_walker,
-///              sourcemeta::core::official_resolver);
+///              sourcemeta::core::schema_official_resolver);
 ///
 /// // `foo` keywords are gone
 /// assert(!schema.defines("foo"));
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_unevaluated.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_unevaluated.h
index 674b6d978..b8cee8556 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_unevaluated.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_unevaluated.h
@@ -57,11 +57,11 @@ using SchemaUnevaluatedEntries = std::map<std::string, SchemaUnevaluatedEntry>;
 /// sourcemeta::core::SchemaSchemaFrame frame;
 /// frame.analyse(document,
 ///   sourcemeta::core::schema_official_walker,
-///   sourcemeta::core::official_resolver);
+///   sourcemeta::core::schema_official_resolver);
 /// const auto result{sourcemeta::core::unevaluated(
 ///     schema, frame,
 ///     sourcemeta::core::schema_official_walker,
-///     sourcemeta::core::official_resolver)};
+///     sourcemeta::core::schema_official_resolver)};
 ///
 /// assert(result.contains("#/unevaluatedProperties"));
 /// assert(!result.at("#/unevaluatedProperties").dynamic);
diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
index 1da28dbe7..c8d7706d7 100644
--- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
+++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h
@@ -97,7 +97,7 @@ struct SchemaIteratorEntry {
 /// for (const auto &entry :
 ///          sourcemeta::core::SchemaIterator{
 ///          document, sourcemeta::core::schema_official_walker,
-///          sourcemeta::core::official_resolver}) {
+///          sourcemeta::core::schema_official_resolver}) {
 ///   sourcemeta::core::prettify(
 ///     sourcemeta::core::get(document, entry.pointer), std::cout);
 ///   std::cout << "\n";
@@ -164,7 +164,7 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaIterator {
 /// for (const auto &entry :
 ///          sourcemeta::core::SchemaIteratorFlat{
 ///          document, sourcemeta::core::schema_official_walker,
-///          sourcemeta::core::official_resolver}) {
+///          sourcemeta::core::schema_official_resolver}) {
 ///   sourcemeta::core::prettify(
 ///     sourcemeta::core::get(document, entry.pointer), std::cout);
 ///   std::cout << "\n";
@@ -222,7 +222,7 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaIteratorFlat {
 ///
 /// const auto vocabularies{
 ///   sourcemeta::core::vocabularies(
-///     document, sourcemeta::core::official_resolver)};
+///     document, sourcemeta::core::schema_official_resolver)};
 ///
 /// assert(sourcemeta::core::schema_keyword_priority(
 ///   "prefixItems", vocabularies,
@@ -261,7 +261,7 @@ auto SOURCEMETA_CORE_JSONSCHEMA_EXPORT schema_keyword_priority(
 /// for (const auto &entry :
 ///          sourcemeta::core::SchemaKeywordIterator{
 ///          document, sourcemeta::core::schema_official_walker,
-///          sourcemeta::core::official_resolver}) {
+///          sourcemeta::core::schema_official_resolver}) {
 ///   sourcemeta::core::stringify(entry.pointer, std::cout);
 ///   std::cout << "\n";
 /// }
diff --git a/src/core/jsonschema/official_resolver.in.cc b/src/core/jsonschema/official_resolver.in.cc
index 91fbbe624..64e77595e 100644
--- a/src/core/jsonschema/official_resolver.in.cc
+++ b/src/core/jsonschema/official_resolver.in.cc
@@ -1,6 +1,6 @@
 #include <sourcemeta/core/jsonschema_resolver.h>
 
-auto sourcemeta::core::official_resolver(std::string_view identifier)
+auto sourcemeta::core::schema_official_resolver(std::string_view identifier)
     -> std::optional<sourcemeta::core::JSON> {
   // JSON Schema 2020-12
   if (identifier == "https://json-schema.org/draft/2020-12/schema") {
diff --git a/src/extension/alterschema/include/sourcemeta/core/alterschema.h b/src/extension/alterschema/include/sourcemeta/core/alterschema.h
index 09798fa9d..8c4bf3e5d 100644
--- a/src/extension/alterschema/include/sourcemeta/core/alterschema.h
+++ b/src/extension/alterschema/include/sourcemeta/core/alterschema.h
@@ -78,7 +78,7 @@ enum class AlterSchemaCategory {
 /// })JSON");
 ///
 /// bundle.apply(schema, sourcemeta::core::schema_official_walker,
-///              sourcemeta::core::official_resolver);
+///              sourcemeta::core::schema_official_resolver);
 /// ```
 SOURCEMETA_CORE_ALTERSCHEMA_EXPORT
 auto add(SchemaTransformer &bundle, const AlterSchemaCategory category) -> void;
diff --git a/test/alterschema/alterschema_test_utils.h b/test/alterschema/alterschema_test_utils.h
index 305049ba0..bfb1a1bf2 100644
--- a/test/alterschema/alterschema_test_utils.h
+++ b/test/alterschema/alterschema_test_utils.h
@@ -17,7 +17,7 @@
   sourcemeta::core::add(bundle,                                                \
                         sourcemeta::core::AlterSchemaCategory::SyntaxSugar);   \
   bundle.apply(document, sourcemeta::core::schema_official_walker,             \
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
 #define LINT_AND_FIX_FOR_ANALYSIS(document)                                    \
   sourcemeta::core::SchemaTransformer bundle;                                  \
@@ -32,6 +32,6 @@
   sourcemeta::core::add(bundle,                                                \
                         sourcemeta::core::AlterSchemaCategory::Desugar);       \
   bundle.apply(document, sourcemeta::core::schema_official_walker,             \
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
 #endif
diff --git a/test/jsonschema/jsonschema_base_dialect_2019_09_test.cc b/test/jsonschema/jsonschema_base_dialect_2019_09_test.cc
index 54ca5ee8c..6db3125d8 100644
--- a/test/jsonschema/jsonschema_base_dialect_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_2019_09_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/hyper-schema");
@@ -31,7 +31,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_links) {
     "$schema": "https://json-schema.org/draft/2019-09/links"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -42,7 +42,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_output) {
     "$schema": "https://json-schema.org/draft/2019-09/output/schema"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -53,7 +53,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_output_hyperschema) {
     "$schema": "https://json-schema.org/draft/2019-09/output/hyper-schema"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -64,7 +64,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_applicator) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/applicator"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -75,7 +75,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_content) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/content"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -86,7 +86,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_core) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/core"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -97,7 +97,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_format) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/format"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -108,7 +108,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_hyperschema) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/hyper-schema"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/hyper-schema");
@@ -119,7 +119,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_meta_data) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/meta-data"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
@@ -130,7 +130,7 @@ TEST(JSONSchema_base_dialect_2019_09, jsonschema_meta_validation) {
     "$schema": "https://json-schema.org/draft/2019-09/meta/validation"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2019-09/schema");
diff --git a/test/jsonschema/jsonschema_base_dialect_2020_12_test.cc b/test/jsonschema/jsonschema_base_dialect_2020_12_test.cc
index 369fc6a7a..9e05697b7 100644
--- a/test/jsonschema/jsonschema_base_dialect_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_2020_12_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/hyper-schema");
@@ -31,7 +31,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_links) {
     "$schema": "https://json-schema.org/draft/2020-12/links"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -42,7 +42,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_output) {
     "$schema": "https://json-schema.org/draft/2020-12/output/schema"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -53,7 +53,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_applicator) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/applicator"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -64,7 +64,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_content) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/content"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -75,7 +75,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_core) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/core"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -86,7 +86,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_format_annotation) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/format-annotation"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -97,7 +97,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_format_assertion) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/format-assertion"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -108,7 +108,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_hyperschema) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/hyper-schema"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/hyper-schema");
@@ -119,7 +119,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_meta_data) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/meta-data"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -130,7 +130,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_unevaluated) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/unevaluated"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
@@ -141,7 +141,7 @@ TEST(JSONSchema_base_dialect_2020_12, jsonschema_meta_validation) {
     "$schema": "https://json-schema.org/draft/2020-12/meta/validation"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "https://json-schema.org/draft/2020-12/schema");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft0_test.cc b/test/jsonschema/jsonschema_base_dialect_draft0_test.cc
index 4bbb35ae2..8231c650d 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft0_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft0_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_draft0, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-00/hyper-schema#");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_draft0, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-00/hyper-schema#");
@@ -31,7 +31,7 @@ TEST(JSONSchema_base_dialect_draft0, jsonschema_draft_jsonref) {
     "$schema": "http://json-schema.org/draft-00/json-ref#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-00/hyper-schema#");
@@ -42,7 +42,7 @@ TEST(JSONSchema_base_dialect_draft0, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-00/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-00/hyper-schema#");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft1_test.cc b/test/jsonschema/jsonschema_base_dialect_draft1_test.cc
index 5491b7156..c10bdf508 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft1_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft1_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_draft1, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-01/hyper-schema#");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_draft1, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-01/hyper-schema#");
@@ -31,7 +31,7 @@ TEST(JSONSchema_base_dialect_draft1, jsonschema_draft_jsonref) {
     "$schema": "http://json-schema.org/draft-01/json-ref#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-01/hyper-schema#");
@@ -42,7 +42,7 @@ TEST(JSONSchema_base_dialect_draft1, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-01/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-01/hyper-schema#");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft2_test.cc b/test/jsonschema/jsonschema_base_dialect_draft2_test.cc
index d179680cd..b7dca3f27 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft2_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft2_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_draft2, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-02/hyper-schema#");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_draft2, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-02/hyper-schema#");
@@ -31,7 +31,7 @@ TEST(JSONSchema_base_dialect_draft2, jsonschema_draft_jsonref) {
     "$schema": "http://json-schema.org/draft-02/json-ref#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-02/hyper-schema#");
@@ -42,7 +42,7 @@ TEST(JSONSchema_base_dialect_draft2, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-02/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-02/hyper-schema#");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft3_test.cc b/test/jsonschema/jsonschema_base_dialect_draft3_test.cc
index 9f1bed599..4f538ea54 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft3_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft3_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_draft3, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-03/hyper-schema#");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_draft3, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(), "http://json-schema.org/draft-03/schema#");
 }
@@ -30,7 +30,7 @@ TEST(JSONSchema_base_dialect_draft3, jsonschema_draft_jsonref) {
     "$schema": "http://json-schema.org/draft-03/json-ref#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-03/hyper-schema#");
@@ -41,7 +41,7 @@ TEST(JSONSchema_base_dialect_draft3, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-03/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-03/hyper-schema#");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft4_test.cc b/test/jsonschema/jsonschema_base_dialect_draft4_test.cc
index cf95930a1..ab7fd9c0b 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft4_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft4_test.cc
@@ -25,7 +25,7 @@ TEST(JSONSchema_base_dialect_draft4, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-04/hyper-schema#");
@@ -37,7 +37,7 @@ TEST(JSONSchema_base_dialect_draft4, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(), "http://json-schema.org/draft-04/schema#");
 }
@@ -47,7 +47,7 @@ TEST(JSONSchema_base_dialect_draft4, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-04/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-04/hyper-schema#");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft6_test.cc b/test/jsonschema/jsonschema_base_dialect_draft6_test.cc
index 27f020498..eecfee55f 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft6_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft6_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_draft6, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-06/hyper-schema#");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_draft6, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(), "http://json-schema.org/draft-06/schema#");
 }
@@ -30,7 +30,7 @@ TEST(JSONSchema_base_dialect_draft6, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-06/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-06/hyper-schema#");
diff --git a/test/jsonschema/jsonschema_base_dialect_draft7_test.cc b/test/jsonschema/jsonschema_base_dialect_draft7_test.cc
index e0d7eb39f..40733cc34 100644
--- a/test/jsonschema/jsonschema_base_dialect_draft7_test.cc
+++ b/test/jsonschema/jsonschema_base_dialect_draft7_test.cc
@@ -8,7 +8,7 @@ TEST(JSONSchema_base_dialect_draft7, jsonschema_draft_hyperschema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-07/hyper-schema#");
@@ -20,7 +20,7 @@ TEST(JSONSchema_base_dialect_draft7, jsonschema_draft_schema) {
     "type": "object"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(), "http://json-schema.org/draft-07/schema#");
 }
@@ -30,7 +30,7 @@ TEST(JSONSchema_base_dialect_draft7, jsonschema_draft_links) {
     "$schema": "http://json-schema.org/draft-07/links#"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(),
             "http://json-schema.org/draft-07/hyper-schema#");
@@ -41,7 +41,7 @@ TEST(JSONSchema_base_dialect_draft7, jsonschema_draft_hyperschema_output) {
     "$schema": "http://json-schema.org/draft-07/hyper-schema-output"
   })JSON");
   const std::optional<std::string> base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   EXPECT_EQ(base_dialect.value(), "http://json-schema.org/draft-07/schema#");
 }
diff --git a/test/jsonschema/jsonschema_bundle_2019_09_test.cc b/test/jsonschema/jsonschema_bundle_2019_09_test.cc
index e8530c392..f64f0c355 100644
--- a/test/jsonschema/jsonschema_bundle_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_bundle_2019_09_test.cc
@@ -83,7 +83,7 @@ static auto test_resolver(std::string_view identifier)
       "$vocabulary": { "https://json-schema.org/draft/2019-09/vocab/core": true }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -554,7 +554,7 @@ TEST(JSONSchema_bundle_2019_09, hyperschema_1) {
 
 TEST(JSONSchema_bundle_2019_09, hyperschema_2) {
   sourcemeta::core::JSON document =
-      sourcemeta::core::official_resolver(
+      sourcemeta::core::schema_official_resolver(
           "https://json-schema.org/draft/2019-09/hyper-schema")
           .value();
 
diff --git a/test/jsonschema/jsonschema_bundle_2020_12_test.cc b/test/jsonschema/jsonschema_bundle_2020_12_test.cc
index a5b6a3598..0e82a2ab3 100644
--- a/test/jsonschema/jsonschema_bundle_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_bundle_2020_12_test.cc
@@ -93,7 +93,7 @@ static auto test_resolver(std::string_view identifier)
       "$vocabulary": { "https://json-schema.org/draft/2020-12/vocab/core": true }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft0_test.cc b/test/jsonschema/jsonschema_bundle_draft0_test.cc
index 301c7228e..46066124f 100644
--- a/test/jsonschema/jsonschema_bundle_draft0_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft0_test.cc
@@ -15,7 +15,7 @@ static auto test_resolver(std::string_view identifier)
       "type": "string"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft1_test.cc b/test/jsonschema/jsonschema_bundle_draft1_test.cc
index 61ed26f21..63f590c45 100644
--- a/test/jsonschema/jsonschema_bundle_draft1_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft1_test.cc
@@ -15,7 +15,7 @@ static auto test_resolver(std::string_view identifier)
       "type": "string"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft2_test.cc b/test/jsonschema/jsonschema_bundle_draft2_test.cc
index be16e057a..59eeafbb1 100644
--- a/test/jsonschema/jsonschema_bundle_draft2_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft2_test.cc
@@ -15,7 +15,7 @@ static auto test_resolver(std::string_view identifier)
       "type": "string"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft3_test.cc b/test/jsonschema/jsonschema_bundle_draft3_test.cc
index 6708bec00..af014f2a0 100644
--- a/test/jsonschema/jsonschema_bundle_draft3_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft3_test.cc
@@ -15,7 +15,7 @@ static auto test_resolver(std::string_view identifier)
       "type": "string"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft4_test.cc b/test/jsonschema/jsonschema_bundle_draft4_test.cc
index 7358d5e4a..1891ff525 100644
--- a/test/jsonschema/jsonschema_bundle_draft4_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft4_test.cc
@@ -64,7 +64,7 @@ static auto test_resolver(std::string_view identifier)
       "id": "https://example.com/meta/2.json"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft6_test.cc b/test/jsonschema/jsonschema_bundle_draft6_test.cc
index d567f1daf..46fb51097 100644
--- a/test/jsonschema/jsonschema_bundle_draft6_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft6_test.cc
@@ -64,7 +64,7 @@ static auto test_resolver(std::string_view identifier)
       "$id": "https://example.com/meta/2.json"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_draft7_test.cc b/test/jsonschema/jsonschema_bundle_draft7_test.cc
index 7bd57daeb..7f1757742 100644
--- a/test/jsonschema/jsonschema_bundle_draft7_test.cc
+++ b/test/jsonschema/jsonschema_bundle_draft7_test.cc
@@ -64,7 +64,7 @@ static auto test_resolver(std::string_view identifier)
       "$id": "https://example.com/meta/2.json"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_bundle_test.cc b/test/jsonschema/jsonschema_bundle_test.cc
index 2bdea853d..98e61bd10 100644
--- a/test/jsonschema/jsonschema_bundle_test.cc
+++ b/test/jsonschema/jsonschema_bundle_test.cc
@@ -41,7 +41,7 @@ static auto test_resolver(std::string_view identifier)
       "foo", "bar", "baz"
     ])JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_flat_file_resolver_test.cc b/test/jsonschema/jsonschema_flat_file_resolver_test.cc
index 27abf2b06..3daf240a5 100644
--- a/test/jsonschema/jsonschema_flat_file_resolver_test.cc
+++ b/test/jsonschema/jsonschema_flat_file_resolver_test.cc
@@ -10,11 +10,11 @@ TEST(JSONSchema_SchemaFlatFileResolver, empty_no_fallback) {
 
 TEST(JSONSchema_SchemaFlatFileResolver, empty_with_fallback) {
   sourcemeta::core::SchemaFlatFileResolver resolver{
-      sourcemeta::core::official_resolver};
+      sourcemeta::core::schema_official_resolver};
   EXPECT_TRUE(
       resolver("https://json-schema.org/draft/2020-12/schema").has_value());
   EXPECT_EQ(resolver("https://json-schema.org/draft/2020-12/schema"),
-            sourcemeta::core::official_resolver(
+            sourcemeta::core::schema_official_resolver(
                 "https://json-schema.org/draft/2020-12/schema"));
 }
 
diff --git a/test/jsonschema/jsonschema_frame_2019_09_test.cc b/test/jsonschema/jsonschema_frame_2019_09_test.cc
index 40c638c8e..ec2844f3f 100644
--- a/test/jsonschema/jsonschema_frame_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_frame_2019_09_test.cc
@@ -59,7 +59,7 @@ TEST(JSONSchema_frame_2019_09, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -107,7 +107,7 @@ TEST(JSONSchema_frame_2019_09, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_2019_09_RESOURCE(
@@ -147,7 +147,7 @@ TEST(JSONSchema_frame_2019_09, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_2019_09_RESOURCE(
@@ -207,7 +207,7 @@ TEST(JSONSchema_frame_2019_09, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 14);
 
@@ -296,7 +296,7 @@ TEST(JSONSchema_frame_2019_09, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_2019_09_RESOURCE(
@@ -374,7 +374,7 @@ TEST(JSONSchema_frame_2019_09, nested_schemas) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 30);
 
@@ -528,7 +528,7 @@ TEST(JSONSchema_frame_2019_09, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -542,7 +542,7 @@ TEST(JSONSchema_frame_2019_09, static_anchor_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -554,7 +554,7 @@ TEST(JSONSchema_frame_2019_09, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "https://json-schema.org/draft/2019-09/schema",
                 "https://www.sourcemeta.com/schema");
 
@@ -593,7 +593,7 @@ TEST(JSONSchema_frame_2019_09, anchor_top_level) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -651,7 +651,7 @@ TEST(JSONSchema_frame_2019_09, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "https://json-schema.org/draft/2019-09/schema",
                 "https://www.example.com");
 
@@ -776,7 +776,7 @@ TEST(JSONSchema_frame_2019_09, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -819,7 +819,7 @@ TEST(JSONSchema_frame_2019_09, location_independent_identifier_anonymous) {
   sourcemeta::core::SchemaFrame frame;
 
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -832,7 +832,7 @@ TEST(JSONSchema_frame_2019_09, recursive_anchor_true_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -883,7 +883,7 @@ TEST(JSONSchema_frame_2019_09, recursive_anchor_false_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 4);
 
@@ -930,7 +930,7 @@ TEST(JSONSchema_frame_2019_09, recursive_anchor_true_without_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -985,7 +985,7 @@ TEST(JSONSchema_frame_2019_09, recursive_anchor_false_without_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -1031,7 +1031,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_no_recursive_anchor_anonymous) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 4);
 
@@ -1074,7 +1074,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_no_recursive_anchor) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -1123,7 +1123,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_recursive_anchor_false_anonymous) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -1171,7 +1171,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_recursive_anchor_false) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -1224,7 +1224,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_recursive_anchor_true_anonymous) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -1278,7 +1278,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_recursive_anchor_true) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -1340,7 +1340,7 @@ TEST(JSONSchema_frame_2019_09,
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
@@ -1415,7 +1415,7 @@ TEST(JSONSchema_frame_2019_09,
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 11);
 
@@ -1496,7 +1496,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_nested_recursive_anchor_true) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -1561,7 +1561,7 @@ TEST(JSONSchema_frame_2019_09, recursive_ref_multiple_recursive_anchor_true) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 14);
 
@@ -1652,7 +1652,7 @@ TEST(JSONSchema_frame_2019_09, recursive_anchor_conflict) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -1665,7 +1665,7 @@ TEST(JSONSchema_frame_2019_09, invalid_recursive_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -1681,7 +1681,7 @@ TEST(JSONSchema_frame_2019_09, recursive_anchor_on_relative_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 11);
 
@@ -1756,7 +1756,7 @@ TEST(JSONSchema_frame_2019_09, ref_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -1817,7 +1817,7 @@ TEST(JSONSchema_frame_2019_09, ref_from_definitions) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
 
@@ -1885,7 +1885,7 @@ TEST(JSONSchema_frame_2019_09, relative_base_uri_without_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -1922,7 +1922,7 @@ TEST(JSONSchema_frame_2019_09, relative_base_uri_with_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
@@ -1974,7 +1974,7 @@ TEST(JSONSchema_frame_2019_09, relative_id_leading_slash) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_2019_09_RESOURCE(frame, "/base", "/base", "", "/base", "",
diff --git a/test/jsonschema/jsonschema_frame_2020_12_test.cc b/test/jsonschema/jsonschema_frame_2020_12_test.cc
index 5b7648d48..076586f7d 100644
--- a/test/jsonschema/jsonschema_frame_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_frame_2020_12_test.cc
@@ -59,7 +59,7 @@ TEST(JSONSchema_frame_2020_12, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -107,7 +107,7 @@ TEST(JSONSchema_frame_2020_12, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_2020_12_RESOURCE(
@@ -147,7 +147,7 @@ TEST(JSONSchema_frame_2020_12, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_2020_12_RESOURCE(
@@ -207,7 +207,7 @@ TEST(JSONSchema_frame_2020_12, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 14);
   EXPECT_FRAME_STATIC_2020_12_RESOURCE(
@@ -295,7 +295,7 @@ TEST(JSONSchema_frame_2020_12, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_2020_12_RESOURCE(
@@ -365,7 +365,7 @@ TEST(JSONSchema_frame_2020_12, nested_schemas) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 30);
 
@@ -519,7 +519,7 @@ TEST(JSONSchema_frame_2020_12, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -533,7 +533,7 @@ TEST(JSONSchema_frame_2020_12, static_anchor_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -545,7 +545,7 @@ TEST(JSONSchema_frame_2020_12, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "https://json-schema.org/draft/2020-12/schema",
                 "https://www.sourcemeta.com/schema");
 
@@ -584,7 +584,7 @@ TEST(JSONSchema_frame_2020_12, anchor_top_level) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -642,7 +642,7 @@ TEST(JSONSchema_frame_2020_12, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "https://json-schema.org/draft/2020-12/schema",
                 "https://www.example.com");
 
@@ -791,7 +791,7 @@ TEST(JSONSchema_frame_2020_12, dynamic_refs_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 7);
 
@@ -851,7 +851,7 @@ TEST(JSONSchema_frame_2020_12, dynamic_refs_with_no_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 7);
 
@@ -891,7 +891,7 @@ TEST(JSONSchema_frame_2020_12, ref_to_dynamic_anchor) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 2);
 
@@ -917,7 +917,7 @@ TEST(JSONSchema_frame_2020_12, different_dynamic_and_refs_in_same_object) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 3);
 
@@ -951,7 +951,7 @@ TEST(JSONSchema_frame_2020_12, same_dynamic_and_refs_in_same_object) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 3);
 
@@ -988,7 +988,7 @@ TEST(JSONSchema_frame_2020_12, dynamic_anchor_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 21);
 
@@ -1109,7 +1109,7 @@ TEST(JSONSchema_frame_2020_12, dynamic_anchor_without_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -1170,7 +1170,7 @@ TEST(JSONSchema_frame_2020_12,
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
 
@@ -1237,7 +1237,7 @@ TEST(JSONSchema_frame_2020_12, dynamic_ref_to_single_dynamic_anchor_external) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
@@ -1311,7 +1311,7 @@ TEST(JSONSchema_frame_2020_12, dynamic_anchor_same_on_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -1327,7 +1327,7 @@ TEST(JSONSchema_frame_2020_12, no_id_recursive_empty_pointer) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 5);
 
@@ -1370,7 +1370,7 @@ TEST(JSONSchema_frame_2020_12, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -1413,7 +1413,7 @@ TEST(JSONSchema_frame_2020_12, location_independent_identifier_anonymous) {
   sourcemeta::core::SchemaFrame frame;
 
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -1429,7 +1429,7 @@ TEST(JSONSchema_frame_2020_12, ref_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -1490,7 +1490,7 @@ TEST(JSONSchema_frame_2020_12, ref_from_definitions) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
 
@@ -1558,7 +1558,7 @@ TEST(JSONSchema_frame_2020_12, relative_base_uri_without_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -1595,7 +1595,7 @@ TEST(JSONSchema_frame_2020_12, relative_base_uri_with_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
@@ -1652,11 +1652,11 @@ TEST(JSONSchema_frame_2020_12, idempotent_with_refs) {
   sourcemeta::core::SchemaFrame frame;
 
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -1711,7 +1711,7 @@ TEST(JSONSchema_frame_2020_12, allof_refs) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 3);
 
diff --git a/test/jsonschema/jsonschema_frame_draft0_test.cc b/test/jsonschema/jsonschema_frame_draft0_test.cc
index ca9ce9e3f..c6b152961 100644
--- a/test/jsonschema/jsonschema_frame_draft0_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft0_test.cc
@@ -41,7 +41,7 @@ TEST(JSONSchema_frame_draft0, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -88,7 +88,7 @@ TEST(JSONSchema_frame_draft0, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT0_RESOURCE(
@@ -128,7 +128,7 @@ TEST(JSONSchema_frame_draft0, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT0_RESOURCE(
@@ -185,7 +185,7 @@ TEST(JSONSchema_frame_draft0, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT0_RESOURCE(
@@ -249,7 +249,7 @@ TEST(JSONSchema_frame_draft0, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT0_RESOURCE(
@@ -310,7 +310,7 @@ TEST(JSONSchema_frame_draft0, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -322,7 +322,7 @@ TEST(JSONSchema_frame_draft0, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-00/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -368,7 +368,7 @@ TEST(JSONSchema_frame_draft0, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-00/schema#",
                 "https://www.example.com");
 
@@ -448,7 +448,7 @@ TEST(JSONSchema_frame_draft0, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
diff --git a/test/jsonschema/jsonschema_frame_draft1_test.cc b/test/jsonschema/jsonschema_frame_draft1_test.cc
index f530d38b5..a242ead1b 100644
--- a/test/jsonschema/jsonschema_frame_draft1_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft1_test.cc
@@ -41,7 +41,7 @@ TEST(JSONSchema_frame_draft1, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -88,7 +88,7 @@ TEST(JSONSchema_frame_draft1, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT1_RESOURCE(
@@ -128,7 +128,7 @@ TEST(JSONSchema_frame_draft1, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT1_RESOURCE(
@@ -185,7 +185,7 @@ TEST(JSONSchema_frame_draft1, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT1_RESOURCE(
@@ -249,7 +249,7 @@ TEST(JSONSchema_frame_draft1, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT1_RESOURCE(
@@ -310,7 +310,7 @@ TEST(JSONSchema_frame_draft1, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -322,7 +322,7 @@ TEST(JSONSchema_frame_draft1, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-01/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -368,7 +368,7 @@ TEST(JSONSchema_frame_draft1, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-01/schema#",
                 "https://www.example.com");
 
@@ -448,7 +448,7 @@ TEST(JSONSchema_frame_draft1, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
diff --git a/test/jsonschema/jsonschema_frame_draft2_test.cc b/test/jsonschema/jsonschema_frame_draft2_test.cc
index 192dbe6d7..8dcfe64e0 100644
--- a/test/jsonschema/jsonschema_frame_draft2_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft2_test.cc
@@ -41,7 +41,7 @@ TEST(JSONSchema_frame_draft2, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -88,7 +88,7 @@ TEST(JSONSchema_frame_draft2, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT2_RESOURCE(
@@ -128,7 +128,7 @@ TEST(JSONSchema_frame_draft2, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT2_RESOURCE(
@@ -185,7 +185,7 @@ TEST(JSONSchema_frame_draft2, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT2_RESOURCE(
@@ -249,7 +249,7 @@ TEST(JSONSchema_frame_draft2, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT2_RESOURCE(
@@ -310,7 +310,7 @@ TEST(JSONSchema_frame_draft2, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -322,7 +322,7 @@ TEST(JSONSchema_frame_draft2, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-02/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -368,7 +368,7 @@ TEST(JSONSchema_frame_draft2, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-02/schema#",
                 "https://www.example.com");
 
@@ -448,7 +448,7 @@ TEST(JSONSchema_frame_draft2, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
diff --git a/test/jsonschema/jsonschema_frame_draft3_test.cc b/test/jsonschema/jsonschema_frame_draft3_test.cc
index 5e424b870..f85e379d5 100644
--- a/test/jsonschema/jsonschema_frame_draft3_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft3_test.cc
@@ -41,7 +41,7 @@ TEST(JSONSchema_frame_draft3, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -88,7 +88,7 @@ TEST(JSONSchema_frame_draft3, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT3_RESOURCE(
@@ -128,7 +128,7 @@ TEST(JSONSchema_frame_draft3, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT3_RESOURCE(
@@ -185,7 +185,7 @@ TEST(JSONSchema_frame_draft3, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT3_RESOURCE(
@@ -249,7 +249,7 @@ TEST(JSONSchema_frame_draft3, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT3_RESOURCE(
@@ -310,7 +310,7 @@ TEST(JSONSchema_frame_draft3, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -322,7 +322,7 @@ TEST(JSONSchema_frame_draft3, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-03/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -368,7 +368,7 @@ TEST(JSONSchema_frame_draft3, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-03/schema#",
                 "https://www.example.com");
 
@@ -448,7 +448,7 @@ TEST(JSONSchema_frame_draft3, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -483,7 +483,7 @@ TEST(JSONSchema_frame_draft3, ref_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 4);
 
diff --git a/test/jsonschema/jsonschema_frame_draft4_test.cc b/test/jsonschema/jsonschema_frame_draft4_test.cc
index 3bfc4160a..93f605be3 100644
--- a/test/jsonschema/jsonschema_frame_draft4_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft4_test.cc
@@ -50,7 +50,7 @@ TEST(JSONSchema_frame_draft4, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -97,7 +97,7 @@ TEST(JSONSchema_frame_draft4, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT4_RESOURCE(
@@ -137,7 +137,7 @@ TEST(JSONSchema_frame_draft4, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT4_RESOURCE(
@@ -194,7 +194,7 @@ TEST(JSONSchema_frame_draft4, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT4_RESOURCE(
@@ -258,7 +258,7 @@ TEST(JSONSchema_frame_draft4, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT4_RESOURCE(
@@ -319,7 +319,7 @@ TEST(JSONSchema_frame_draft4, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -331,7 +331,7 @@ TEST(JSONSchema_frame_draft4, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-04/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -377,7 +377,7 @@ TEST(JSONSchema_frame_draft4, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-04/schema#",
                 "https://www.example.com");
 
@@ -457,7 +457,7 @@ TEST(JSONSchema_frame_draft4, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -498,7 +498,7 @@ TEST(JSONSchema_frame_draft4, location_independent_identifier_anonymous) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
 
@@ -563,7 +563,7 @@ TEST(JSONSchema_frame_draft4, ref_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -613,7 +613,7 @@ TEST(JSONSchema_frame_draft4, relative_base_uri_without_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -650,7 +650,7 @@ TEST(JSONSchema_frame_draft4, relative_base_uri_with_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
diff --git a/test/jsonschema/jsonschema_frame_draft6_test.cc b/test/jsonschema/jsonschema_frame_draft6_test.cc
index 65ae4856e..3bbbd8252 100644
--- a/test/jsonschema/jsonschema_frame_draft6_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft6_test.cc
@@ -50,7 +50,7 @@ TEST(JSONSchema_frame_draft6, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -97,7 +97,7 @@ TEST(JSONSchema_frame_draft6, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT6_RESOURCE(
@@ -137,7 +137,7 @@ TEST(JSONSchema_frame_draft6, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT6_RESOURCE(
@@ -194,7 +194,7 @@ TEST(JSONSchema_frame_draft6, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT6_RESOURCE(
@@ -258,7 +258,7 @@ TEST(JSONSchema_frame_draft6, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT6_RESOURCE(
@@ -319,7 +319,7 @@ TEST(JSONSchema_frame_draft6, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -331,7 +331,7 @@ TEST(JSONSchema_frame_draft6, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-06/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -377,7 +377,7 @@ TEST(JSONSchema_frame_draft6, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-06/schema#",
                 "https://www.example.com");
 
@@ -457,7 +457,7 @@ TEST(JSONSchema_frame_draft6, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -498,7 +498,7 @@ TEST(JSONSchema_frame_draft6, location_independent_identifier_anonymous) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
 
@@ -563,7 +563,7 @@ TEST(JSONSchema_frame_draft6, ref_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -613,7 +613,7 @@ TEST(JSONSchema_frame_draft6, relative_base_uri_without_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -650,7 +650,7 @@ TEST(JSONSchema_frame_draft6, relative_base_uri_with_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
diff --git a/test/jsonschema/jsonschema_frame_draft7_test.cc b/test/jsonschema/jsonschema_frame_draft7_test.cc
index be99da862..c173321d3 100644
--- a/test/jsonschema/jsonschema_frame_draft7_test.cc
+++ b/test/jsonschema/jsonschema_frame_draft7_test.cc
@@ -50,7 +50,7 @@ TEST(JSONSchema_frame_draft7, anonymous_with_nested_schema_resource) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 6);
 
@@ -97,7 +97,7 @@ TEST(JSONSchema_frame_draft7, empty_schema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
   EXPECT_FRAME_STATIC_DRAFT7_RESOURCE(
@@ -137,7 +137,7 @@ TEST(JSONSchema_frame_draft7, one_level_applicators_without_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
   EXPECT_FRAME_STATIC_DRAFT7_RESOURCE(
@@ -194,7 +194,7 @@ TEST(JSONSchema_frame_draft7, one_level_applicators_with_identifiers) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT7_RESOURCE(
@@ -258,7 +258,7 @@ TEST(JSONSchema_frame_draft7, subschema_absolute_identifier) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 9);
   EXPECT_FRAME_STATIC_DRAFT7_RESOURCE(
@@ -319,7 +319,7 @@ TEST(JSONSchema_frame_draft7, id_override) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -331,7 +331,7 @@ TEST(JSONSchema_frame_draft7, explicit_argument_id_same) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-07/schema#",
                 "https://www.sourcemeta.com/schema");
 
@@ -377,7 +377,7 @@ TEST(JSONSchema_frame_draft7, explicit_argument_id_different) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "http://json-schema.org/draft-07/schema#",
                 "https://www.example.com");
 
@@ -457,7 +457,7 @@ TEST(JSONSchema_frame_draft7, ref_metaschema) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -498,7 +498,7 @@ TEST(JSONSchema_frame_draft7, location_independent_identifier_anonymous) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 8);
 
@@ -563,7 +563,7 @@ TEST(JSONSchema_frame_draft7, ref_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 7);
 
@@ -613,7 +613,7 @@ TEST(JSONSchema_frame_draft7, relative_base_uri_without_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 3);
 
@@ -650,7 +650,7 @@ TEST(JSONSchema_frame_draft7, relative_base_uri_with_ref) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 10);
 
diff --git a/test/jsonschema/jsonschema_frame_test.cc b/test/jsonschema/jsonschema_frame_test.cc
index 053e84946..d5728b628 100644
--- a/test/jsonschema/jsonschema_frame_test.cc
+++ b/test/jsonschema/jsonschema_frame_test.cc
@@ -28,7 +28,7 @@ TEST(JSONSchema_frame, nested_schemas_mixing_dialects) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 21);
 
@@ -186,7 +186,7 @@ TEST(JSONSchema_frame, no_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 14);
 
@@ -272,7 +272,7 @@ TEST(JSONSchema_frame, no_id_with_default) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver,
+                sourcemeta::core::schema_official_resolver,
                 "https://json-schema.org/draft/2020-12/schema",
                 "https://www.sourcemeta.com/schema");
 
@@ -324,7 +324,7 @@ TEST(JSONSchema_frame, anchor_on_absolute_subid) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.locations().size(), 12);
   EXPECT_FRAME_STATIC_RESOURCE(frame, "https://www.example.com",
@@ -414,7 +414,7 @@ TEST(JSONSchema_frame, uri_iterators) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   std::set<std::string> uris;
   for (const auto &entry : frame.locations()) {
@@ -460,7 +460,7 @@ TEST(JSONSchema_frame, no_refs) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 1);
 
@@ -492,7 +492,7 @@ TEST(JSONSchema_frame, refs_with_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_FRAME_DESTINATION_OF(frame, Static,
                               "https://www.sourcemeta.com/schema", 0,
@@ -556,7 +556,7 @@ TEST(JSONSchema_frame, refs_with_no_id) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_FRAME_DESTINATION_OF(frame, Static, "", 0, "/properties/foo/$ref")
   EXPECT_FRAME_DESTINATION_OF(frame, Static, "#baz", 0,
@@ -597,7 +597,7 @@ TEST(JSONSchema_frame, no_dynamic_ref_on_old_drafts) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 1);
 
@@ -618,7 +618,7 @@ TEST(JSONSchema_frame, remote_refs) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(document, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
 
   EXPECT_EQ(frame.references().size(), 4);
   EXPECT_STATIC_REFERENCE(
@@ -642,6 +642,6 @@ TEST(JSONSchema_frame, no_dialect) {
 
   sourcemeta::core::SchemaFrame frame;
   EXPECT_THROW(frame.analyse(document, sourcemeta::core::schema_official_walker,
-                             sourcemeta::core::official_resolver),
+                             sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
diff --git a/test/jsonschema/jsonschema_identify_2019_09_test.cc b/test/jsonschema/jsonschema_identify_2019_09_test.cc
index f4bdb5dad..fbe31302b 100644
--- a/test/jsonschema/jsonschema_identify_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_identify_2019_09_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "https://json-schema.org/draft/2019-09/schema"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_2019_09, old_one_hop) {
 TEST(JSONSchema_identify_2019_09, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2019-09/schema")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_2019_09, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_2019_09, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2019-09/schema")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_2019_09, valid_id) {
     "$schema": "https://json-schema.org/draft/2019-09/schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_2019_09, old_id) {
     "$schema": "https://json-schema.org/draft/2019-09/schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_2019_09, default_dialect_precedence) {
     "$schema": "https://json-schema.org/draft/2019-09/schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-04/schema#")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_2019_09, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_2019_09, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -152,7 +152,7 @@ TEST(JSONSchema_identify_2019_09, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -168,7 +168,7 @@ TEST(JSONSchema_identify_2019_09, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -184,7 +184,7 @@ TEST(JSONSchema_identify_2019_09, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "https://json-schema.org/draft/2019-09/schema");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -201,7 +201,7 @@ TEST(JSONSchema_identify_2019_09, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
@@ -222,7 +222,7 @@ TEST(JSONSchema_identify_2019_09, reidentify_set_with_top_level_ref) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_2020_12_test.cc b/test/jsonschema/jsonschema_identify_2020_12_test.cc
index b0586a8b1..de6695eda 100644
--- a/test/jsonschema/jsonschema_identify_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_identify_2020_12_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "https://json-schema.org/draft/2020-12/schema"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_2020_12, old_one_hop) {
 TEST(JSONSchema_identify_2020_12, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_2020_12, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_2020_12, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_2020_12, valid_id) {
     "$schema": "https://json-schema.org/draft/2020-12/schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_2020_12, old_id) {
     "$schema": "https://json-schema.org/draft/2020-12/schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_2020_12, default_dialect_precedence) {
     "$schema": "https://json-schema.org/draft/2020-12/schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-04/schema#")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_2020_12, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_2020_12, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -152,7 +152,7 @@ TEST(JSONSchema_identify_2020_12, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -168,7 +168,7 @@ TEST(JSONSchema_identify_2020_12, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -184,7 +184,7 @@ TEST(JSONSchema_identify_2020_12, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "https://json-schema.org/draft/2020-12/schema");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -201,7 +201,7 @@ TEST(JSONSchema_identify_2020_12, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
@@ -222,7 +222,7 @@ TEST(JSONSchema_identify_2020_12, reidentify_set_with_top_level_ref) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft0_test.cc b/test/jsonschema/jsonschema_identify_draft0_test.cc
index 7c0257a65..7ae7a9b5f 100644
--- a/test/jsonschema/jsonschema_identify_draft0_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft0_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-00/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft0, new_one_hop) {
 TEST(JSONSchema_identify_draft0, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-00/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft0, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft0, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-00/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft0, valid_id) {
     "$schema": "http://json-schema.org/draft-00/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft0, new_id) {
     "$schema": "http://json-schema.org/draft-00/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft0, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-00/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft0, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft0, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -152,7 +152,7 @@ TEST(JSONSchema_identify_draft0, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -168,7 +168,7 @@ TEST(JSONSchema_identify_draft0, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -184,7 +184,7 @@ TEST(JSONSchema_identify_draft0, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-00/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -201,7 +201,7 @@ TEST(JSONSchema_identify_draft0, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft1_test.cc b/test/jsonschema/jsonschema_identify_draft1_test.cc
index 605cc27d2..a23c34a92 100644
--- a/test/jsonschema/jsonschema_identify_draft1_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft1_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-01/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft1, new_one_hop) {
 TEST(JSONSchema_identify_draft1, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-01/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft1, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft1, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-01/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft1, valid_id) {
     "$schema": "http://json-schema.org/draft-01/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft1, new_id) {
     "$schema": "http://json-schema.org/draft-01/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft1, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-01/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft1, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft1, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -152,7 +152,7 @@ TEST(JSONSchema_identify_draft1, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -168,7 +168,7 @@ TEST(JSONSchema_identify_draft1, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -184,7 +184,7 @@ TEST(JSONSchema_identify_draft1, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-01/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -201,7 +201,7 @@ TEST(JSONSchema_identify_draft1, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft2_test.cc b/test/jsonschema/jsonschema_identify_draft2_test.cc
index 80616bd17..158db1064 100644
--- a/test/jsonschema/jsonschema_identify_draft2_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft2_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-02/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft2, new_one_hop) {
 TEST(JSONSchema_identify_draft2, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-02/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft2, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft2, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-02/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft2, valid_id) {
     "$schema": "http://json-schema.org/draft-02/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft2, new_id) {
     "$schema": "http://json-schema.org/draft-02/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft2, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-02/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft2, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft2, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -152,7 +152,7 @@ TEST(JSONSchema_identify_draft2, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -168,7 +168,7 @@ TEST(JSONSchema_identify_draft2, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -184,7 +184,7 @@ TEST(JSONSchema_identify_draft2, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-02/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -201,7 +201,7 @@ TEST(JSONSchema_identify_draft2, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft3_test.cc b/test/jsonschema/jsonschema_identify_draft3_test.cc
index 25de3e08b..7014beb92 100644
--- a/test/jsonschema/jsonschema_identify_draft3_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft3_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-03/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft3, new_one_hop) {
 TEST(JSONSchema_identify_draft3, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-03/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft3, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft3, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-03/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft3, valid_id) {
     "$schema": "http://json-schema.org/draft-03/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft3, new_id) {
     "$schema": "http://json-schema.org/draft-03/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft3, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-03/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft3, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft3, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -151,7 +151,7 @@ TEST(JSONSchema_identify_draft3, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -167,7 +167,7 @@ TEST(JSONSchema_identify_draft3, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -183,7 +183,7 @@ TEST(JSONSchema_identify_draft3, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-03/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -200,7 +200,7 @@ TEST(JSONSchema_identify_draft3, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
@@ -221,7 +221,7 @@ TEST(JSONSchema_identify_draft3, reidentify_set_with_top_level_ref) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -241,7 +241,7 @@ TEST(JSONSchema_identify_draft3,
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft4_test.cc b/test/jsonschema/jsonschema_identify_draft4_test.cc
index 552945dc4..90888a547 100644
--- a/test/jsonschema/jsonschema_identify_draft4_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft4_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-04/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft4, new_one_hop) {
 TEST(JSONSchema_identify_draft4, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-04/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft4, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft4, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-04/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft4, valid_id) {
     "$schema": "http://json-schema.org/draft-04/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft4, new_id) {
     "$schema": "http://json-schema.org/draft-04/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft4, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-04/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft4, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft4, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -151,7 +151,7 @@ TEST(JSONSchema_identify_draft4, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -167,7 +167,7 @@ TEST(JSONSchema_identify_draft4, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -183,7 +183,7 @@ TEST(JSONSchema_identify_draft4, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-04/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -200,7 +200,7 @@ TEST(JSONSchema_identify_draft4, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
@@ -221,7 +221,7 @@ TEST(JSONSchema_identify_draft4, reidentify_set_with_top_level_ref) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
@@ -240,7 +240,7 @@ TEST(JSONSchema_identify_draft4, reidentify_set_with_top_level_ref_and_allof) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "id": "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft6_test.cc b/test/jsonschema/jsonschema_identify_draft6_test.cc
index e971b0e10..69f8cfcc3 100644
--- a/test/jsonschema/jsonschema_identify_draft6_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft6_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-06/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft6, old_one_hop) {
 TEST(JSONSchema_identify_draft6, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-06/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft6, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft6, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-06/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft6, valid_id) {
     "$schema": "http://json-schema.org/draft-06/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft6, old_id) {
     "$schema": "http://json-schema.org/draft-06/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft6, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-06/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-04/schema#")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft6, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft6, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -151,7 +151,7 @@ TEST(JSONSchema_identify_draft6, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -167,7 +167,7 @@ TEST(JSONSchema_identify_draft6, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -183,7 +183,7 @@ TEST(JSONSchema_identify_draft6, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-06/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -200,7 +200,7 @@ TEST(JSONSchema_identify_draft6, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
@@ -221,7 +221,7 @@ TEST(JSONSchema_identify_draft6, reidentify_set_with_top_level_ref) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -240,7 +240,7 @@ TEST(JSONSchema_identify_draft6, reidentify_set_with_top_level_ref_and_allof) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_draft7_test.cc b/test/jsonschema/jsonschema_identify_draft7_test.cc
index 15e04a45a..47d321bcc 100644
--- a/test/jsonschema/jsonschema_identify_draft7_test.cc
+++ b/test/jsonschema/jsonschema_identify_draft7_test.cc
@@ -10,7 +10,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "http://json-schema.org/draft-07/schema#"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -38,7 +38,7 @@ TEST(JSONSchema_identify_draft7, old_one_hop) {
 TEST(JSONSchema_identify_draft7, id_boolean_default_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-07/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -47,7 +47,7 @@ TEST(JSONSchema_identify_draft7, id_boolean_default_dialect) {
 TEST(JSONSchema_identify_draft7, empty_object_default_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-07/schema#")};
   EXPECT_FALSE(id.has_value());
@@ -59,7 +59,7 @@ TEST(JSONSchema_identify_draft7, valid_id) {
     "$schema": "http://json-schema.org/draft-07/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
 }
@@ -70,7 +70,7 @@ TEST(JSONSchema_identify_draft7, old_id) {
     "$schema": "http://json-schema.org/draft-07/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,7 +80,7 @@ TEST(JSONSchema_identify_draft7, default_dialect_precedence) {
     "$schema": "http://json-schema.org/draft-07/schema#"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-04/schema#")};
   EXPECT_TRUE(id.has_value());
@@ -105,7 +105,7 @@ TEST(JSONSchema_identify_draft7, anonymize_with_base_dialect) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -122,7 +122,7 @@ TEST(JSONSchema_identify_draft7, anonymize_with_base_dialect_no_id) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
   sourcemeta::core::anonymize(document, base_dialect.value());
 
@@ -151,7 +151,7 @@ TEST(JSONSchema_identify_draft7, reidentify_replace) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -167,7 +167,7 @@ TEST(JSONSchema_identify_draft7, reidentify_set) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -183,7 +183,7 @@ TEST(JSONSchema_identify_draft7, reidentify_replace_default_dialect) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver,
+                               sourcemeta::core::schema_official_resolver,
                                "http://json-schema.org/draft-07/schema#");
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
@@ -200,7 +200,7 @@ TEST(JSONSchema_identify_draft7, reidentify_replace_base_dialect_shortcut) {
   })JSON");
 
   const auto base_dialect{sourcemeta::core::base_dialect(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(base_dialect.has_value());
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
@@ -221,7 +221,7 @@ TEST(JSONSchema_identify_draft7, reidentify_set_with_top_level_ref) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
@@ -240,7 +240,7 @@ TEST(JSONSchema_identify_draft7, reidentify_set_with_top_level_ref_and_allof) {
   })JSON");
 
   sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                               sourcemeta::core::official_resolver);
+                               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$id": "https://example.com/my-new-id",
diff --git a/test/jsonschema/jsonschema_identify_test.cc b/test/jsonschema/jsonschema_identify_test.cc
index 0d6150fc3..5ef838742 100644
--- a/test/jsonschema/jsonschema_identify_test.cc
+++ b/test/jsonschema/jsonschema_identify_test.cc
@@ -5,14 +5,14 @@
 TEST(JSONSchema_identify, boolean_no_dialect) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
 TEST(JSONSchema_identify, boolean_no_dialect_with_default_id) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict, std::nullopt,
       "https://www.sourcemeta.com/foo")};
   EXPECT_TRUE(id.has_value());
@@ -22,7 +22,7 @@ TEST(JSONSchema_identify, boolean_no_dialect_with_default_id) {
 TEST(JSONSchema_identify, empty_old_no_dollar_sign_id_with_default) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "http://json-schema.org/draft-00/schema#",
       "https://example.com/my-schema")};
@@ -33,7 +33,7 @@ TEST(JSONSchema_identify, empty_old_no_dollar_sign_id_with_default) {
 TEST(JSONSchema_identify, empty_dollar_sign_id_with_default) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       "https://json-schema.org/draft/2020-12/schema",
       "https://example.com/my-schema")};
@@ -44,7 +44,7 @@ TEST(JSONSchema_identify, empty_dollar_sign_id_with_default) {
 TEST(JSONSchema_identify, boolean_unknown_dialect) {
   const sourcemeta::core::JSON document{true};
   EXPECT_THROW(sourcemeta::core::identify(
-                   document, sourcemeta::core::official_resolver,
+                   document, sourcemeta::core::schema_official_resolver,
                    sourcemeta::core::SchemaIdentificationStrategy::Strict,
                    "https://www.sourcemeta.com/invalid-dialect"),
                sourcemeta::core::SchemaResolutionError);
@@ -53,14 +53,14 @@ TEST(JSONSchema_identify, boolean_unknown_dialect) {
 TEST(JSONSchema_identify, empty_object_no_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
 TEST(JSONSchema_identify, empty_object_unknown_dialect) {
   const sourcemeta::core::JSON document = sourcemeta::core::parse_json("{}");
   EXPECT_THROW(sourcemeta::core::identify(
-                   document, sourcemeta::core::official_resolver,
+                   document, sourcemeta::core::schema_official_resolver,
                    sourcemeta::core::SchemaIdentificationStrategy::Strict,
                    "https://www.sourcemeta.com/invalid-dialect"),
                sourcemeta::core::SchemaResolutionError);
@@ -71,7 +71,7 @@ TEST(JSONSchema_identify, object_with_dollar_id_with_no_dialect) {
     "$id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
@@ -80,14 +80,14 @@ TEST(JSONSchema_identify, object_with_id_with_no_dialect) {
     "id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver)};
+      document, sourcemeta::core::schema_official_resolver)};
   EXPECT_FALSE(id.has_value());
 }
 
 TEST(JSONSchema_identify, loose_boolean) {
   const sourcemeta::core::JSON document{true};
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_FALSE(id.has_value());
 }
@@ -97,7 +97,7 @@ TEST(JSONSchema_identify, loose_with_valid_dollar_id) {
     "$id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
@@ -108,7 +108,7 @@ TEST(JSONSchema_identify, loose_with_invalid_dollar_id) {
     "$id": false
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_FALSE(id.has_value());
 }
@@ -118,7 +118,7 @@ TEST(JSONSchema_identify, loose_with_valid_id) {
     "id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
@@ -129,7 +129,7 @@ TEST(JSONSchema_identify, loose_with_invalid_id) {
     "id": false
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_FALSE(id.has_value());
 }
@@ -140,7 +140,7 @@ TEST(JSONSchema_identify, loose_with_valid_dollar_id_and_invalid_id) {
     "id": false
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
@@ -152,7 +152,7 @@ TEST(JSONSchema_identify, loose_with_valid_id_and_invalid_dollar_id) {
     "$id": false
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
@@ -164,7 +164,7 @@ TEST(JSONSchema_identify, loose_with_invalid_id_and_invalid_dollar_id) {
     "id": false
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_FALSE(id.has_value());
 }
@@ -175,7 +175,7 @@ TEST(JSONSchema_identify, loose_with_matching_id_and_dollar_id) {
     "id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
@@ -187,7 +187,7 @@ TEST(JSONSchema_identify, loose_with_non_matching_id_and_dollar_id) {
     "id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_FALSE(id.has_value());
 }
@@ -198,7 +198,7 @@ TEST(JSONSchema_identify, loose_with_resolvable_default_dialect) {
     "id": "https://example.com/my-schema"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(id.has_value());
@@ -211,7 +211,7 @@ TEST(JSONSchema_identify, loose_with_unresolvable_dialect) {
     "$schema": "https://www.sourcemeta.com/invalid-dialect"
   })JSON");
   std::optional<std::string> id{sourcemeta::core::identify(
-      document, sourcemeta::core::official_resolver,
+      document, sourcemeta::core::schema_official_resolver,
       sourcemeta::core::SchemaIdentificationStrategy::Loose)};
   EXPECT_TRUE(id.has_value());
   EXPECT_EQ(id.value(), "https://example.com/my-schema");
@@ -232,6 +232,6 @@ TEST(JSONSchema_identify, reidentify_boolean) {
   sourcemeta::core::JSON document{true};
   EXPECT_THROW(
       sourcemeta::core::reidentify(document, "https://example.com/my-new-id",
-                                   sourcemeta::core::official_resolver),
+                                   sourcemeta::core::schema_official_resolver),
       sourcemeta::core::SchemaError);
 }
diff --git a/test/jsonschema/jsonschema_keyword_iterator_test.cc b/test/jsonschema/jsonschema_keyword_iterator_test.cc
index 3f26e5a58..2459a5391 100644
--- a/test/jsonschema/jsonschema_keyword_iterator_test.cc
+++ b/test/jsonschema/jsonschema_keyword_iterator_test.cc
@@ -29,7 +29,7 @@ TEST(JSONSchema_keyword_iterator, draft_2020_12) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -119,7 +119,7 @@ TEST(JSONSchema_keyword_iterator, draft_2019_09) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -205,7 +205,7 @@ TEST(JSONSchema_keyword_iterator, draft7) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -269,7 +269,7 @@ TEST(JSONSchema_keyword_iterator, draft6) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -324,7 +324,7 @@ TEST(JSONSchema_keyword_iterator, draft4) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -378,7 +378,7 @@ TEST(JSONSchema_keyword_iterator, draft3) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -426,7 +426,7 @@ TEST(JSONSchema_keyword_iterator, draft2) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -464,7 +464,7 @@ TEST(JSONSchema_keyword_iterator, draft1) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -502,7 +502,7 @@ TEST(JSONSchema_keyword_iterator, draft0) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -538,7 +538,7 @@ TEST(JSONSchema_keyword_iterator, unknown_keyword) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
   }
 
@@ -573,7 +573,7 @@ TEST(JSONSchema_keyword_iterator, with_default_dialect) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver,
+           sourcemeta::core::schema_official_resolver,
            "https://json-schema.org/draft/2020-12/schema")) {
     entries.push_back(entry);
 
@@ -608,7 +608,7 @@ TEST(JSONSchema_keyword_iterator, no_default_dialect) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
 
     // The same for all entries
@@ -637,7 +637,7 @@ TEST(JSONSchema_keyword_iterator, boolean_true) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
   }
 
@@ -650,7 +650,7 @@ TEST(JSONSchema_keyword_iterator, boolean_false) {
   std::vector<sourcemeta::core::SchemaIteratorEntry> entries;
   for (const auto &entry : sourcemeta::core::SchemaKeywordIterator(
            document, sourcemeta::core::schema_official_walker,
-           sourcemeta::core::official_resolver)) {
+           sourcemeta::core::schema_official_resolver)) {
     entries.push_back(entry);
   }
 
diff --git a/test/jsonschema/jsonschema_map_resolver_test.cc b/test/jsonschema/jsonschema_map_resolver_test.cc
index f62045ded..d9097e6d2 100644
--- a/test/jsonschema/jsonschema_map_resolver_test.cc
+++ b/test/jsonschema/jsonschema_map_resolver_test.cc
@@ -10,11 +10,11 @@ TEST(JSONSchema_SchemaMapResolver, empty_no_fallback) {
 
 TEST(JSONSchema_SchemaMapResolver, empty_with_fallback) {
   sourcemeta::core::SchemaMapResolver resolver{
-      sourcemeta::core::official_resolver};
+      sourcemeta::core::schema_official_resolver};
   EXPECT_TRUE(
       resolver("https://json-schema.org/draft/2020-12/schema").has_value());
   EXPECT_EQ(resolver("https://json-schema.org/draft/2020-12/schema"),
-            sourcemeta::core::official_resolver(
+            sourcemeta::core::schema_official_resolver(
                 "https://json-schema.org/draft/2020-12/schema"));
 }
 
diff --git a/test/jsonschema/jsonschema_metaschema_test.cc b/test/jsonschema/jsonschema_metaschema_test.cc
index da8828abc..a3a122e62 100644
--- a/test/jsonschema/jsonschema_metaschema_test.cc
+++ b/test/jsonschema/jsonschema_metaschema_test.cc
@@ -10,12 +10,12 @@ TEST(JSONSchema_metaschema, example_2020_12) {
   })JSON")};
 
   const auto metaschema{sourcemeta::core::metaschema(
-      schema, sourcemeta::core::official_resolver)};
+      schema, sourcemeta::core::schema_official_resolver)};
   EXPECT_TRUE(metaschema.is_object());
-  EXPECT_TRUE(sourcemeta::core::official_resolver(
+  EXPECT_TRUE(sourcemeta::core::schema_official_resolver(
                   "https://json-schema.org/draft/2020-12/schema")
                   .has_value());
-  EXPECT_EQ(metaschema, sourcemeta::core::official_resolver(
+  EXPECT_EQ(metaschema, sourcemeta::core::schema_official_resolver(
                             "https://json-schema.org/draft/2020-12/schema")
                             .value());
 }
@@ -26,13 +26,13 @@ TEST(JSONSchema_metaschema, with_default_dialect) {
   })JSON")};
 
   const auto metaschema{sourcemeta::core::metaschema(
-      schema, sourcemeta::core::official_resolver,
+      schema, sourcemeta::core::schema_official_resolver,
       "https://json-schema.org/draft/2020-12/schema")};
   EXPECT_TRUE(metaschema.is_object());
-  EXPECT_TRUE(sourcemeta::core::official_resolver(
+  EXPECT_TRUE(sourcemeta::core::schema_official_resolver(
                   "https://json-schema.org/draft/2020-12/schema")
                   .has_value());
-  EXPECT_EQ(metaschema, sourcemeta::core::official_resolver(
+  EXPECT_EQ(metaschema, sourcemeta::core::schema_official_resolver(
                             "https://json-schema.org/draft/2020-12/schema")
                             .value());
 }
@@ -42,9 +42,9 @@ TEST(JSONSchema_metaschema, no_dialect) {
     "type": "string"
   })JSON")};
 
-  EXPECT_THROW(
-      sourcemeta::core::metaschema(schema, sourcemeta::core::official_resolver),
-      sourcemeta::core::SchemaError);
+  EXPECT_THROW(sourcemeta::core::metaschema(
+                   schema, sourcemeta::core::schema_official_resolver),
+               sourcemeta::core::SchemaError);
 }
 
 TEST(JSONSchema_metaschema, unknown_dialect) {
@@ -53,7 +53,7 @@ TEST(JSONSchema_metaschema, unknown_dialect) {
     "type": "string"
   })JSON")};
 
-  EXPECT_THROW(
-      sourcemeta::core::metaschema(schema, sourcemeta::core::official_resolver),
-      sourcemeta::core::SchemaResolutionError);
+  EXPECT_THROW(sourcemeta::core::metaschema(
+                   schema, sourcemeta::core::schema_official_resolver),
+               sourcemeta::core::SchemaResolutionError);
 }
diff --git a/test/jsonschema/jsonschema_official_resolver_test.cc b/test/jsonschema/jsonschema_official_resolver_test.cc
index eafa562c8..d26c21190 100644
--- a/test/jsonschema/jsonschema_official_resolver_test.cc
+++ b/test/jsonschema/jsonschema_official_resolver_test.cc
@@ -6,12 +6,12 @@
 #define EXPECT_SCHEMA(identifier)                                              \
   {                                                                            \
     const std::optional<sourcemeta::core::JSON> result{                        \
-        sourcemeta::core::official_resolver(identifier)};                      \
+        sourcemeta::core::schema_official_resolver(identifier)};               \
     EXPECT_TRUE(result.has_value());                                           \
     const sourcemeta::core::JSON &document{result.value()};                    \
     EXPECT_TRUE(sourcemeta::core::is_schema(document));                        \
     std::optional<std::string> id{sourcemeta::core::identify(                  \
-        document, sourcemeta::core::official_resolver)};                       \
+        document, sourcemeta::core::schema_official_resolver)};                \
     EXPECT_TRUE(id.has_value());                                               \
     EXPECT_EQ(sourcemeta::core::URI{id.value()}.canonicalize().recompose(),    \
               sourcemeta::core::URI{identifier}.canonicalize().recompose());   \
@@ -140,6 +140,6 @@ TEST(JSONSchema_official_resolver, idempotency) {
 
 TEST(JSONSchema_official_resolver, invalid) {
   const std::optional<sourcemeta::core::JSON> result{
-      sourcemeta::core::official_resolver("https://example.com/foobar")};
+      sourcemeta::core::schema_official_resolver("https://example.com/foobar")};
   EXPECT_FALSE(result.has_value());
 }
diff --git a/test/jsonschema/jsonschema_relativize_test.cc b/test/jsonschema/jsonschema_relativize_test.cc
index 8e5752fc3..7c6239859 100644
--- a/test/jsonschema/jsonschema_relativize_test.cc
+++ b/test/jsonschema/jsonschema_relativize_test.cc
@@ -24,7 +24,7 @@ TEST(JSONSchema_relativize, draft4_1) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -61,7 +61,7 @@ TEST(JSONSchema_relativize, draft4_2) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -101,7 +101,7 @@ TEST(JSONSchema_relativize, draft4_3) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -140,7 +140,7 @@ TEST(JSONSchema_relativize, draft4_4) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -178,7 +178,7 @@ TEST(JSONSchema_relativize, draft4_5) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -216,7 +216,7 @@ TEST(JSONSchema_relativize, draft4_6) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize, std::nullopt,
       "http://asyncapi.com/definitions");
 
@@ -244,7 +244,7 @@ TEST(JSONSchema_relativize, draft4_7) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize,
       "http://json-schema.org/draft-04/schema");
 
@@ -272,7 +272,7 @@ TEST(JSONSchema_relativize, draft4_8) {
 
   EXPECT_THROW(sourcemeta::core::reference_visit(
                    schema, sourcemeta::core::schema_official_walker,
-                   sourcemeta::core::official_resolver,
+                   sourcemeta::core::schema_official_resolver,
                    sourcemeta::core::reference_visitor_relativize),
                sourcemeta::core::SchemaError);
 }
@@ -290,7 +290,7 @@ TEST(JSONSchema_relativize, 2020_12_1) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -315,7 +315,7 @@ TEST(JSONSchema_relativize, 2020_12_2) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -339,7 +339,7 @@ TEST(JSONSchema_relativize, recursive_ref) {
 
   sourcemeta::core::reference_visit(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::core::reference_visitor_relativize);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
diff --git a/test/jsonschema/jsonschema_transformer_test.cc b/test/jsonschema/jsonschema_transformer_test.cc
index f448a2617..5c00dc0e9 100644
--- a/test/jsonschema/jsonschema_transformer_test.cc
+++ b/test/jsonschema/jsonschema_transformer_test.cc
@@ -22,7 +22,7 @@ TEST(JSONSchema_transformer, flat_document_no_applicators) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -44,7 +44,7 @@ TEST(JSONSchema_transformer, throw_if_no_dialect_invalid_default) {
   })JSON");
 
   EXPECT_THROW(bundle.apply(document, sourcemeta::core::schema_official_walker,
-                            sourcemeta::core::official_resolver,
+                            sourcemeta::core::schema_official_resolver,
                             sourcemeta::core::empty_pointer,
                             "https://example.com/invalid"),
                sourcemeta::core::SchemaResolutionError);
@@ -71,7 +71,7 @@ TEST(JSONSchema_transformer, with_default_dialect) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver,
+               sourcemeta::core::schema_official_resolver,
                sourcemeta::core::empty_pointer,
                "https://json-schema.org/draft/2020-12/schema");
 
@@ -95,7 +95,7 @@ TEST(JSONSchema_transformer, with_explicit_default_dialect_same) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver,
+               sourcemeta::core::schema_official_resolver,
                sourcemeta::core::empty_pointer,
                "https://json-schema.org/draft/2020-12/schema");
 
@@ -118,7 +118,7 @@ TEST(JSONSchema_transformer, throw_on_rules_called_twice) {
   })JSON");
 
   EXPECT_THROW(bundle.apply(document, sourcemeta::core::schema_official_walker,
-                            sourcemeta::core::official_resolver),
+                            sourcemeta::core::schema_official_resolver),
                std::runtime_error);
 }
 
@@ -134,7 +134,7 @@ TEST(JSONSchema_transformer, top_level_rule) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -164,7 +164,7 @@ TEST(JSONSchema_transformer, walker_2020_12) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -204,7 +204,7 @@ TEST(JSONSchema_transformer, mismatch_default_dialect) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver,
+               sourcemeta::core::schema_official_resolver,
                sourcemeta::core::empty_pointer,
                "http://json-schema.org/draft-04/schema#");
 
@@ -246,7 +246,8 @@ TEST(JSONSchema_transformer, specific_subschema) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver, {"properties", "bar"});
+               sourcemeta::core::schema_official_resolver,
+               {"properties", "bar"});
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -281,7 +282,7 @@ TEST(JSONSchema_transformer, rule_pointers) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -313,7 +314,7 @@ TEST(JSONSchema_transformer, multi_dialect_rules) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2019-09/schema",
@@ -351,7 +352,7 @@ TEST(JSONSchema_transformer, dialect_specific_rules) {
   })JSON");
 
   bundle.apply(document, sourcemeta::core::schema_official_walker,
-               sourcemeta::core::official_resolver);
+               sourcemeta::core::schema_official_resolver);
 
   const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2019-09/schema",
@@ -384,7 +385,7 @@ TEST(JSONSchema_transformer, check_top_level) {
       entries;
   const bool result = bundle.check(
       document, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       [&entries](const auto &pointer, const auto &name, const auto &message) {
         entries.emplace_back(pointer, name, message);
       });
@@ -421,7 +422,7 @@ TEST(JSONSchema_transformer, check_subschema) {
       entries;
   const bool result = bundle.check(
       document, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       [&entries](const auto &pointer, const auto &name, const auto &message) {
         entries.emplace_back(pointer, name, message);
       },
@@ -454,7 +455,7 @@ TEST(JSONSchema_transformer, check_no_match) {
       entries;
   const bool result = bundle.check(
       document, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       [&entries](const auto &pointer, const auto &name, const auto &message) {
         entries.emplace_back(pointer, name, message);
       });
@@ -474,7 +475,7 @@ TEST(JSONSchema_transformer, check_empty) {
       entries;
   const bool result = bundle.check(
       document, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       [&entries](const auto &pointer, const auto &name, const auto &message) {
         entries.emplace_back(pointer, name, message);
       });
@@ -495,7 +496,7 @@ TEST(JSONSchema_transformer, check_throw_if_no_dialect_invalid_default) {
   })JSON");
 
   EXPECT_THROW(bundle.check(document, sourcemeta::core::schema_official_walker,
-                            sourcemeta::core::official_resolver, nullptr,
+                            sourcemeta::core::schema_official_resolver, nullptr,
                             sourcemeta::core::empty_pointer,
                             "https://example.com/invalid"),
                sourcemeta::core::SchemaResolutionError);
@@ -519,7 +520,7 @@ TEST(JSONSchema_transformer, check_with_default_dialect) {
       entries;
   const bool result = bundle.check(
       document, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       [&entries](const auto &pointer, const auto &name, const auto &message) {
         entries.emplace_back(pointer, name, message);
       },
diff --git a/test/jsonschema/jsonschema_unevaluated_2019_09_test.cc b/test/jsonschema/jsonschema_unevaluated_2019_09_test.cc
index a95158e0f..9e0c3ada4 100644
--- a/test/jsonschema/jsonschema_unevaluated_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_unevaluated_2019_09_test.cc
@@ -17,10 +17,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedProperties_1) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -49,10 +49,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedProperties_2) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -97,10 +97,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedProperties_3) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -136,10 +136,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedProperties_4) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -167,10 +167,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedItems_1) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -202,10 +202,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedItems_2) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -227,10 +227,10 @@ TEST(JSONSchema_unevaluated_2019_09, unevaluatedItems_3) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
diff --git a/test/jsonschema/jsonschema_unevaluated_2020_12_test.cc b/test/jsonschema/jsonschema_unevaluated_2020_12_test.cc
index 8baeaba11..94d9ca464 100644
--- a/test/jsonschema/jsonschema_unevaluated_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_unevaluated_2020_12_test.cc
@@ -17,10 +17,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_1) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -49,10 +49,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_2) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -84,10 +84,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_3) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -122,10 +122,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_4) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -154,10 +154,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_5) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 2);
 
@@ -182,10 +182,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_6) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 2);
 
@@ -221,10 +221,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_7) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -262,10 +262,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedProperties_8) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -288,10 +288,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedItems_1) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 1);
 
@@ -316,10 +316,10 @@ TEST(JSONSchema_unevaluated_2020_12, unevaluatedItems_2) {
 
   sourcemeta::core::SchemaFrame frame;
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                sourcemeta::core::official_resolver);
+                sourcemeta::core::schema_official_resolver);
   const auto result{sourcemeta::core::unevaluated(
       schema, frame, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver)};
+      sourcemeta::core::schema_official_resolver)};
 
   EXPECT_EQ(result.size(), 2);
 
diff --git a/test/jsonschema/jsonschema_unidentify_test.cc b/test/jsonschema/jsonschema_unidentify_test.cc
index c2452528e..3e96ad09f 100644
--- a/test/jsonschema/jsonschema_unidentify_test.cc
+++ b/test/jsonschema/jsonschema_unidentify_test.cc
@@ -43,7 +43,7 @@ static auto test_resolver_2020_12(std::string_view identifier)
       "$vocabulary": { "https://json-schema.org/draft/2020-12/vocab/core": true }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -87,7 +87,7 @@ static auto test_resolver_2019_09(std::string_view identifier)
       "$vocabulary": { "https://json-schema.org/draft/2019-09/vocab/core": true }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -112,7 +112,7 @@ static auto test_resolver_draft7(std::string_view identifier)
       "$id": "https://example.com/meta/2.json"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -137,7 +137,7 @@ static auto test_resolver_draft6(std::string_view identifier)
       "$id": "https://example.com/meta/2.json"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
@@ -162,7 +162,7 @@ static auto test_resolver_draft4(std::string_view identifier)
       "id": "https://example.com/meta/2.json"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_2019_09_test.cc b/test/jsonschema/jsonschema_vocabulary_2019_09_test.cc
index c32e98e55..d65662800 100644
--- a/test/jsonschema/jsonschema_vocabulary_2019_09_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_2019_09_test.cc
@@ -28,7 +28,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "https://json-schema.org/draft/2019-09/hyper-schema"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc b/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc
index 2c95255ad..db3651aa9 100644
--- a/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc
@@ -46,7 +46,7 @@ static auto test_resolver(std::string_view identifier)
       "$schema": "https://json-schema.org/draft/2020-12/hyper-schema"
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft0_test.cc b/test/jsonschema/jsonschema_vocabulary_draft0_test.cc
index f534ca461..3268a1c35 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft0_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft0_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft1_test.cc b/test/jsonschema/jsonschema_vocabulary_draft1_test.cc
index d8e6bd3e3..81578a2f7 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft1_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft1_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft2_test.cc b/test/jsonschema/jsonschema_vocabulary_draft2_test.cc
index 8c61526e9..1f06d9d9e 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft2_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft2_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft3_test.cc b/test/jsonschema/jsonschema_vocabulary_draft3_test.cc
index 404553bfa..a723820eb 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft3_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft3_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft4_test.cc b/test/jsonschema/jsonschema_vocabulary_draft4_test.cc
index a260c7f58..e5b520907 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft4_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft4_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft6_test.cc b/test/jsonschema/jsonschema_vocabulary_draft6_test.cc
index a27a20b9c..da2762c3c 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft6_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft6_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_draft7_test.cc b/test/jsonschema/jsonschema_vocabulary_draft7_test.cc
index a023a25a5..1c0a9aaec 100644
--- a/test/jsonschema/jsonschema_vocabulary_draft7_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_draft7_test.cc
@@ -22,7 +22,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/jsonschema_vocabulary_test.cc b/test/jsonschema/jsonschema_vocabulary_test.cc
index b2729d654..2c4458072 100644
--- a/test/jsonschema/jsonschema_vocabulary_test.cc
+++ b/test/jsonschema/jsonschema_vocabulary_test.cc
@@ -5,7 +5,7 @@
 TEST(JSONSchema_vocabulary, core_vocabularies_boolean_without_default) {
   const sourcemeta::core::JSON document{true};
   EXPECT_THROW(sourcemeta::core::vocabularies(
-                   document, sourcemeta::core::official_resolver),
+                   document, sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaError);
 }
 
@@ -14,6 +14,6 @@ TEST(JSONSchema_vocabulary, unresolvable_dialect) {
     "$schema": "https://non-existent.com/dialect"
   })JSON");
   EXPECT_THROW(sourcemeta::core::vocabularies(
-                   document, sourcemeta::core::official_resolver),
+                   document, sourcemeta::core::schema_official_resolver),
                sourcemeta::core::SchemaResolutionError);
 }
diff --git a/test/jsonschema/jsonschema_walker_test.cc b/test/jsonschema/jsonschema_walker_test.cc
index 1da099b7b..34dae1951 100644
--- a/test/jsonschema/jsonschema_walker_test.cc
+++ b/test/jsonschema/jsonschema_walker_test.cc
@@ -27,7 +27,7 @@ static auto test_resolver(std::string_view identifier)
       }
     })JSON");
   } else {
-    return sourcemeta::core::official_resolver(identifier);
+    return sourcemeta::core::schema_official_resolver(identifier);
   }
 }
 
diff --git a/test/jsonschema/referencingsuite.cc b/test/jsonschema/referencingsuite.cc
index 427bb4466..3f0f39039 100644
--- a/test/jsonschema/referencingsuite.cc
+++ b/test/jsonschema/referencingsuite.cc
@@ -51,7 +51,8 @@ class ReferencingTest : public testing::Test {
     for (const auto &[uri, schema] : this->registry) {
       sourcemeta::core::SchemaFrame frame;
       frame.analyse(schema.first, sourcemeta::core::schema_official_walker,
-                    sourcemeta::core::official_resolver, this->dialect, uri);
+                    sourcemeta::core::schema_official_resolver, this->dialect,
+                    uri);
       for (const auto &[key, entry] : frame.locations()) {
         new_entries.insert(
             {key.second,