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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix void: <http://rdfs.org/ns/void#> .
+@prefix dcat: <http://www.w3.org/ns/dcat#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix void: <http://rdfs.org/ns/void#> .
+@prefix dcat: <http://www.w3.org/ns/dcat#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
-<#VoIDSourceAccess> a rml:Source, void:Dataset;
-  void:dataDump <http://w3id.org/rml/resources/rml-io/RMLSTC0006b/Friends.nt>;
+<#VoIDSourceAccess> a rml:Source, dcat:Distribution;
+  dcat:downloadURL <http://w3id.org/rml/resources/rml-io/RMLSTC0006b/Friends.nt>;
 .
 
 <#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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org/> .
 @base <http://example.com/rules/> .
@@ -42,8 +41,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -41,8 +40,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
@@ -42,8 +41,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -40,22 +39,22 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump3> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump3.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump3.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org> .
 @base <http://example.com/rules/> .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org> .
 @base <http://example.com/rules/> .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org> .
 @base <http://example.com/rules/> .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org> .
 @base <http://example.com/rules/> .
@@ -46,15 +45,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org> .
 @base <http://example.com/rules/> .
@@ -43,15 +42,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ex: <http://example.org> .
@@ -47,15 +46,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ex: <http://example.org> .
@@ -44,15 +43,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,15 +38,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org/> .
 @base <http://example.com/rules/> .
@@ -46,8 +45,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -53,15 +52,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
@@ -54,15 +53,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -39,8 +38,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -50,15 +49,15 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .
 
 <#TargetDump2> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump2.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump2.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.jsonld>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.jsonld>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.n3>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.n3>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nt>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nt>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.rdfjson>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.rdfjson>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.rdfxml>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.rdfxml>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.ttl>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.ttl>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq.gz>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq.gz>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq.zip>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq.zip>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @prefix ex: <http://example.org/> .
 @base <http://example.com/rules/> .
@@ -39,8 +38,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq.tar.xz>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq.tar.xz>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq.tar.gz>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq.tar.gz>;
   ];
   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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
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: <http://w3id.org/rml/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix void: <http://rdfs.org/ns/void#> .
 @prefix formats: <http://www.w3.org/ns/formats/> .
 @base <http://example.com/rules/> .
 
@@ -38,8 +37,8 @@
 .
 
 <#TargetDump1> a rml:LogicalTarget;
-  rml:target [ a rml:Target, void:Dataset;
-    void:dataDump <file://./dump1.nq>;
+  rml:target [ a rml:Target, dcat:Distribution;
+    dcat:downloadURL <file://./dump1.nq>;
   ];
   rml:serialization formats:N-Quads;
 .