diff --git a/spec/section/logical-target-in-rml.md b/spec/section/logical-target-in-rml.md index 93bf616..77bc38f 100644 --- a/spec/section/logical-target-in-rml.md +++ b/spec/section/logical-target-in-rml.md @@ -43,7 +43,7 @@ are exported to the default target of the processor. In the example below, a CSV file is transformed into a knowledge graph. The CSV file is accessed using the [[CSVW]] vocabulary, transformed into a knowledge graph using [[RML]] mappings, -and exported to two Logical Targets, which are accessed through the [[VoID]] +and exported to two Logical Targets, which are accessed through the [[DCAT]] vocabulary. The knowledge graph is exported as N-Quads to the first Target, and as Turtle to the second Target. @@ -104,23 +104,23 @@ id;name;nickname
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump2>;
+  rml:target <#DCATDump2>;
   rml:serialization formats:Turtle;
 .
 
-<#VoIDDump1> a void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
 
-<#VoIDDump2> a void:Dataset;
-  void:dataDump <file:///data/dump2.ttl.zip>;
+<#DCATDump2> a dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.ttl.zip>;
   rml:compression rml:zip;
 .
 
diff --git a/spec/section/multiple-targets.md b/spec/section/multiple-targets.md index 8f41498..ba97578 100644 --- a/spec/section/multiple-targets.md +++ b/spec/section/multiple-targets.md @@ -74,30 +74,30 @@ to the three specified Targets:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:JSON-LD;
 .
 <#TargetDump3> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:RDF_XML;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt.zip>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt.zip>;
   rml:compression rml:zip;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.jsonld.tar.xz>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.jsonld.tar.xz>;
   rml:compression rml:tarxz;
 .
-<#VoIDDump3> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump3.rdf.tar.gz>;
+<#DCATDump3> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump3.rdf.tar.gz>;
   rml:compression rml:targz;
 .
 
@@ -231,21 +231,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a void:Dataset ;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a void:Dataset ;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -334,21 +334,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -437,21 +437,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -537,21 +537,21 @@ predicate `foaf:nickname` are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -643,21 +643,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nq>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nq>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nq>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nq>;
 .
 
@@ -749,21 +749,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nq>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nq>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump2.nq>;
+<#DCATDump2> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump2.nq>;
 .
 
@@ -851,21 +851,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nq>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nq>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nq>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nq>;
 .
 
@@ -961,21 +961,21 @@ as there is no dedicated Target assigned to triples containing
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -1069,21 +1069,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -1168,21 +1168,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -1267,21 +1267,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
@@ -1372,21 +1372,21 @@ are exported to `TargetDump2`.
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nq>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nq>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nq>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nq>;
 .
 
diff --git a/spec/section/overriding-targets.md b/spec/section/overriding-targets.md index f439c0b..6417fec 100644 --- a/spec/section/overriding-targets.md +++ b/spec/section/overriding-targets.md @@ -102,21 +102,21 @@ http://dbpedia.org/resource/Melissa_Rauch,Melissa Rauch
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump2>;
+  rml:target <#DCATDump2>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump2.nq>;
+<#DCATDump2> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump2.nq>;
 .
 
@@ -259,21 +259,21 @@ http://dbpedia.org/resource/Melissa_Rauch,Melissa Rauch
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target <#VoIDDump2>;
+  rml:target <#DCATDump2>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
-<#VoIDDump2> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump2.nt>;
+<#DCATDump2> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump2.nt>;
 .
 
diff --git a/spec/section/overview.md b/spec/section/overview.md index d006121..208d0d7 100644 --- a/spec/section/overview.md +++ b/spec/section/overview.md @@ -19,7 +19,7 @@ and provides fine-grained control over where each RDF triple is exported to. Logical Source and Logical Target leverage the access descriptions of data access -such as DCAT [[DCAT]], VoID [[VoID]], SD [[SD]], etc. +such as DCAT [[DCAT]], SD [[SD]], etc. In this document, examples assume the following namespace prefix bindings unless otherwise stated: @@ -28,7 +28,6 @@ the following namespace prefix bindings unless otherwise stated: | --------- | --------------------------------------------------- | | `rml` | http://w3id.org/rml/ | | `formats` | http://www.w3.org/ns/formats/ | -| `void` | http://rdfs.org/ns/void# | | `sd` | http://www.w3.org/ns/sparql-service-description# | | `dcat` | http://www.w3.org/ns/dcat# | | `td` | https://www.w3.org/2019/wot/td# | diff --git a/spec/section/single-targets.md b/spec/section/single-targets.md index 50ef19e..143575c 100644 --- a/spec/section/single-targets.md +++ b/spec/section/single-targets.md @@ -81,14 +81,14 @@ to an RDF dump with N-Quads as serialization format and GZip compression:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Quads;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nq.gz>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nq.gz>;
   rml:compression rml:gzip;
 .
 
