diff --git a/test-cases/RMLTC-CC-0001-Alt/mapping.ttl b/test-cases/RMLTC-CC-0001-Alt/mapping.ttl
index 92a3c1a..a72409e 100644
--- a/test-cases/RMLTC-CC-0001-Alt/mapping.ttl
+++ b/test-cases/RMLTC-CC-0001-Alt/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:Alt ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0001-Bag/mapping.ttl b/test-cases/RMLTC-CC-0001-Bag/mapping.ttl
index 2d021d2..20d9348 100644
--- a/test-cases/RMLTC-CC-0001-Bag/mapping.ttl
+++ b/test-cases/RMLTC-CC-0001-Bag/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:Bag ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0001-List/mapping.ttl b/test-cases/RMLTC-CC-0001-List/mapping.ttl
index 78c4a60..ca963e3 100644
--- a/test-cases/RMLTC-CC-0001-List/mapping.ttl
+++ b/test-cases/RMLTC-CC-0001-List/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0001-Seq/mapping.ttl b/test-cases/RMLTC-CC-0001-Seq/mapping.ttl
index 249ac4d..2117ebd 100644
--- a/test-cases/RMLTC-CC-0001-Seq/mapping.ttl
+++ b/test-cases/RMLTC-CC-0001-Seq/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:Seq ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0002-Bag/mapping.ttl b/test-cases/RMLTC-CC-0002-Bag/mapping.ttl
index 2f6ecb7..9924fa0 100644
--- a/test-cases/RMLTC-CC-0002-Bag/mapping.ttl
+++ b/test-cases/RMLTC-CC-0002-Bag/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:template "c/{id}" ;
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:template "c/{$.id}" ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:Bag ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0002-List/mapping.ttl b/test-cases/RMLTC-CC-0002-List/mapping.ttl
index b3a40da..7714965 100644
--- a/test-cases/RMLTC-CC-0002-List/mapping.ttl
+++ b/test-cases/RMLTC-CC-0002-List/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:template "c/{id}" ;
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:template "c/{$.id}" ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0003-EB/mapping.ttl b/test-cases/RMLTC-CC-0003-EB/mapping.ttl
index 966dd18..7ed744a 100644
--- a/test-cases/RMLTC-CC-0003-EB/mapping.ttl
+++ b/test-cases/RMLTC-CC-0003-EB/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
             rml:allowEmptyListAndContainer true ;
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:Bag ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0003-EL/mapping.ttl b/test-cases/RMLTC-CC-0003-EL/mapping.ttl
index 233e97b..87f8919 100644
--- a/test-cases/RMLTC-CC-0003-EL/mapping.ttl
+++ b/test-cases/RMLTC-CC-0003-EL/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
             rml:allowEmptyListAndContainer true ;
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0003-NEB/mapping.ttl b/test-cases/RMLTC-CC-0003-NEB/mapping.ttl
index 2d021d2..20d9348 100644
--- a/test-cases/RMLTC-CC-0003-NEB/mapping.ttl
+++ b/test-cases/RMLTC-CC-0003-NEB/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:Bag ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0003-NEL/mapping.ttl b/test-cases/RMLTC-CC-0003-NEL/mapping.ttl
index 78c4a60..ca963e3 100644
--- a/test-cases/RMLTC-CC-0003-NEL/mapping.ttl
+++ b/test-cases/RMLTC-CC-0003-NEL/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0003-NELb/mapping.ttl b/test-cases/RMLTC-CC-0003-NELb/mapping.ttl
index 3d23e2d..6da934a 100644
--- a/test-cases/RMLTC-CC-0003-NELb/mapping.ttl
+++ b/test-cases/RMLTC-CC-0003-NELb/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
             rml:allowEmptyListAndContainer false ;
