diff --git a/app/admin-units.ttl b/app/admin-units.ttl
index c0d2a5f..e4adca4 100644
--- a/app/admin-units.ttl
+++ b/app/admin-units.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/constituencies.ttl b/app/constituencies.ttl
index 5fd94a7..c43fd3c 100644
--- a/app/constituencies.ttl
+++ b/app/constituencies.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/legal-entities.ttl b/app/legal-entities.ttl
index ffddf40..e085f3d 100644
--- a/app/legal-entities.ttl
+++ b/app/legal-entities.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/ns.ttl b/app/ns.ttl
index 8149085..3167e0b 100644
--- a/app/ns.ttl
+++ b/app/ns.ttl
@@ -53,7 +53,7 @@
 @prefix geo:    <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix rov:    <http://www.w3.org/ns/regorg#> .
 @prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix dh:     <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:     <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 
 : a owl:Ontology ;
     rdfs:label "LTLOD namespace" .
diff --git a/app/organizations.ttl b/app/organizations.ttl
index 13eb71b..d806fe4 100644
--- a/app/organizations.ttl
+++ b/app/organizations.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/organizations/lietuvos-respublikos-seimas.ttl b/app/organizations/lietuvos-respublikos-seimas.ttl
index 0c594a7..d5387b3 100644
--- a/app/organizations/lietuvos-respublikos-seimas.ttl
+++ b/app/organizations/lietuvos-respublikos-seimas.ttl
@@ -1,5 +1,5 @@
 @prefix cv:   <http://data.europa.eu/m8g/> .
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/organizations/lietuvos-respublikos-seimas/groups.ttl b/app/organizations/lietuvos-respublikos-seimas/groups.ttl
index 2cba6b6..9feeef7 100644
--- a/app/organizations/lietuvos-respublikos-seimas/groups.ttl
+++ b/app/organizations/lietuvos-respublikos-seimas/groups.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/organizations/lietuvos-respublikos-seimas/org-units.ttl b/app/organizations/lietuvos-respublikos-seimas/org-units.ttl
index 3ecbfb3..7e5c8f6 100644
--- a/app/organizations/lietuvos-respublikos-seimas/org-units.ttl
+++ b/app/organizations/lietuvos-respublikos-seimas/org-units.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/parties.ttl b/app/parties.ttl
index be313db..067b44e 100644
--- a/app/parties.ttl
+++ b/app/parties.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/persons.ttl b/app/persons.ttl
index 0c3e8e9..74070b5 100644
--- a/app/persons.ttl
+++ b/app/persons.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix ac:   <https://w3id.org/atomgraph/client#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
diff --git a/app/streets.ttl b/app/streets.ttl
index 5427b97..a751f2c 100644
--- a/app/streets.ttl
+++ b/app/streets.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies.ttl b/app/taxonomies.ttl
index 3729b18..73fa981 100644
--- a/app/taxonomies.ttl
+++ b/app/taxonomies.ttl
@@ -1,4 +1,4 @@
-@prefix dh:  <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh: <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct: <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/admin-unit-levels.ttl b/app/taxonomies/admin-unit-levels.ttl
index 445eb9d..731a655 100644
--- a/app/taxonomies/admin-unit-levels.ttl
+++ b/app/taxonomies/admin-unit-levels.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/legal-forms.ttl b/app/taxonomies/legal-forms.ttl
index 276bf86..35a683d 100644
--- a/app/taxonomies/legal-forms.ttl
+++ b/app/taxonomies/legal-forms.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/legal-statuses.ttl b/app/taxonomies/legal-statuses.ttl
index 53421bb..103b810 100644
--- a/app/taxonomies/legal-statuses.ttl
+++ b/app/taxonomies/legal-statuses.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/org-unit-types.ttl b/app/taxonomies/org-unit-types.ttl
index 2eb2584..230f0ee 100644
--- a/app/taxonomies/org-unit-types.ttl
+++ b/app/taxonomies/org-unit-types.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/position-types.ttl b/app/taxonomies/position-types.ttl
index e43ee0e..830a68e 100644
--- a/app/taxonomies/position-types.ttl
+++ b/app/taxonomies/position-types.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/settlement-types.ttl b/app/taxonomies/settlement-types.ttl
index 617efc0..dbf96b4 100644
--- a/app/taxonomies/settlement-types.ttl
+++ b/app/taxonomies/settlement-types.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/app/taxonomies/street-types.ttl b/app/taxonomies/street-types.ttl
index bae5737..ba1188a 100644
--- a/app/taxonomies/street-types.ttl
+++ b/app/taxonomies/street-types.ttl
@@ -1,4 +1,4 @@
-@prefix dh:   <https://www.w3.org/ns/ldt/document-hierarchy#> .
+@prefix dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#> .
 @prefix ldh:  <https://w3id.org/atomgraph/linkeddatahub#> .
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix dct:  <http://purl.org/dc/terms/> .
diff --git a/bin/make-public.sh b/bin/make-public.sh
index 38605fd..c6487f9 100755
--- a/bin/make-public.sh
+++ b/bin/make-public.sh
@@ -38,7 +38,7 @@ docker compose exec -T linkeddatahub curl -s -f -X POST \
     http://varnish-admin/ds/ <<EOF
 PREFIX  acl: <http://www.w3.org/ns/auth/acl#>
 PREFIX  def: <https://w3id.org/atomgraph/linkeddatahub/default#>
