diff --git a/test-cases/RMLTC0000-SPARQL/mapping.ttl b/test-cases/RMLTC0000-SPARQL/mapping.ttl
index 794272e..9bef56d 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 2344386..86bd32a 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 286106b..054eefd 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 5671a85..43c823a 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 2344386..86bd32a 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 71518f4..d790ebb 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 49af8fc..92b9f02 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 ee1811f..25a07f2 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 46cb56d..d4a2bb0 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 48ff403..2b20b14 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 e221587..e7355d7 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 02d6783..281f0f3 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 6780105..8e015c4 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 5bd3650..a3a7df5 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 ec1222f..cc64991 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 117594d..f081204 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 1b7cbf5..6e1579e 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 da388a8..4498b80 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 cdde602..35a6723 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 1be1496..790f944 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 25d08dd..2d103d2 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 0b72e6d..3525cef 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 dd8eeed..6106893 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 6914e97..928c280 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 f25ee69..794c748 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 d493633..01394da 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 f238b51..ed3c6c4 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 3d3c63f..29f045c 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 cc14040..3b68c9b 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 bcaad0c..12ae8dd 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 d8f7ec0..ff4018e 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 b636c11..ae49110 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 1b81467..0942b63 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 91e91d1..2125600 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 2a6a545..ab511c7 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 dc02a2a..4766f77 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 89b0948..18d2a2c 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 e97be13..4595c70 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 bfb6aab..305147e 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 ac32c7a..384c410 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 1bccfa5..075713e 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 acc6672..5870e4d 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 021414e..d75a675 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 fa172b1..1da6a06 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 324dfe3..97181fd 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 f896898..e3cb7db 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 37df91a..ff4473e 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 5abb5fd..ed54683 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 e77d464..d91b6e5 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 ed50d88..ac18f54 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 02d0a2c..23c4f1d 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 867d35a..ce5b8cd 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 0a674de..a701020 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 99ee772..e50b033 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 0f2ebf5..b99f63b 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 1f16dd7..00faefd 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 e87eaaa..1f3daaf 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 20b589f..2c5eb8f 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 631e725..6c1a968 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 0867766..7377f7b 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 d9ab26c..2710809 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 e043a8a..64f797a 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 b9600a0..e4e3026 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 3955e80..697b495 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 587dbce..ceca9da 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 2ccbdfc..7dfc40e 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 dbdacc3..b00653d 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 4ab1c1a..2d54f26 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 5ca0c9e..514e659 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 3890893..0a57c29 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 211c81c..808b17d 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 1c9539f..e7952ea 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#>