diff --git a/test-cases/RMLTC0000-SPARQL/mapping.ttl b/test-cases/RMLTC0000-SPARQL/mapping.ttl
index 794272ef..9bef56d9 100644
--- a/test-cases/RMLTC0000-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0000-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             SELECT ?name
             WHERE {
diff --git a/test-cases/RMLTC0001a-SPARQL/mapping.ttl b/test-cases/RMLTC0001a-SPARQL/mapping.ttl
index 2344386f..86bd32ac 100644
--- a/test-cases/RMLTC0001a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0001a-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             SELECT ?name
diff --git a/test-cases/RMLTC0001b-MySQL/mapping.ttl b/test-cases/RMLTC0001b-MySQL/mapping.ttl
index 286106b4..054eefd1 100644
--- a/test-cases/RMLTC0001b-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0001b-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT Name FROM student";
+      rml:iterator "SELECT Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl b/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl
index 5671a85e..43c823a3 100644
--- a/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT Name FROM student";
+      rml:iterator "SELECT Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0001b-SPARQL/mapping.ttl b/test-cases/RMLTC0001b-SPARQL/mapping.ttl
index 2344386f..86bd32ac 100644
--- a/test-cases/RMLTC0001b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0001b-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             SELECT ?name
diff --git a/test-cases/RMLTC0001b-SQLServer/mapping.ttl b/test-cases/RMLTC0001b-SQLServer/mapping.ttl
index 71518f49..d790ebbc 100644
--- a/test-cases/RMLTC0001b-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0001b-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT Name FROM student";
+      rml:iterator "SELECT Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002a-SPARQL/mapping.ttl b/test-cases/RMLTC0002a-SPARQL/mapping.ttl
index 49af8fc6..92b9f022 100644
--- a/test-cases/RMLTC0002a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0002a-SPARQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0002b-SPARQL/mapping.ttl b/test-cases/RMLTC0002b-SPARQL/mapping.ttl
index ee1811f7..25a07f24 100644
--- a/test-cases/RMLTC0002b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0002b-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0002d-MySQL/mapping.ttl b/test-cases/RMLTC0002d-MySQL/mapping.ttl
index 46cb56de..d4a2bb0f 100644
--- a/test-cases/RMLTC0002d-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002d-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student";
+      rml:iterator "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl
index 48ff403e..2b20b148 100644
--- a/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT ('Student' || ID) AS StudentId, ID, Name FROM student";
+      rml:iterator "SELECT ('Student' || ID) AS StudentId, ID, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002d-SQLServer/mapping.ttl b/test-cases/RMLTC0002d-SQLServer/mapping.ttl
index e2215878..e7355d78 100644
--- a/test-cases/RMLTC0002d-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002d-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student";
+      rml:iterator "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002g-MySQL/mapping.ttl b/test-cases/RMLTC0002g-MySQL/mapping.ttl
index 02d67833..281f0f32 100644
--- a/test-cases/RMLTC0002g-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002g-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
+      rml:iterator "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002g-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002g-PostgreSQL/mapping.ttl
index 67801054..8e015c41 100644
--- a/test-cases/RMLTC0002g-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002g-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
+      rml:iterator "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002g-SPARQL/mapping.ttl b/test-cases/RMLTC0002g-SPARQL/mapping.ttl
index 5bd36506..a3a7df52 100644
--- a/test-cases/RMLTC0002g-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0002g-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0002g-SQLServer/mapping.ttl b/test-cases/RMLTC0002g-SQLServer/mapping.ttl
index ec1222f9..cc64991c 100644
--- a/test-cases/RMLTC0002g-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002g-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
+      rml:iterator "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0002h-MySQL/mapping.ttl b/test-cases/RMLTC0002h-MySQL/mapping.ttl
index 117594da..f081204f 100644
--- a/test-cases/RMLTC0002h-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002h-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT Name, Name FROM student";
+      rml:iterator "SELECT Name, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002h-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002h-PostgreSQL/mapping.ttl
index 1b7cbf56..6e1579e7 100644
--- a/test-cases/RMLTC0002h-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002h-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT Name, Name FROM student";
+      rml:iterator "SELECT Name, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002h-SPARQL/mapping.ttl b/test-cases/RMLTC0002h-SPARQL/mapping.ttl
index da388a84..4498b805 100644
--- a/test-cases/RMLTC0002h-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0002h-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0002h-SQLServer/mapping.ttl b/test-cases/RMLTC0002h-SQLServer/mapping.ttl
index cdde6027..35a67236 100644
--- a/test-cases/RMLTC0002h-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002h-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT Name, Name FROM student";
+      rml:iterator "SELECT Name, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002i-MySQL/mapping.ttl b/test-cases/RMLTC0002i-MySQL/mapping.ttl
index 1be1496a..790f9448 100644
--- a/test-cases/RMLTC0002i-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002i-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT Name FROM student";
+      rml:iterator "SELECT Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002i-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002i-PostgreSQL/mapping.ttl
index 25d08ddc..2d103d24 100644
--- a/test-cases/RMLTC0002i-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002i-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT Name FROM student";
+      rml:iterator "SELECT Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002i-SQLServer/mapping.ttl b/test-cases/RMLTC0002i-SQLServer/mapping.ttl
index 0b72e6de..3525cef0 100644
--- a/test-cases/RMLTC0002i-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002i-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT Name FROM student";
+      rml:iterator "SELECT Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002j-MySQL/mapping.ttl b/test-cases/RMLTC0002j-MySQL/mapping.ttl
index dd8eeed6..61068933 100644
--- a/test-cases/RMLTC0002j-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002j-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT NoColumnName, Name FROM student";
+      rml:iterator "SELECT NoColumnName, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002j-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002j-PostgreSQL/mapping.ttl
index 6914e973..928c2806 100644
--- a/test-cases/RMLTC0002j-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002j-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT NoColumnName, Name FROM student";
+      rml:iterator "SELECT NoColumnName, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0002j-SQLServer/mapping.ttl b/test-cases/RMLTC0002j-SQLServer/mapping.ttl
index f25ee698..794c7488 100644
--- a/test-cases/RMLTC0002j-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002j-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT NoColumnName, Name FROM student";
+      rml:iterator "SELECT NoColumnName, Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0003a-MySQL/mapping.ttl b/test-cases/RMLTC0003a-MySQL/mapping.ttl
index d493633b..01394dab 100644
--- a/test-cases/RMLTC0003a-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0003a-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT FirstName, LastName FROM student";
+      rml:iterator "SELECT FirstName, LastName FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0003a-PostgreSQL/mapping.ttl b/test-cases/RMLTC0003a-PostgreSQL/mapping.ttl
index f238b510..ed3c6c4d 100644
--- a/test-cases/RMLTC0003a-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0003a-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT FirstName, LastName FROM student";
+      rml:iterator "SELECT FirstName, LastName FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0003a-SQLServer/mapping.ttl b/test-cases/RMLTC0003a-SQLServer/mapping.ttl
index 3d3c63f8..29f045cd 100644
--- a/test-cases/RMLTC0003a-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0003a-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT FirstName, LastName FROM student";
+      rml:iterator "SELECT FirstName, LastName FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>;
       rml:iterator "student"
diff --git a/test-cases/RMLTC0003b-MySQL/mapping.ttl b/test-cases/RMLTC0003b-MySQL/mapping.ttl
index cc140406..3b68c9b5 100644
--- a/test-cases/RMLTC0003b-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0003b-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT ID, LastName, CONCAT(`FirstName`, '', `LastName`) as Name FROM student";
+      rml:iterator "SELECT ID, LastName, CONCAT(`FirstName`, '', `LastName`) as Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0003b-PostgreSQL/mapping.ttl b/test-cases/RMLTC0003b-PostgreSQL/mapping.ttl
index bcaad0c3..12ae8dd6 100644
--- a/test-cases/RMLTC0003b-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0003b-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT id, lastname, concat_ws(firstname, '', lastname) as name FROM student";
+      rml:iterator "SELECT id, lastname, concat_ws(firstname, '', lastname) as name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0003b-SQLServer/mapping.ttl b/test-cases/RMLTC0003b-SQLServer/mapping.ttl
index d8f7ec07..ff4018ea 100644
--- a/test-cases/RMLTC0003b-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0003b-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query "SELECT ID, LastName, concat_ws(FirstName, '', LastName) as Name FROM student";
+      rml:iterator "SELECT ID, LastName, concat_ws(FirstName, '', LastName) as Name FROM student";
       rml:referenceFormulation rml:SQL2008Query;
       rml:source <http://example.com/base/#DB_source>
     ];