-PREFIX  dh:  <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX  dh:  <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX  nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>
 PREFIX  foaf: <http://xmlns.com/foaf/0.1/>
 
diff --git a/config/dataspaces.trig b/config/dataspaces.trig
index 44f22ac..bc02d7b 100644
--- a/config/dataspaces.trig
+++ b/config/dataspaces.trig
@@ -1,6 +1,5 @@
-@prefix lapp:	<https://w3id.org/atomgraph/linkeddatahub/apps#> .
+@prefix lds:	<https://w3id.org/atomgraph/linkeddatahub/dataspaces#> .
 @prefix ac:	    <https://w3id.org/atomgraph/client#> .
-@prefix ldt:	<https://www.w3.org/ns/ldt#> .
 @prefix dct:	<http://purl.org/dc/terms/> .
 
 ### do not use blank nodes to identify resources! ###
@@ -10,10 +9,10 @@
 
 <urn:linkeddatahub:apps/admin>
 {
-    <urn:linkeddatahub:apps/admin> a lapp:Application ;
+    <urn:linkeddatahub:apps/admin> a lds:Dataspace ;
         dct:title "LTLOD admin" ;
-        lapp:origin <https://admin.localhost:4443> ;
-        ldt:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
+        lds:origin <https://admin.localhost:4443> ;
+        lds:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
         ac:stylesheet <static/xsl/admin/layout.xsl> .
 
 }
@@ -22,11 +21,11 @@
 
 <urn:linkeddatahub:apps/end-user>
 {
-    <urn:linkeddatahub:apps/end-user> a lapp:Application ;
+    <urn:linkeddatahub:apps/end-user> a lds:Dataspace ;
         dct:title "LTLOD" ;
-        lapp:origin <https://localhost:4443> ;
-        ldt:ontology <https://localhost:4443/ns#> ;
+        lds:origin <https://localhost:4443> ;
+        lds:ontology <https://localhost:4443/ns#> ;
         ac:stylesheet <static/xsl/layout.xsl> ;
-        lapp:public true .
+        lds:public true .
 
 }
diff --git a/config/system.trig b/config/system.trig
index addce63..e0db930 100644
--- a/config/system.trig
+++ b/config/system.trig
@@ -1,6 +1,5 @@
-@prefix lapp:	<https://w3id.org/atomgraph/linkeddatahub/apps#> .
+@prefix lds:	<https://w3id.org/atomgraph/linkeddatahub/dataspaces#> .
 @prefix a:	    <https://w3id.org/atomgraph/core#> .
-@prefix ldt:	<https://www.w3.org/ns/ldt#> .
 @prefix sd:	    <http://www.w3.org/ns/sparql-service-description#> .
 @prefix dct:	<http://purl.org/dc/terms/> .
 