-            rml:gather ( [ rml:reference "values.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0004-SM1/mapping.ttl b/test-cases/RMLTC-CC-0004-SM1/mapping.ttl
index 2ffeb8f..19eee71 100644
--- a/test-cases/RMLTC-CC-0004-SM1/mapping.ttl
+++ b/test-cases/RMLTC-CC-0004-SM1/mapping.ttl
@@ -11,7 +11,7 @@
     ] ;
 
     rml:subjectMap [
-        rml:gather ( [ rml:reference "values.*" ; ] ) ;
+        rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
         rml:gatherAs rdf:List ;
     ] ;
 
diff --git a/test-cases/RMLTC-CC-0004-SM2/mapping.ttl b/test-cases/RMLTC-CC-0004-SM2/mapping.ttl
index 629b478..b0db209 100644
--- a/test-cases/RMLTC-CC-0004-SM2/mapping.ttl
+++ b/test-cases/RMLTC-CC-0004-SM2/mapping.ttl
@@ -11,7 +11,7 @@
     ] ;
 
     rml:subjectMap [
-        rml:gather ( [ rml:reference "values.*" ; ] ) ;
+        rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
         rml:gatherAs rdf:List ;
     ] ;
 .
diff --git a/test-cases/RMLTC-CC-0004-SM3/mapping.ttl b/test-cases/RMLTC-CC-0004-SM3/mapping.ttl
index 629b478..b0db209 100644
--- a/test-cases/RMLTC-CC-0004-SM3/mapping.ttl
+++ b/test-cases/RMLTC-CC-0004-SM3/mapping.ttl
@@ -11,7 +11,7 @@
     ] ;
 
     rml:subjectMap [
-        rml:gather ( [ rml:reference "values.*" ; ] ) ;
+        rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
         rml:gatherAs rdf:List ;
     ] ;
 .
diff --git a/test-cases/RMLTC-CC-0004-SM4/mapping.ttl b/test-cases/RMLTC-CC-0004-SM4/mapping.ttl
index 3f06728..a6f85e5 100644
--- a/test-cases/RMLTC-CC-0004-SM4/mapping.ttl
+++ b/test-cases/RMLTC-CC-0004-SM4/mapping.ttl
@@ -11,7 +11,7 @@
     ] ;
 
     rml:subjectMap [
-        rml:gather ( [ rml:reference "values.*" ; ] ) ;
+        rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
         rml:gatherAs rdf:Bag ;
     ] ;
 
diff --git a/test-cases/RMLTC-CC-0004-SM5/mapping.ttl b/test-cases/RMLTC-CC-0004-SM5/mapping.ttl
index 1c5fb81..b8cbc6a 100644
--- a/test-cases/RMLTC-CC-0004-SM5/mapping.ttl
+++ b/test-cases/RMLTC-CC-0004-SM5/mapping.ttl
@@ -11,7 +11,7 @@
     ] ;
 
     rml:subjectMap [
-        rml:gather ( [ rml:reference "values.*" ; ] ) ;
+        rml:gather ( [ rml:reference "$.values.*" ; ] ) ;
         rml:gatherAs rdf:Bag ;
     ] ;
 .
diff --git a/test-cases/RMLTC-CC-0005-App1/mapping.ttl b/test-cases/RMLTC-CC-0005-App1/mapping.ttl
index 62a2471..b8b8b2f 100644
--- a/test-cases/RMLTC-CC-0005-App1/mapping.ttl
+++ b/test-cases/RMLTC-CC-0005-App1/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "v1.*" ; ] [ rml:reference "v2.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] [ rml:reference "$.v2.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0005-App2/mapping.ttl b/test-cases/RMLTC-CC-0005-App2/mapping.ttl
index 62a2471..b8b8b2f 100644
--- a/test-cases/RMLTC-CC-0005-App2/mapping.ttl
+++ b/test-cases/RMLTC-CC-0005-App2/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "v1.*" ; ] [ rml:reference "v2.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] [ rml:reference "$.v2.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0005-Car1/mapping.ttl b/test-cases/RMLTC-CC-0005-Car1/mapping.ttl
index ab5cd07..6a91a0d 100644
--- a/test-cases/RMLTC-CC-0005-Car1/mapping.ttl
+++ b/test-cases/RMLTC-CC-0005-Car1/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "v1.*" ; ] [ rml:reference "v2.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] [ rml:reference "$.v2.*" ; ] ) ;
             rml:gatherAs rdf:List ;
             rml:strategy rml:cartesianProduct ;
         ] ;