diff --git a/test-cases/RMLTC0003c-SPARQL/mapping.ttl b/test-cases/RMLTC0003c-SPARQL/mapping.ttl
index b636c119..ae49110c 100644
--- a/test-cases/RMLTC0003c-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0003c-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0004a-SPARQL/mapping.ttl b/test-cases/RMLTC0004a-SPARQL/mapping.ttl
index 1b81467c..0942b634 100644
--- a/test-cases/RMLTC0004a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0004a-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 ex:TriplesMap1 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -34,7 +34,7 @@ ex:TriplesMap1 a rml:TriplesMap;
 ex:TriplesMap2 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
                 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0004b-SPARQL/mapping.ttl b/test-cases/RMLTC0004b-SPARQL/mapping.ttl
index 91e91d14..21256006 100644
--- a/test-cases/RMLTC0004b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0004b-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 ex:TriplesMap1 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0006a-SPARQL/mapping.ttl b/test-cases/RMLTC0006a-SPARQL/mapping.ttl
index 2a6a5453..ab511c74 100644
--- a/test-cases/RMLTC0006a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0006a-SPARQL/mapping.ttl
@@ -5,7 +5,7 @@
 ex:TriplesMap1 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007a-SPARQL/mapping.ttl b/test-cases/RMLTC0007a-SPARQL/mapping.ttl