@@ -11,8 +10,8 @@
 
 <urn:linkeddatahub:apps/admin>
 {
-    <urn:linkeddatahub:apps/admin> a lapp:AdminApplication ;
-        ldt:service <urn:linkeddatahub:services/admin> .
+    <urn:linkeddatahub:apps/admin> a lds:AdminDataspace ;
+        lds:service <urn:linkeddatahub:services/admin> .
 
 }
 
@@ -33,8 +32,8 @@
 
 <urn:linkeddatahub:apps/end-user>
 {
-    <urn:linkeddatahub:apps/end-user> a lapp:EndUserApplication ;
-        ldt:service <urn:linkeddatahub:services/end-user> .
+    <urn:linkeddatahub:apps/end-user> a lds:EndUserDataspace ;
+        lds:service <urn:linkeddatahub:services/end-user> .
 
 }
 
diff --git a/datasets/current/admin-units/counties.trig b/datasets/current/admin-units/counties.trig
index 951f5a7..721f69a 100644
--- a/datasets/current/admin-units/counties.trig
+++ b/datasets/current/admin-units/counties.trig
@@ -1,7 +1,7 @@
 PREFIX atu-type: <http://publications.europa.eu/resource/authority/atu-type/>
 PREFIX cv: <http://data.europa.eu/m8g/>
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX schema: <https://schema.org/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
diff --git a/datasets/current/admin-units/elderships.trig b/datasets/current/admin-units/elderships.trig
index 6fb836f..c8c330b 100644
--- a/datasets/current/admin-units/elderships.trig
+++ b/datasets/current/admin-units/elderships.trig
@@ -1,7 +1,7 @@
 PREFIX atu-type: <http://publications.europa.eu/resource/authority/atu-type/>
 PREFIX cv: <http://data.europa.eu/m8g/>
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX schema: <https://schema.org/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
diff --git a/datasets/current/admin-units/municipalities.trig b/datasets/current/admin-units/municipalities.trig
index bc0a43c..d454b97 100644
--- a/datasets/current/admin-units/municipalities.trig
+++ b/datasets/current/admin-units/municipalities.trig
@@ -1,7 +1,7 @@
 PREFIX atu-type: <http://publications.europa.eu/resource/authority/atu-type/>
 PREFIX cv: <http://data.europa.eu/m8g/>
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX schema: <https://schema.org/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
diff --git a/datasets/current/constituencies/constituencies.trig b/datasets/current/constituencies/constituencies.trig
index f770fb2..f60275a 100644
--- a/datasets/current/constituencies/constituencies.trig
+++ b/datasets/current/constituencies/constituencies.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX ltlod: <http://linkeddata.lt/ns#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/datasets/current/legal-entities/institutions.trig b/datasets/current/legal-entities/institutions.trig
index 72f4e82..0e2aea3 100644
--- a/datasets/current/legal-entities/institutions.trig
+++ b/datasets/current/legal-entities/institutions.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX locn: <http://www.w3.org/ns/locn#>
 PREFIX org: <http://www.w3.org/ns/org#>
diff --git a/datasets/current/seimas/org-units.trig b/datasets/current/seimas/org-units.trig
index 584b7b7..bb2caf2 100644
--- a/datasets/current/seimas/org-units.trig
+++ b/datasets/current/seimas/org-units.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX org: <http://www.w3.org/ns/org#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/datasets/current/seimas/parties.trig b/datasets/current/seimas/parties.trig
index 8f24be1..4fd28aa 100644
--- a/datasets/current/seimas/parties.trig
+++ b/datasets/current/seimas/parties.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX org: <http://www.w3.org/ns/org#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/datasets/current/seimas/persons.trig b/datasets/current/seimas/persons.trig
index 6a62392..56f3677 100644
--- a/datasets/current/seimas/persons.trig
+++ b/datasets/current/seimas/persons.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX ltlod: <http://linkeddata.lt/ns#>
 PREFIX org: <http://www.w3.org/ns/org#>