@@ -183,14 +183,14 @@ with Turtle as serialization format and Zip compression:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:Turtle;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset;
-  void:dataDump <file:///data/dump1.ttl.zip>;
+<#DCATDump1> a rml:Target, dcat:Distribution;
+  dcat:downloadURL <file:///data/dump1.ttl.zip>;
   rml:compression rml:zip;
 .
 
@@ -302,14 +302,14 @@ with N-Triples as serialization format:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
 
@@ -420,13 +420,13 @@ to an RDF dump with N-Quads as serialization format:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nq>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nq>;
 .
 
@@ -523,14 +523,14 @@ to a RDF dump with N-Triples as serialization format:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
 
@@ -632,14 +632,14 @@ to a RDF dump with N-Triples as serialization format:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Triples;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nt>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nt>;
 .
 
@@ -741,14 +741,14 @@ to a RDF dump with N-Triples as serialization format:
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target <#VoIDDump1>;
+  rml:target <#DCATDump1>;
   rml:serialization formats:N-Quads;
 .
 
-<#VoIDDump1> a rml:Target, void:Dataset ;
-  void:dataDump <file:///data/dump1.nq.gz>;
+<#DCATDump1> a rml:Target, dcat:Distribution ;
+  dcat:downloadURL <file:///data/dump1.nq.gz>;
   rml:compression rml:gzip;
 .
 