index dc02a2a8..4766f77e 100644
--- a/test-cases/RMLTC0007a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007a-SPARQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007b-SPARQL/mapping.ttl b/test-cases/RMLTC0007b-SPARQL/mapping.ttl
index 89b09488..18d2a2cd 100644
--- a/test-cases/RMLTC0007b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007b-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007c-SPARQL/mapping.ttl b/test-cases/RMLTC0007c-SPARQL/mapping.ttl
index e97be13c..4595c705 100644
--- a/test-cases/RMLTC0007c-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007c-SPARQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007d-SPARQL/mapping.ttl b/test-cases/RMLTC0007d-SPARQL/mapping.ttl
index bfb6aab8..305147e7 100644
--- a/test-cases/RMLTC0007d-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007d-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007e-SPARQL/mapping.ttl b/test-cases/RMLTC0007e-SPARQL/mapping.ttl
index ac32c7ae..384c4109 100644
--- a/test-cases/RMLTC0007e-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007e-SPARQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007f-SPARQL/mapping.ttl b/test-cases/RMLTC0007f-SPARQL/mapping.ttl
index 1bccfa54..075713ea 100644
--- a/test-cases/RMLTC0007f-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007f-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007g-SPARQL/mapping.ttl b/test-cases/RMLTC0007g-SPARQL/mapping.ttl
index acc66725..5870e4d7 100644
--- a/test-cases/RMLTC0007g-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007g-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0007h-SPARQL/mapping.ttl b/test-cases/RMLTC0007h-SPARQL/mapping.ttl
index 021414ee..d75a6754 100644
--- a/test-cases/RMLTC0007h-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0007h-SPARQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0008a-SPARQL/mapping.ttl b/test-cases/RMLTC0008a-SPARQL/mapping.ttl
index fa172b16..1da6a061 100644
--- a/test-cases/RMLTC0008a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0008a-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0008b-SPARQL/mapping.ttl b/test-cases/RMLTC0008b-SPARQL/mapping.ttl
index 324dfe39..97181fd6 100644
--- a/test-cases/RMLTC0008b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0008b-SPARQL/mapping.ttl
@@ -8,7 +8,7 @@
 ex:TriplesMap1 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -49,7 +49,7 @@ ex:RefObjectMap1 a rml:RefObjectMap;
 ex:TriplesMap2 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
                 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0008c-SPARQL/mapping.ttl b/test-cases/RMLTC0008c-SPARQL/mapping.ttl