diff --git a/datasets/current/taxonomies/admin-unit-levels.trig b/datasets/current/taxonomies/admin-unit-levels.trig
index 1b34a13..b7f1423 100644
--- a/datasets/current/taxonomies/admin-unit-levels.trig
+++ b/datasets/current/taxonomies/admin-unit-levels.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/datasets/current/taxonomies/legal-forms.trig b/datasets/current/taxonomies/legal-forms.trig
index f96c2af..a62f7a4 100644
--- a/datasets/current/taxonomies/legal-forms.trig
+++ b/datasets/current/taxonomies/legal-forms.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/datasets/current/taxonomies/legal-statuses.trig b/datasets/current/taxonomies/legal-statuses.trig
index 0761d5d..0e9e2cd 100644
--- a/datasets/current/taxonomies/legal-statuses.trig
+++ b/datasets/current/taxonomies/legal-statuses.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/datasets/current/taxonomies/org-unit-types.trig b/datasets/current/taxonomies/org-unit-types.trig
index 3e49972..79ee2e9 100644
--- a/datasets/current/taxonomies/org-unit-types.trig
+++ b/datasets/current/taxonomies/org-unit-types.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/datasets/current/taxonomies/position-types.trig b/datasets/current/taxonomies/position-types.trig
index 10e7d46..334f8af 100644
--- a/datasets/current/taxonomies/position-types.trig
+++ b/datasets/current/taxonomies/position-types.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
diff --git a/datasets/current/taxonomies/settlement-types.trig b/datasets/current/taxonomies/settlement-types.trig
index 064297d..94c859a 100644
--- a/datasets/current/taxonomies/settlement-types.trig
+++ b/datasets/current/taxonomies/settlement-types.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/datasets/current/taxonomies/street-types.trig b/datasets/current/taxonomies/street-types.trig
index 7cdeed0..e9db70a 100644
--- a/datasets/current/taxonomies/street-types.trig
+++ b/datasets/current/taxonomies/street-types.trig
@@ -1,5 +1,5 @@
 PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dh: <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh: <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/etl/admin-units/mappings/counties.rq b/etl/admin-units/mappings/counties.rq
index aee82a1..2655871 100644
--- a/etl/admin-units/mappings/counties.rq
+++ b/etl/admin-units/mappings/counties.rq
@@ -6,7 +6,7 @@ PREFIX schema:   <https://schema.org/>
 PREFIX xsd:      <http://www.w3.org/2001/XMLSchema#>
 PREFIX atu-type: <http://publications.europa.eu/resource/authority/atu-type/>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/admin-units/mappings/elderships.rq b/etl/admin-units/mappings/elderships.rq
index d4f4256..0a7e14a 100644
--- a/etl/admin-units/mappings/elderships.rq
+++ b/etl/admin-units/mappings/elderships.rq
@@ -6,7 +6,7 @@ PREFIX schema:   <https://schema.org/>
 PREFIX xsd:      <http://www.w3.org/2001/XMLSchema#>
 PREFIX atu-type: <http://publications.europa.eu/resource/authority/atu-type/>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/admin-units/mappings/municipalities.rq b/etl/admin-units/mappings/municipalities.rq
index af21a84..af51ab2 100644
--- a/etl/admin-units/mappings/municipalities.rq
+++ b/etl/admin-units/mappings/municipalities.rq
@@ -6,7 +6,7 @@ PREFIX schema:   <https://schema.org/>
 PREFIX xsd:      <http://www.w3.org/2001/XMLSchema#>
 PREFIX atu-type: <http://publications.europa.eu/resource/authority/atu-type/>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/admin-units/mappings/settlements.rq b/etl/admin-units/mappings/settlements.rq
index 2fa2dc0..8285b3a 100644
--- a/etl/admin-units/mappings/settlements.rq
+++ b/etl/admin-units/mappings/settlements.rq
@@ -5,7 +5,7 @@ PREFIX skos:     <http://www.w3.org/2004/02/skos/core#>
 PREFIX schema:   <https://schema.org/>
 PREFIX xsd:      <http://www.w3.org/2001/XMLSchema#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/admin-units/mappings/streets.rq b/etl/admin-units/mappings/streets.rq
index fe6061f..3ad825b 100644
--- a/etl/admin-units/mappings/streets.rq
+++ b/etl/admin-units/mappings/streets.rq
@@ -4,7 +4,7 @@ PREFIX skos:     <http://www.w3.org/2004/02/skos/core#>
 PREFIX schema:   <https://schema.org/>
 PREFIX xsd:      <http://www.w3.org/2001/XMLSchema#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/legal-entities/mappings/institutions.rq b/etl/legal-entities/mappings/institutions.rq