diff --git a/test-cases/RMLTC-CC-0005-Car2/mapping.ttl b/test-cases/RMLTC-CC-0005-Car2/mapping.ttl
index ab5cd07..6a91a0d 100644
--- a/test-cases/RMLTC-CC-0005-Car2/mapping.ttl
+++ b/test-cases/RMLTC-CC-0005-Car2/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "v1.*" ; ] [ rml:reference "v2.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] [ rml:reference "$.v2.*" ; ] ) ;
             rml:gatherAs rdf:List ;
             rml:strategy rml:cartesianProduct ;
         ] ;
diff --git a/test-cases/RMLTC-CC-0006-IT0/mapping.ttl b/test-cases/RMLTC-CC-0006-IT0/mapping.ttl
index b573f51..0a156f5 100644
--- a/test-cases/RMLTC-CC-0006-IT0/mapping.ttl
+++ b/test-cases/RMLTC-CC-0006-IT0/mapping.ttl
@@ -11,13 +11,13 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:gather ( [ rml:reference "v1.*" ; ] ) ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0006-IT1/mapping.ttl b/test-cases/RMLTC-CC-0006-IT1/mapping.ttl
index 70c3ec3..847277c 100644
--- a/test-cases/RMLTC-CC-0006-IT1/mapping.ttl
+++ b/test-cases/RMLTC-CC-0006-IT1/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:template "c/{id}" ;
-            rml:gather ( [ rml:reference "v1.*" ; ] ) ;
+            rml:template "c/{$.id}" ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0006-IT2/mapping.ttl b/test-cases/RMLTC-CC-0006-IT2/mapping.ttl
index 2337164..14e90fe 100644
--- a/test-cases/RMLTC-CC-0006-IT2/mapping.ttl
+++ b/test-cases/RMLTC-CC-0006-IT2/mapping.ttl
@@ -11,14 +11,14 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
         rml:predicate ex:with ;
         rml:objectMap [
-            rml:template "c/{id}" ;
-            rml:gather ( [ rml:reference "v1.*" ; ] [ rml:reference "v2.*" ; ] ) ;
+            rml:template "c/{$.id}" ;
+            rml:gather ( [ rml:reference "$.v1.*" ; ] [ rml:reference "$.v2.*" ; ] ) ;
             rml:gatherAs rdf:List ;
         ] ;
     ] ;
diff --git a/test-cases/RMLTC-CC-0007-NES/mapping.ttl b/test-cases/RMLTC-CC-0007-NES/mapping.ttl
index 77e70c8..98d2787 100644
--- a/test-cases/RMLTC-CC-0007-NES/mapping.ttl
+++ b/test-cases/RMLTC-CC-0007-NES/mapping.ttl
@@ -11,7 +11,7 @@
     ] ;
 
     rml:subjectMap [
-        rml:template "e/{id}" ;
+        rml:template "e/{$.id}" ;
     ] ;
 
     rml:predicateObjectMap [
@@ -19,11 +19,11 @@
         rml:objectMap [
             rml:gather (
                 [
-                    rml:gather ( [ rml:reference "v1.*" ; ] ) ;
+                    rml:gather ( [ rml:reference "$.v1.*" ; ] ) ;
                     rml:gatherAs rdf:Bag ;
                 ]
                 [
-                    rml:gather ( [ rml:reference "v2.*" ; ] ) ;
+                    rml:gather ( [ rml:reference "$.v2.*" ; ] ) ;
                     rml:gatherAs rdf:Bag ;
                 ]
             ) ;