index f8968988..e3cb7dbb 100644
--- a/test-cases/RMLTC0008c-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0008c-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
               PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
               PREFIX foaf: <http://xmlns.com/foaf/0.1/>
               PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0009a-SPARQL/mapping.ttl b/test-cases/RMLTC0009a-SPARQL/mapping.ttl
index 37df91ad..ff4473e5 100644
--- a/test-cases/RMLTC0009a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0009a-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
               PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
               PREFIX foaf: <http://xmlns.com/foaf/0.1/>
               PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -55,7 +55,7 @@
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
                 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0009b-SPARQL/mapping.ttl b/test-cases/RMLTC0009b-SPARQL/mapping.ttl
index 5abb5fd6..ed546830 100644
--- a/test-cases/RMLTC0009b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0009b-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
               PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
               PREFIX foaf: <http://xmlns.com/foaf/0.1/>
               PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -59,7 +59,7 @@
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
                 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0009c-MySQL/mapping.ttl b/test-cases/RMLTC0009c-MySQL/mapping.ttl
index e77d4641..d91b6e5a 100644
--- a/test-cases/RMLTC0009c-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0009c-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Name, COUNT(Sport)
         FROM Student
         GROUP BY Name
diff --git a/test-cases/RMLTC0009c-PostgreSQL/mapping.ttl b/test-cases/RMLTC0009c-PostgreSQL/mapping.ttl
index ed50d888..ac18f544 100644
--- a/test-cases/RMLTC0009c-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0009c-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Name, COUNT(Sport)
         FROM Student
         GROUP BY Name
diff --git a/test-cases/RMLTC0009c-SQLServer/mapping.ttl b/test-cases/RMLTC0009c-SQLServer/mapping.ttl
index 02d0a2ca..23c4f1dd 100644
--- a/test-cases/RMLTC0009c-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0009c-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Name, COUNT(Sport)
         FROM Student
         GROUP BY Name
diff --git a/test-cases/RMLTC0009d-MySQL/mapping.ttl b/test-cases/RMLTC0009d-MySQL/mapping.ttl
index 867d35a0..ce5b8cd7 100644
--- a/test-cases/RMLTC0009d-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0009d-MySQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Name, COUNT(Sport) as SPORTCOUNT
         FROM Student
         GROUP BY Name
diff --git a/test-cases/RMLTC0009d-PostgreSQL/mapping.ttl b/test-cases/RMLTC0009d-PostgreSQL/mapping.ttl
index 0a674de8..a701020d 100644
--- a/test-cases/RMLTC0009d-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0009d-PostgreSQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Name, COUNT(Sport) as SPORTCOUNT
         FROM Student
         GROUP BY Name
diff --git a/test-cases/RMLTC0009d-SQLServer/mapping.ttl b/test-cases/RMLTC0009d-SQLServer/mapping.ttl
index 99ee772f..e50b0333 100644
--- a/test-cases/RMLTC0009d-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0009d-SQLServer/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Name, COUNT(Sport) as SPORTCOUNT
         FROM Student
         GROUP BY Name
diff --git a/test-cases/RMLTC0011a-MySQL/mapping.ttl b/test-cases/RMLTC0011a-MySQL/mapping.ttl
index 0f2ebf58..b99f63b0 100644
--- a/test-cases/RMLTC0011a-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0011a-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
        SELECT Student.ID as ID,
               Student.FirstName as FirstName,
               Student.LastName as LastName,