index 9db7ac1..679ab66 100644
--- a/etl/legal-entities/mappings/institutions.rq
+++ b/etl/legal-entities/mappings/institutions.rq
@@ -21,7 +21,7 @@ PREFIX skos:   <http://www.w3.org/2004/02/skos/core#>
 PREFIX schema: <https://schema.org/>
 PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/seimas/mappings/constituencies.rq b/etl/seimas/mappings/constituencies.rq
index 0b43013..b63ba99 100644
--- a/etl/seimas/mappings/constituencies.rq
+++ b/etl/seimas/mappings/constituencies.rq
@@ -10,7 +10,7 @@ PREFIX foaf:  <http://xmlns.com/foaf/0.1/>
 PREFIX skos:  <http://www.w3.org/2004/02/skos/core#>
 PREFIX ltlod: <http://linkeddata.lt/ns#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/seimas/mappings/org-units.rq b/etl/seimas/mappings/org-units.rq
index 6d4afd3..1641c7f 100644
--- a/etl/seimas/mappings/org-units.rq
+++ b/etl/seimas/mappings/org-units.rq
@@ -10,7 +10,7 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX org:  <http://www.w3.org/ns/org#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/seimas/mappings/parties.rq b/etl/seimas/mappings/parties.rq
index 03a36dd..24e93f7 100644
--- a/etl/seimas/mappings/parties.rq
+++ b/etl/seimas/mappings/parties.rq
@@ -6,7 +6,7 @@ PREFIX org:    <http://www.w3.org/ns/org#>
 PREFIX skos:   <http://www.w3.org/2004/02/skos/core#>
 PREFIX schema: <https://schema.org/>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/seimas/mappings/persons.rq b/etl/seimas/mappings/persons.rq
index d376add..939a9f0 100644
--- a/etl/seimas/mappings/persons.rq
+++ b/etl/seimas/mappings/persons.rq
@@ -9,7 +9,7 @@ PREFIX skos:   <http://www.w3.org/2004/02/skos/core#>
 PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
 PREFIX ltlod:  <http://linkeddata.lt/ns#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/seimas/mappings/position-types.rq b/etl/seimas/mappings/position-types.rq
index 790cc65..a37756c 100644
--- a/etl/seimas/mappings/position-types.rq
+++ b/etl/seimas/mappings/position-types.rq
@@ -5,7 +5,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/shapes/admin-units.ttl b/etl/shapes/admin-units.ttl
index f3398e4..9e15652 100644
--- a/etl/shapes/admin-units.ttl
+++ b/etl/shapes/admin-units.ttl
@@ -68,7 +68,7 @@ PREFIX :       <http://linkeddata.lt/shapes#>
 
 # LinkedDataHub document hierarchy: every entity document is a dh:Item
 # attached to its container (sioc:has_container).
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 :ItemShape a sh:NodeShape ;
diff --git a/etl/shapes/constituencies.ttl b/etl/shapes/constituencies.ttl
index 98ef192..8f7026c 100644
--- a/etl/shapes/constituencies.ttl
+++ b/etl/shapes/constituencies.ttl
@@ -21,7 +21,7 @@ PREFIX :      <http://linkeddata.lt/shapes#>
         [ sh:path dct:identifier ; sh:datatype xsd:string ;
           sh:minCount 1 ; sh:maxCount 1 ; sh:equals skos:notation ] .
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 :ItemShape a sh:NodeShape ;
diff --git a/etl/shapes/legal-entities.ttl b/etl/shapes/legal-entities.ttl
index c889559..0038251 100644
--- a/etl/shapes/legal-entities.ttl
+++ b/etl/shapes/legal-entities.ttl
@@ -54,7 +54,7 @@ PREFIX :       <http://linkeddata.lt/shapes#>
 
 # LinkedDataHub document hierarchy: every entity document is a dh:Item
 # attached to its container (sioc:has_container).
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 :ItemShape a sh:NodeShape ;
diff --git a/etl/shapes/seimas.ttl b/etl/shapes/seimas.ttl
index d771d84..b3f524e 100644
--- a/etl/shapes/seimas.ttl
+++ b/etl/shapes/seimas.ttl
@@ -100,7 +100,7 @@ PREFIX :      <http://linkeddata.lt/shapes#>
 
 # LinkedDataHub document hierarchy: every entity/concept document is a dh:Item
 # attached to its container (sioc:has_container).
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 :ItemShape a sh:NodeShape ;
diff --git a/etl/shapes/taxonomies.ttl b/etl/shapes/taxonomies.ttl
index ca028f0..b8026e2 100644
--- a/etl/shapes/taxonomies.ttl
+++ b/etl/shapes/taxonomies.ttl
@@ -10,7 +10,7 @@ PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX dct:  <http://purl.org/dc/terms/>
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 PREFIX :     <http://linkeddata.lt/shapes#>
 
