diff --git a/benchmarks/b001-manifest.jsonld b/benchmarks/b001-manifest.jsonld
index 4db9a136b..d7cda7be3 100644
--- a/benchmarks/b001-manifest.jsonld
+++ b/benchmarks/b001-manifest.jsonld
@@ -1,10 +1,10 @@
 {
   "@context": "context.jsonld",
-  "@id": "",
+  "@id": "#b001",
   "@type": "mf:Manifest",
   "name": "Benchmark 001",
   "description": "JSON-LD benchmark empty data",
-  "baseIri": "https://w3c.github.io/json-ld-api/tests/",
+  "baseIri": "https://json-ld.org/benchmarks/",
   "sequence": [
     {
       "@id": "#tb001-c001",
diff --git a/benchmarks/b002-manifest.jsonld b/benchmarks/b002-manifest.jsonld
index bbc6f898c..d2536ec8c 100644
--- a/benchmarks/b002-manifest.jsonld
+++ b/benchmarks/b002-manifest.jsonld
@@ -1,19 +1,19 @@
 {
   "@context": "context.jsonld",
-  "@id": "",
+  "@id": "#b002",
   "@type": "mf:Manifest",
   "name": "Benchmark 002",
   "description": "JSON-LD basic benchmark.",
-  "baseIri": "https://w3c.github.io/json-ld-api/tests/",
+  "baseIri": "https://json-ld.org/benchmarks/",
   "sequence": [
     {
-      "@id": "#t0001",
+      "@id": "#tb002-tc0002",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "basic",
       "purpose": "Basic term and value compaction",
-      "input": "../compact/0002-in.jsonld",
-      "context": "../compact/0002-context.jsonld",
-      "expect": "../compact/0002-out.jsonld"
+      "input": "../../json-ld-api/tests/compact/0002-in.jsonld",
+      "context": "../../json-ld-api/tests/compact/0002-context.jsonld",
+      "expect": "../../json-ld-api/tests/compact/0002-out.jsonld"
     }
   ]
 }
diff --git a/benchmarks/b003-001-out.nq b/benchmarks/b003-001-out.nq
index fbbaf1741..a3359c2aa 100644
--- a/benchmarks/b003-001-out.nq
+++ b/benchmarks/b003-001-out.nq
@@ -1,12 +1,12 @@
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://purl.org/dc/terms/creator> <urn:uuid:e88b053b-cb96-4a7b-bbd8-e4e28f6de3a5> _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://schema.org/name> "Big Band Concert in New York City" _:c14n1 .
-<https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3c.github.io/json-ld-api/tests/Concert> _:c14n1 .
+<https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://json-ld.org/benchmarks/Concert> _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <urn:test:location> "https://example.org/the-venue" _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <urn:test:offers> _:c14n2 _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <urn:test:startDate> "2017-07-14T21:30"^^<http://www.w3.org/2001/XMLSchema#dateTime> _:c14n1 .
 _:c14n0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3id.org/webledger#CreateWebLedgerRecord> .
 _:c14n0 <https://w3id.org/webledger#record> _:c14n1 .
-_:c14n2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3c.github.io/json-ld-api/tests/Offer> _:c14n1 .
+_:c14n2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://json-ld.org/benchmarks/Offer> _:c14n1 .
 _:c14n2 <urn:test:price> "13.00" _:c14n1 .
 _:c14n2 <urn:test:priceCurrency> "USD" _:c14n1 .
 _:c14n2 <urn:test:url> <https://www.ticketfly.com/purchase/309433> _:c14n1 .
diff --git a/benchmarks/b003-002-out.nq b/benchmarks/b003-002-out.nq
index fbbaf1741..a3359c2aa 100644
--- a/benchmarks/b003-002-out.nq
+++ b/benchmarks/b003-002-out.nq
@@ -1,12 +1,12 @@
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://purl.org/dc/terms/creator> <urn:uuid:e88b053b-cb96-4a7b-bbd8-e4e28f6de3a5> _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://schema.org/name> "Big Band Concert in New York City" _:c14n1 .
-<https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3c.github.io/json-ld-api/tests/Concert> _:c14n1 .
+<https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://json-ld.org/benchmarks/Concert> _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <urn:test:location> "https://example.org/the-venue" _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <urn:test:offers> _:c14n2 _:c14n1 .
 <https://example.com/event/23ea7582-a817-4a12-82f3-70f4ec68b667> <urn:test:startDate> "2017-07-14T21:30"^^<http://www.w3.org/2001/XMLSchema#dateTime> _:c14n1 .
 _:c14n0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3id.org/webledger#CreateWebLedgerRecord> .
 _:c14n0 <https://w3id.org/webledger#record> _:c14n1 .
-_:c14n2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3c.github.io/json-ld-api/tests/Offer> _:c14n1 .
+_:c14n2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://json-ld.org/benchmarks/Offer> _:c14n1 .
 _:c14n2 <urn:test:price> "13.00" _:c14n1 .
 _:c14n2 <urn:test:priceCurrency> "USD" _:c14n1 .
 _:c14n2 <urn:test:url> <https://www.ticketfly.com/purchase/309433> _:c14n1 .
diff --git a/benchmarks/b003-manifest.jsonld b/benchmarks/b003-manifest.jsonld
index c959ff7b5..a2f9b04fb 100644
--- a/benchmarks/b003-manifest.jsonld
+++ b/benchmarks/b003-manifest.jsonld
@@ -1,10 +1,10 @@
 {
   "@context": "context.jsonld",
-  "@id": "",
+  "@id": "#b003",
   "@type": "mf:Manifest",
   "name": "Benchmark 003",
   "description": "JSON-LD webledger benchmark",
-  "baseIri": "https://w3c.github.io/json-ld-api/tests/",
+  "baseIri": "https://json-ld.org/benchmarks/",
   "option": {
     "loader": {
       "rewrite": {
@@ -17,16 +17,16 @@
     {
       "@id": "#b003-t001",
       "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-      "name": "basic webledger normalize (int context)",
-      "purpose": "Basic webledger normalization (int context)",
+      "name": "basic webledger normalize (internal context)",
+      "purpose": "Basic webledger normalization (internal context)",
       "input": "b003-001-in.jsonld",
       "expect": "b003-001-out.nq"
     },
     {
       "@id": "#b003-t002",
       "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-      "name": "basic webledger normalize (ext context)",
-      "purpose": "Basic webledger normalization (ext context)",
+      "name": "basic webledger normalize (external context)",
+      "purpose": "Basic webledger normalization (external context)",
       "input": "b003-002-in.jsonld",
       "expect": "b003-002-out.nq"
     }
diff --git a/benchmarks/context.jsonld b/benchmarks/context.jsonld
index d4e236bd1..c1871428e 100644
--- a/benchmarks/context.jsonld
+++ b/benchmarks/context.jsonld
@@ -1,7 +1,7 @@
 {
   "@context": {
     "@vocab":   "https://json-ld.org/benchmarks/vocab#",
-    "dcterms":       "http://purl.org/dc/terms/",
+    "dcterms":  "http://purl.org/dc/terms/",
     "jld":      "https://json-ld.org/benchmarks/vocab#",
     "mf":       "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#",
     "rdfs":     "http://www.w3.org/2000/01/rdf-schema#",
diff --git a/benchmarks/manifest.jsonld b/benchmarks/manifest.jsonld
index 82b943955..2ffc47102 100644
--- a/benchmarks/manifest.jsonld
+++ b/benchmarks/manifest.jsonld
@@ -1,6 +1,6 @@
 {
-  "@context": "../context.jsonld",
-  "@id": "",
+  "@context": "context.jsonld",
+  "@id": "#benchmarks",
   "@type": "mf:Manifest",
   "name": "JSON-LD Benchmarks",
   "description": "This manifest loads additional manifests for specific benchmarks",