@@ -44,7 +44,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
        SELECT * FROM Sport;
        """;
       rml:referenceFormulation rml:SQL2008Query;
diff --git a/test-cases/RMLTC0011a-PostgreSQL/mapping.ttl b/test-cases/RMLTC0011a-PostgreSQL/mapping.ttl
index 1f16dd7e..00faefd1 100644
--- a/test-cases/RMLTC0011a-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0011a-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
        SELECT Student.ID as ID,
               Student.FirstName as FirstName,
               Student.LastName as LastName,
@@ -44,7 +44,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
        SELECT * FROM Sport ;
        """;
       rml:referenceFormulation rml:SQL2008Query;
diff --git a/test-cases/RMLTC0011a-SQLServer/mapping.ttl b/test-cases/RMLTC0011a-SQLServer/mapping.ttl
index e87eaaa7..1f3daafb 100644
--- a/test-cases/RMLTC0011a-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0011a-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
        SELECT Student.ID as ID,
               Student.FirstName as FirstName,
               Student.LastName as LastName,
@@ -44,7 +44,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
        SELECT * FROM Sport ;
        """;
       rml:referenceFormulation rml:SQL2008Query;
diff --git a/test-cases/RMLTC0012a-SPARQL/mapping.ttl b/test-cases/RMLTC0012a-SPARQL/mapping.ttl
index 20b589fc..2c5eb8f5 100644
--- a/test-cases/RMLTC0012a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0012a-SPARQL/mapping.ttl
@@ -5,7 +5,7 @@
 
 <http://example.com/base#Country> rml:logicalSource [
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0012b-SPARQL/mapping.ttl b/test-cases/RMLTC0012b-SPARQL/mapping.ttl
index 631e725c..6c1a9681 100644
--- a/test-cases/RMLTC0012b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0012b-SPARQL/mapping.ttl
@@ -6,7 +6,7 @@
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
               PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
               PREFIX foaf: <http://xmlns.com/foaf/0.1/>
               PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -35,7 +35,7 @@
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
                 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
diff --git a/test-cases/RMLTC0014d-MySQL/mapping.ttl b/test-cases/RMLTC0014d-MySQL/mapping.ttl
index 08677663..7377f7b4 100644
--- a/test-cases/RMLTC0014d-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0014d-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
       SELECT EMP.*, (CASE job
         WHEN 'CLERK' THEN 'general-office'
         WHEN 'NIGHTGUARD' THEN 'security'
diff --git a/test-cases/RMLTC0014d-PostgreSQL/mapping.ttl b/test-cases/RMLTC0014d-PostgreSQL/mapping.ttl
index d9ab26cb..27108093 100644
--- a/test-cases/RMLTC0014d-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0014d-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
       SELECT EMP.*, (CASE job
         WHEN 'CLERK' THEN 'general-office'
         WHEN 'NIGHTGUARD' THEN 'security'
diff --git a/test-cases/RMLTC0014d-SQLServer/mapping.ttl b/test-cases/RMLTC0014d-SQLServer/mapping.ttl
index e043a8a4..64f797ae 100644
--- a/test-cases/RMLTC0014d-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0014d-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
       SELECT EMP.*, (CASE job
         WHEN 'CLERK' THEN 'general-office'
         WHEN 'NIGHTGUARD' THEN 'security'
diff --git a/test-cases/RMLTC0015a-MySQL/mapping.ttl b/test-cases/RMLTC0015a-MySQL/mapping.ttl
index b9600a05..e4e3026a 100644
--- a/test-cases/RMLTC0015a-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0015a-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Code, Name, Lan
         FROM Country
         WHERE Lan = 'EN';
@@ -25,7 +25,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT \"Code\", \"Name\", \"Lan\"
         FROM \"Country\"
         WHERE \"Lan\" = 'ES';
diff --git a/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl b/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl
index 3955e805..697b4958 100644
--- a/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Code, Name, Lan
         FROM Country
         WHERE Lan = 'EN';
@@ -25,7 +25,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT \"Code\", \"Name\", \"Lan\"
         FROM \"Country\"
         WHERE \"Lan\" = 'ES';
diff --git a/test-cases/RMLTC0015a-SQLServer/mapping.ttl b/test-cases/RMLTC0015a-SQLServer/mapping.ttl
index 587dbceb..ceca9dad 100644
--- a/test-cases/RMLTC0015a-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0015a-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Code, Name, Lan
         FROM Country
         WHERE Lan = 'EN';
@@ -25,7 +25,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT \"Code\", \"Name\", \"Lan\"
         FROM \"Country\"
         WHERE \"Lan\" = 'ES';
diff --git a/test-cases/RMLTC0015b-MySQL/mapping.ttl b/test-cases/RMLTC0015b-MySQL/mapping.ttl
index 2ccbdfc9..7dfc40e3 100644
--- a/test-cases/RMLTC0015b-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0015b-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT Code, Name, Lan
         FROM Country
         WHERE Lan = 'EN';
@@ -25,7 +25,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query """
+      rml:iterator """
             SELECT \"Code\", \"Name\", \"Lan\"
             FROM \"Country\"
             WHERE \"Lan\" = 'ES';
diff --git a/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl b/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl
index dbdacc3a..b00653d1 100644
--- a/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query """
+      rml:iterator """
         SELECT Code, Name, Lan
         FROM Country
         WHERE Lan = 'EN';
@@ -25,7 +25,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query """
+      rml:iterator """
             SELECT \"Code\", \"Name\", \"Lan\"
             FROM \"Country\"
             WHERE \"Lan\" = 'ES';
diff --git a/test-cases/RMLTC0015b-SQLServer/mapping.ttl b/test-cases/RMLTC0015b-SQLServer/mapping.ttl
index 4ab1c1ac..2d54f26d 100644
--- a/test-cases/RMLTC0015b-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0015b-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query """
+      rml:iterator """
         SELECT Code, Name, Lan
         FROM Country
         WHERE Lan = 'EN';
@@ -25,7 +25,7 @@
 
 <http://example.com/base/TriplesMap2> a rml:TriplesMap;
   rml:logicalSource [
-      rml:query """
+      rml:iterator """
             SELECT \"Code\", \"Name\", \"Lan\"
             FROM \"Country\"
             WHERE \"Lan\" = 'ES';
diff --git a/test-cases/RMLTC0019a-MySQL/mapping.ttl b/test-cases/RMLTC0019a-MySQL/mapping.ttl
index 5ca0c9ee..514e6594 100644
--- a/test-cases/RMLTC0019a-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0019a-MySQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT ID, FirstName, LastName
         FROM Employee
         WHERE ID < 30
diff --git a/test-cases/RMLTC0019a-PostgreSQL/mapping.ttl b/test-cases/RMLTC0019a-PostgreSQL/mapping.ttl
index 38908935..0a57c29f 100644
--- a/test-cases/RMLTC0019a-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0019a-PostgreSQL/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT ID, FirstName, LastName
         FROM Employee
         WHERE ID < 30
diff --git a/test-cases/RMLTC0019a-SQLServer/mapping.ttl b/test-cases/RMLTC0019a-SQLServer/mapping.ttl
index 211c81c9..808b17d2 100644
--- a/test-cases/RMLTC0019a-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0019a-SQLServer/mapping.ttl
@@ -4,7 +4,7 @@
 
 <http://example.com/base/TriplesMap1> a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
-      rml:query """
+      rml:iterator """
         SELECT ID, FirstName, LastName
         FROM Employee
         WHERE ID < 30
diff --git a/test-cases/RMLTC0021a-SPARQL/mapping.ttl b/test-cases/RMLTC0021a-SPARQL/mapping.ttl
index 1c9539f5..e7952eac 100644
--- a/test-cases/RMLTC0021a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0021a-SPARQL/mapping.ttl
@@ -12,7 +12,7 @@ ex:RefObjectMap1 a rml:RefObjectMap;
 ex:TriplesMap1 a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
       rml:iterator "$.results.bindings[*]";
-      rml:query """
+      rml:iterator """
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>