diff --git a/etl/taxonomies/mappings/admin-unit-levels.rq b/etl/taxonomies/mappings/admin-unit-levels.rq
index 8979560..a351c60 100644
--- a/etl/taxonomies/mappings/admin-unit-levels.rq
+++ b/etl/taxonomies/mappings/admin-unit-levels.rq
@@ -4,7 +4,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/taxonomies/mappings/legal-forms.rq b/etl/taxonomies/mappings/legal-forms.rq
index f591366..83370c6 100644
--- a/etl/taxonomies/mappings/legal-forms.rq
+++ b/etl/taxonomies/mappings/legal-forms.rq
@@ -3,7 +3,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/taxonomies/mappings/legal-statuses.rq b/etl/taxonomies/mappings/legal-statuses.rq
index e596735..7ef4cae 100644
--- a/etl/taxonomies/mappings/legal-statuses.rq
+++ b/etl/taxonomies/mappings/legal-statuses.rq
@@ -3,7 +3,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/taxonomies/mappings/org-unit-types.rq b/etl/taxonomies/mappings/org-unit-types.rq
index 9e81238..74c3501 100644
--- a/etl/taxonomies/mappings/org-unit-types.rq
+++ b/etl/taxonomies/mappings/org-unit-types.rq
@@ -2,7 +2,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/taxonomies/mappings/settlement-types.rq b/etl/taxonomies/mappings/settlement-types.rq
index 48c37d2..0f7d28d 100644
--- a/etl/taxonomies/mappings/settlement-types.rq
+++ b/etl/taxonomies/mappings/settlement-types.rq
@@ -2,7 +2,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/etl/taxonomies/mappings/street-types.rq b/etl/taxonomies/mappings/street-types.rq
index da8e87d..fb7f628 100644
--- a/etl/taxonomies/mappings/street-types.rq
+++ b/etl/taxonomies/mappings/street-types.rq
@@ -2,7 +2,7 @@ PREFIX dct:  <http://purl.org/dc/terms/>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
-PREFIX dh:   <https://www.w3.org/ns/ldt/document-hierarchy#>
+PREFIX dh:   <https://w3id.org/atomgraph/linkeddatahub/document-hierarchy#>
 PREFIX sioc: <http://rdfs.org/sioc/ns#>
 
 CONSTRUCT
diff --git a/files/layout.xsl b/files/layout.xsl
index 82807e3..bb32c54 100644
--- a/files/layout.xsl
+++ b/files/layout.xsl
@@ -23,12 +23,11 @@
     (static/xsl/layout.xsl, config/dataspaces.trig), so it applies to the
     end-user app only — the admin app uses static/xsl/admin/layout.xsl and is
     untouched. The xhtml:Script signature mirrors the pinned LDH image
-    (docker-compose.yml), which matches on the lapp:origin() function.
+    (docker-compose.yml), which matches on the lds:origin() function.
 
 -->
 <!DOCTYPE xsl:stylesheet [
     <!ENTITY rdf    "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
 ]>
 <xsl:stylesheet version="3.0"
     xmlns="http://www.w3.org/1999/xhtml"
@@ -36,9 +35,8 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
     xmlns:rdf="&rdf;"
-    xmlns:ldt="&ldt;"
     xmlns:ac="https://w3id.org/atomgraph/client#"