diff --git a/spec/section/target-vocabulary.md b/spec/section/target-vocabulary.md index 9ceb793..ab7c625 100644 --- a/spec/section/target-vocabulary.md +++ b/spec/section/target-vocabulary.md @@ -22,7 +22,7 @@ all other properties are optional. ### Target A Target describes how a target must be accessed when exporting RDF triples. -An external vocabulary such as DCAT, VoID, SD is allowed here. +An external vocabulary such as DCAT, SD, etc. is allowed here. If a target cannot be accessed with existing vocabulary, a custom vocabulary can be used, for example: handling an authentication flow may be specific for that specific target. A custom ontology can be used here to describe @@ -138,9 +138,9 @@ The following example show a Target of an RDF dump in Turtle [[Turtle]] format with GZip compression and UTF-8 encoding:
-<#VoIDDump> a rml:LogicalTarget;
-    rml:target [ a rml:Target, void:Dataset;
-        void:dataDump <file:///data/dump.ttl>;
+<#DCATDump> a rml:LogicalTarget;
+    rml:target [ a rml:Target, dcat:Distribution;
+        dcat:downloadURL <file:///data/dump.ttl>;
         rml:compression rml:gzip;
         rml:encoding rml:UTF-8;
     ];
diff --git a/test-cases/RMLSTC0003/mapping.ttl b/test-cases/RMLSTC0003/mapping.ttl
index f4a8bc0..4f73748 100644
--- a/test-cases/RMLSTC0003/mapping.ttl
+++ b/test-cases/RMLSTC0003/mapping.ttl
@@ -1,6 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
-@prefix void:  .
+@prefix dcat:  .
 @prefix formats:  .
 @base  .
 
diff --git a/test-cases/RMLSTC0006b/mapping.ttl b/test-cases/RMLSTC0006b/mapping.ttl
index 6436db1..97f6730 100644
--- a/test-cases/RMLSTC0006b/mapping.ttl
+++ b/test-cases/RMLSTC0006b/mapping.ttl
@@ -1,11 +1,11 @@
 @prefix rml:  .
 @prefix foaf:  .
-@prefix void:  .
+@prefix dcat:  .
 @prefix formats:  .
 @base  .
 
-<#VoIDSourceAccess> a rml:Source, void:Dataset;
-  void:dataDump ;
+<#VoIDSourceAccess> a rml:Source, dcat:Distribution;
+  dcat:downloadURL ;
 .
 
 <#TriplesMap> a rml:TriplesMap;
diff --git a/test-cases/RMLTTC0001a/mapping.ttl b/test-cases/RMLTTC0001a/mapping.ttl
index 6da4e72..c9e26cf 100644
--- a/test-cases/RMLTTC0001a/mapping.ttl
+++ b/test-cases/RMLTTC0001a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0001b/mapping.ttl b/test-cases/RMLTTC0001b/mapping.ttl
index 0c77b3d..98a044d 100644
--- a/test-cases/RMLTTC0001b/mapping.ttl
+++ b/test-cases/RMLTTC0001b/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0001c/mapping.ttl b/test-cases/RMLTTC0001c/mapping.ttl
index 960fa0a..bba78d0 100644
--- a/test-cases/RMLTTC0001c/mapping.ttl
+++ b/test-cases/RMLTTC0001c/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0001d/mapping.ttl b/test-cases/RMLTTC0001d/mapping.ttl
index 1b3dcef..8f7aa21 100644
--- a/test-cases/RMLTTC0001d/mapping.ttl
+++ b/test-cases/RMLTTC0001d/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -42,8 +41,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0001e/mapping.ttl b/test-cases/RMLTTC0001e/mapping.ttl
index 8bc6fa2..321cc25 100644
--- a/test-cases/RMLTTC0001e/mapping.ttl
+++ b/test-cases/RMLTTC0001e/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -41,8 +40,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0001f/mapping.ttl b/test-cases/RMLTTC0001f/mapping.ttl
index ce40c27..570ea63 100644
--- a/test-cases/RMLTTC0001f/mapping.ttl
+++ b/test-cases/RMLTTC0001f/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix xsd:  .
 @prefix formats:  .
 @base  .
@@ -42,8 +41,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002a/mapping.ttl b/test-cases/RMLTTC0002a/mapping.ttl
index dfd09a7..aa80e49 100644
--- a/test-cases/RMLTTC0002a/mapping.ttl
+++ b/test-cases/RMLTTC0002a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002b/mapping.ttl b/test-cases/RMLTTC0002b/mapping.ttl
index e668039..2eb41b6 100644
--- a/test-cases/RMLTTC0002b/mapping.ttl
+++ b/test-cases/RMLTTC0002b/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002c/mapping.ttl b/test-cases/RMLTTC0002c/mapping.ttl
index e5ae954..bfda769 100644
--- a/test-cases/RMLTTC0002c/mapping.ttl
+++ b/test-cases/RMLTTC0002c/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002d/mapping.ttl b/test-cases/RMLTTC0002d/mapping.ttl
index 182d153..0f9ba2d 100644
--- a/test-cases/RMLTTC0002d/mapping.ttl
+++ b/test-cases/RMLTTC0002d/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002e/mapping.ttl b/test-cases/RMLTTC0002e/mapping.ttl
index 332a37d..c7dbe26 100644
--- a/test-cases/RMLTTC0002e/mapping.ttl
+++ b/test-cases/RMLTTC0002e/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -40,22 +39,22 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump3> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002f/mapping.ttl b/test-cases/RMLTTC0002f/mapping.ttl
index 8a5055e..8d6de7c 100644
--- a/test-cases/RMLTTC0002f/mapping.ttl
+++ b/test-cases/RMLTTC0002f/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002g/mapping.ttl b/test-cases/RMLTTC0002g/mapping.ttl
index 3fa9446..ab71f4d 100644
--- a/test-cases/RMLTTC0002g/mapping.ttl
+++ b/test-cases/RMLTTC0002g/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002h/mapping.ttl b/test-cases/RMLTTC0002h/mapping.ttl
index 4719784..110d9c5 100644
--- a/test-cases/RMLTTC0002h/mapping.ttl
+++ b/test-cases/RMLTTC0002h/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002i/mapping.ttl b/test-cases/RMLTTC0002i/mapping.ttl
index 745b4ba..ec9388e 100644
--- a/test-cases/RMLTTC0002i/mapping.ttl
+++ b/test-cases/RMLTTC0002i/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -46,15 +45,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002j/mapping.ttl b/test-cases/RMLTTC0002j/mapping.ttl
index 5242eeb..797320b 100644
--- a/test-cases/RMLTTC0002j/mapping.ttl
+++ b/test-cases/RMLTTC0002j/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002k/mapping.ttl b/test-cases/RMLTTC0002k/mapping.ttl
index de9b546..da75316 100644
--- a/test-cases/RMLTTC0002k/mapping.ttl
+++ b/test-cases/RMLTTC0002k/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix xsd:  .
 @prefix ex:  .
@@ -47,15 +46,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002l/mapping.ttl b/test-cases/RMLTTC0002l/mapping.ttl
index e90ea20..3b662f9 100644
--- a/test-cases/RMLTTC0002l/mapping.ttl
+++ b/test-cases/RMLTTC0002l/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix xsd:  .
 @prefix ex:  .
@@ -44,15 +43,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002m/mapping.ttl b/test-cases/RMLTTC0002m/mapping.ttl
index a25875c..79f56eb 100644
--- a/test-cases/RMLTTC0002m/mapping.ttl
+++ b/test-cases/RMLTTC0002m/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002n/mapping.ttl b/test-cases/RMLTTC0002n/mapping.ttl
index a7429a3..80f61d4 100644
--- a/test-cases/RMLTTC0002n/mapping.ttl
+++ b/test-cases/RMLTTC0002n/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002o/mapping.ttl b/test-cases/RMLTTC0002o/mapping.ttl
index 169181d..aeea425 100644
--- a/test-cases/RMLTTC0002o/mapping.ttl
+++ b/test-cases/RMLTTC0002o/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -46,8 +45,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002p/mapping.ttl b/test-cases/RMLTTC0002p/mapping.ttl
index d0d3df5..d6dce3a 100644
--- a/test-cases/RMLTTC0002p/mapping.ttl
+++ b/test-cases/RMLTTC0002p/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -53,15 +52,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002q/mapping.ttl b/test-cases/RMLTTC0002q/mapping.ttl
index e04c5b3..2371b23 100644
--- a/test-cases/RMLTTC0002q/mapping.ttl
+++ b/test-cases/RMLTTC0002q/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix xsd:  .
 @prefix formats:  .
 @base  .
@@ -54,15 +53,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0002r/mapping.ttl b/test-cases/RMLTTC0002r/mapping.ttl
index b591a16..85557b8 100644
--- a/test-cases/RMLTTC0002r/mapping.ttl
+++ b/test-cases/RMLTTC0002r/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -39,8 +38,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0003a/mapping.ttl b/test-cases/RMLTTC0003a/mapping.ttl
index aac9876..6f2a21e 100644
--- a/test-cases/RMLTTC0003a/mapping.ttl
+++ b/test-cases/RMLTTC0003a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -50,15 +49,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0004a/mapping.ttl b/test-cases/RMLTTC0004a/mapping.ttl
index a4d3f0e..64e23c8 100644
--- a/test-cases/RMLTTC0004a/mapping.ttl
+++ b/test-cases/RMLTTC0004a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:JSON-LD;
 .
diff --git a/test-cases/RMLTTC0004b/mapping.ttl b/test-cases/RMLTTC0004b/mapping.ttl
index 41bd974..68843c7 100644
--- a/test-cases/RMLTTC0004b/mapping.ttl
+++ b/test-cases/RMLTTC0004b/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N3;
 .
diff --git a/test-cases/RMLTTC0004c/mapping.ttl b/test-cases/RMLTTC0004c/mapping.ttl
index ae0a86a..1a72c6a 100644
--- a/test-cases/RMLTTC0004c/mapping.ttl
+++ b/test-cases/RMLTTC0004c/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Triples;
 .
diff --git a/test-cases/RMLTTC0004d/mapping.ttl b/test-cases/RMLTTC0004d/mapping.ttl
index 2d5d218..df2ff94 100644
--- a/test-cases/RMLTTC0004d/mapping.ttl
+++ b/test-cases/RMLTTC0004d/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0004e/mapping.ttl b/test-cases/RMLTTC0004e/mapping.ttl
index e90a09d..0f28f25 100644
--- a/test-cases/RMLTTC0004e/mapping.ttl
+++ b/test-cases/RMLTTC0004e/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:RDF_JSON;
 .
diff --git a/test-cases/RMLTTC0004f/mapping.ttl b/test-cases/RMLTTC0004f/mapping.ttl
index ce499ce..917706a 100644
--- a/test-cases/RMLTTC0004f/mapping.ttl
+++ b/test-cases/RMLTTC0004f/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:RDF_XML;
 .
diff --git a/test-cases/RMLTTC0004g/mapping.ttl b/test-cases/RMLTTC0004g/mapping.ttl
index 43280d0..eadeb47 100644
--- a/test-cases/RMLTTC0004g/mapping.ttl
+++ b/test-cases/RMLTTC0004g/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:Turtle;
 .
diff --git a/test-cases/RMLTTC0005a/mapping.ttl b/test-cases/RMLTTC0005a/mapping.ttl
index e744f3e..5cbd2ab 100644
--- a/test-cases/RMLTTC0005a/mapping.ttl
+++ b/test-cases/RMLTTC0005a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
   rml:encoding rml:UTF-8;
diff --git a/test-cases/RMLTTC0005b/mapping.ttl b/test-cases/RMLTTC0005b/mapping.ttl
index 6dfe54b..584a77b 100644
--- a/test-cases/RMLTTC0005b/mapping.ttl
+++ b/test-cases/RMLTTC0005b/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
   rml:encoding rml:UTF-16;
diff --git a/test-cases/RMLTTC0006a/mapping.ttl b/test-cases/RMLTTC0006a/mapping.ttl
index 1bb8b62..628e2e8 100644
--- a/test-cases/RMLTTC0006a/mapping.ttl
+++ b/test-cases/RMLTTC0006a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .
diff --git a/test-cases/RMLTTC0006b/mapping.ttl b/test-cases/RMLTTC0006b/mapping.ttl
index 8dd30c6..e97c5f8 100644
--- a/test-cases/RMLTTC0006b/mapping.ttl
+++ b/test-cases/RMLTTC0006b/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
   rml:compression rml:gzip;
diff --git a/test-cases/RMLTTC0006c/mapping.ttl b/test-cases/RMLTTC0006c/mapping.ttl
index fb2ed91..c69c83d 100644
--- a/test-cases/RMLTTC0006c/mapping.ttl
+++ b/test-cases/RMLTTC0006c/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
   rml:compression rml:zip;
diff --git a/test-cases/RMLTTC0006d/mapping.ttl b/test-cases/RMLTTC0006d/mapping.ttl
index a3a092a..e97df86 100644
--- a/test-cases/RMLTTC0006d/mapping.ttl
+++ b/test-cases/RMLTTC0006d/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @prefix ex:  .
 @base  .
@@ -39,8 +38,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
   rml:compression rml:tarxz;
diff --git a/test-cases/RMLTTC0006e/mapping.ttl b/test-cases/RMLTTC0006e/mapping.ttl
index cb62d6b..8bb4fac 100644
--- a/test-cases/RMLTTC0006e/mapping.ttl
+++ b/test-cases/RMLTTC0006e/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
   rml:compression rml:targz;
diff --git a/test-cases/RMLTTC0007a/mapping.ttl b/test-cases/RMLTTC0007a/mapping.ttl
index ba95d34..55821a2 100644
--- a/test-cases/RMLTTC0007a/mapping.ttl
+++ b/test-cases/RMLTTC0007a/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
diff --git a/test-cases/RMLTTC0007b/mapping.ttl b/test-cases/RMLTTC0007b/mapping.ttl
index c55ec93..571a80a 100644
--- a/test-cases/RMLTTC0007b/mapping.ttl
+++ b/test-cases/RMLTTC0007b/mapping.ttl
@@ -1,7 +1,6 @@
 @prefix rml:  .
 @prefix foaf:  .
 @prefix dcat:  .
-@prefix void:  .
 @prefix formats:  .
 @base  .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump ;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL ;
   ];
   rml:serialization formats:N-Quads;
 .