-    xmlns:lapp="https://w3id.org/atomgraph/linkeddatahub/apps#"
+    xmlns:lds="https://w3id.org/atomgraph/linkeddatahub/dataspaces#"
     xmlns:srx="http://www.w3.org/2005/sparql-results#"
     exclude-result-prefixes="#all">
 
@@ -47,8 +45,8 @@
     <xsl:import href="overrides.xsl"/>
 
     <!-- load our custom client SEF instead of the stock client.xsl.sef.json -->
-    <xsl:template match="rdf:RDF[lapp:origin()] | srx:sparql[lapp:origin()]" mode="xhtml:Script">
-        <xsl:param name="client-stylesheet" select="resolve-uri('static/lt/linkeddata/xsl/client.xsl.sef.json', lapp:origin())" as="xs:anyURI"/>
+    <xsl:template match="rdf:RDF[lds:origin()] | srx:sparql[lds:origin()]" mode="xhtml:Script">
+        <xsl:param name="client-stylesheet" select="resolve-uri('static/lt/linkeddata/xsl/client.xsl.sef.json', lds:origin())" as="xs:anyURI"/>
 
         <xsl:apply-imports>
             <xsl:with-param name="client-stylesheet" select="$client-stylesheet"/>
@@ -84,7 +82,7 @@
         <div class="ldh-footer" role="contentinfo">
             <div class="cols">
                 <div class="col brand-col">
-                    <a class="ldh-wordmark" href="{$ldt:base}">
+                    <a class="ldh-wordmark" href="{lds:base()}">
                         <span class="mark" style="background: linear-gradient(135deg, #FDB913 0%, #006A44 55%, #C1272D 100%);"></span>
                         <span>linkeddata.lt</span>
                     </a>
@@ -92,11 +90,11 @@
                 </div>
                 <div class="col">
                     <p class="ftitle">Duomenys</p>
-                    <a href="{resolve-uri('admin-units/', $ldt:base)}">Administraciniai vienetai</a>
-                    <a href="{resolve-uri('persons/', $ldt:base)}">Seimo nariai</a>
-                    <a href="{resolve-uri('parties/', $ldt:base)}">Partijos</a>
-                    <a href="{resolve-uri('legal-entities/', $ldt:base)}">Juridiniai asmenys</a>
-                    <a href="{resolve-uri('taxonomies/', $ldt:base)}">Klasifikatoriai</a>
+                    <a href="{resolve-uri('admin-units/', lds:base())}">Administraciniai vienetai</a>
+                    <a href="{resolve-uri('persons/', lds:base())}">Seimo nariai</a>
+                    <a href="{resolve-uri('parties/', lds:base())}">Partijos</a>
+                    <a href="{resolve-uri('legal-entities/', lds:base())}">Juridiniai asmenys</a>
+                    <a href="{resolve-uri('taxonomies/', lds:base())}">Klasifikatoriai</a>
                 </div>
                 <div class="col">
                     <p class="ftitle">Šaltiniai</p>
@@ -107,10 +105,10 @@
                 </div>
                 <div class="col">
                     <p class="ftitle">Kūrėjams</p>
-                    <a href="{resolve-uri('sparql', $ldt:base)}">SPARQL užklausos</a>
+                    <a href="{resolve-uri('sparql', lds:base())}">SPARQL užklausos</a>
                     <a href="https://github.com/AtomGraph/LTLOD/blob/master/etl/queries/EXAMPLES.md" target="_blank">Užklausų pavyzdžiai</a>
                     <a href="https://github.com/AtomGraph/LTLOD/tree/master/datasets/current" target="_blank">Atsisiųsti duomenis</a>
-                    <a href="{resolve-uri('ns', $ldt:base)}">Vardų erdvė</a>
+                    <a href="{resolve-uri('ns', lds:base())}">Vardų erdvė</a>
                 </div>
                 <div class="col">
                     <p class="ftitle">Projektas</p>
@@ -122,7 +120,7 @@
             </div>
             <div class="legal">
                 <span>© <xsl:value-of select="format-date(current-date(), '[Y]')"/> · Duomenys © Registrų centras, Seimo kanceliarija · CC BY 4.0</span>
-                <span><xsl:value-of select="$ldt:base"/></span>
+                <span><xsl:value-of select="lds:base()"/></span>
             </div>
         </div>
     </xsl:template>