diff --git a/test-cases/RMLTC0010a-JSON/README.md b/test-cases/RMLTC0010a-JSON/README.md
index f465982..96fd16a 100644
--- a/test-cases/RMLTC0010a-JSON/README.md
+++ b/test-cases/RMLTC0010a-JSON/README.md
@@ -49,7 +49,7 @@
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}"
+      rml:template "http://example.com/{$['Country Code']}"
     ] .
 
 ```
diff --git a/test-cases/RMLTC0010a-JSON/mapping.ttl b/test-cases/RMLTC0010a-JSON/mapping.ttl
index 370edb7..76ab476 100644
--- a/test-cases/RMLTC0010a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010a-JSON/mapping.ttl
@@ -17,5 +17,5 @@
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}"
+      rml:template "http://example.com/{$['Country Code']}"
     ] .
diff --git a/test-cases/RMLTC0010b-JSON/README.md b/test-cases/RMLTC0010b-JSON/README.md
index a91ee54..026cd3d 100644
--- a/test-cases/RMLTC0010b-JSON/README.md
+++ b/test-cases/RMLTC0010b-JSON/README.md
@@ -49,7 +49,7 @@
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}/{$.Name}"
+      rml:template "http://example.com/{$['Country Code']}/{$.Name}"
     ] .
 
 ```
diff --git a/test-cases/RMLTC0010b-JSON/mapping.ttl b/test-cases/RMLTC0010b-JSON/mapping.ttl
index 1f9f4db..b40e961 100644
--- a/test-cases/RMLTC0010b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010b-JSON/mapping.ttl
@@ -17,5 +17,5 @@
       rml:predicate ex:name
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}/{$.Name}"
+      rml:template "http://example.com/{$['Country Code']}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0010c-JSON/README.md b/test-cases/RMLTC0010c-JSON/README.md
index 6229857..784c294 100644
--- a/test-cases/RMLTC0010c-JSON/README.md
+++ b/test-cases/RMLTC0010c-JSON/README.md
@@ -45,12 +45,12 @@
   rml:predicateObjectMap [
       rml:predicate ex:code;
       rml:objectMap [
-          rml:template "\\{\\{\\{ {$.['ISO 3166']} \\}\\}\\}";
+          rml:template "\\{\\{\\{ {$['ISO 3166']} \\}\\}\\}";
           rml:termType rml:Literal
         ]
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}/{$.Name}"
+      rml:template "http://example.com/{$['Country Code']}/{$.Name}"
     ] .
 
 ```
diff --git a/test-cases/RMLTC0010c-JSON/mapping.ttl b/test-cases/RMLTC0010c-JSON/mapping.ttl
index fb1afc8..1d8c58b 100644
--- a/test-cases/RMLTC0010c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0010c-JSON/mapping.ttl
@@ -13,10 +13,10 @@
   rml:predicateObjectMap [
       rml:predicate ex:code;
       rml:objectMap [
-          rml:template "\\{\\{\\{ {$.['ISO 3166']} \\}\\}\\}";
+          rml:template "\\{\\{\\{ {$['ISO 3166']} \\}\\}\\}";
           rml:termType rml:Literal
         ]
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{$.['Country Code']}/{$.Name}"
+      rml:template "http://example.com/{$['Country Code']}/{$.Name}"
     ] .
diff --git a/test-cases/RMLTC0023f-JSON/README.md b/test-cases/RMLTC0023f-JSON/README.md
index e786a76..fe4d09f 100644
--- a/test-cases/RMLTC0023f-JSON/README.md
+++ b/test-cases/RMLTC0023f-JSON/README.md
@@ -34,7 +34,7 @@
         ]
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{\\{Name\\}}";
+      rml:template "http://example.com/{$['\\{Name\\}']}";
       rml:class foaf:Person;
     ] .
 
diff --git a/test-cases/RMLTC0023f-JSON/mapping.ttl b/test-cases/RMLTC0023f-JSON/mapping.ttl
index 6a61906..cdd7443 100644
--- a/test-cases/RMLTC0023f-JSON/mapping.ttl
+++ b/test-cases/RMLTC0023f-JSON/mapping.ttl
@@ -11,7 +11,7 @@
         ]
     ];
   rml:subjectMap [
-      rml:template "http://example.com/{\\{Name\\}}";
+      rml:template "http://example.com/{$['\\{Name\\}']}";
       rml:class foaf:Person;
     ] .
 
diff --git a/test-cases/RMLTC0028a-JSON/README.md b/test-cases/RMLTC0028a-JSON/README.md
index d5d5cec..66395c5 100644
--- a/test-cases/RMLTC0028a-JSON/README.md
+++ b/test-cases/RMLTC0028a-JSON/README.md
@@ -28,7 +28,7 @@
       ]
     ];
     rml:subjectMap [
-      rml:template "https://example.org/instances/{id}";
+      rml:template "https://example.org/instances/{$.id}";
     ];
     rml:predicateObjectMap [
       rml:predicate <http://example.org/ns/p> ;
diff --git a/test-cases/RMLTC0028a-JSON/mapping.ttl b/test-cases/RMLTC0028a-JSON/mapping.ttl
index 140141f..7566d12 100644
--- a/test-cases/RMLTC0028a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0028a-JSON/mapping.ttl
@@ -10,7 +10,7 @@
       ]
     ];
     rml:subjectMap [
-      rml:template "https://example.org/instances/{id}";
+      rml:template "https://example.org/instances/{$.id}";
     ];
     rml:predicateObjectMap [
       rml:predicate <http://example.org/ns/p> ;
diff --git a/test-cases/RMLTC0028b-JSON/README.md b/test-cases/RMLTC0028b-JSON/README.md
index 4428a0a..5c68f81 100644
--- a/test-cases/RMLTC0028b-JSON/README.md
+++ b/test-cases/RMLTC0028b-JSON/README.md
@@ -29,7 +29,7 @@
       ]
     ];
     rml:subjectMap [
-      rml:template "https://example.org/instances/{id}";
+      rml:template "https://example.org/instances/{$.id}";
       rml:class s:Person ;
       rml:graph <graph:1> ;
     ];
diff --git a/test-cases/RMLTC0028b-JSON/mapping.ttl b/test-cases/RMLTC0028b-JSON/mapping.ttl
index 9564c1e..c6721db 100644
--- a/test-cases/RMLTC0028b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0028b-JSON/mapping.ttl
@@ -11,7 +11,7 @@
       ]
     ];
     rml:subjectMap [
-      rml:template "https://example.org/instances/{id}";
+      rml:template "https://example.org/instances/{$.id}";
       rml:class s:Person ;
       rml:graph <graph:1> ;
     ];
diff --git a/test-cases/RMLTC0028c-JSON/README.md b/test-cases/RMLTC0028c-JSON/README.md
index 2a0a6d0..8d8a628 100644
--- a/test-cases/RMLTC0028c-JSON/README.md
+++ b/test-cases/RMLTC0028c-JSON/README.md
@@ -28,7 +28,7 @@
       ]
     ];
     rml:subjectMap [
-      rml:template "https://example.org/instances/{id}";
+      rml:template "https://example.org/instances/{$.id}";
     ];
     rml:predicateObjectMap [
       rml:predicate <http://example.org/ns/p> ;
diff --git a/test-cases/RMLTC0028c-JSON/mapping.ttl b/test-cases/RMLTC0028c-JSON/mapping.ttl
index 8c9145d..02ec085 100644
--- a/test-cases/RMLTC0028c-JSON/mapping.ttl
+++ b/test-cases/RMLTC0028c-JSON/mapping.ttl
@@ -10,7 +10,7 @@
       ]
     ];
     rml:subjectMap [
-      rml:template "https://example.org/instances/{id}";
+      rml:template "https://example.org/instances/{$.id}";
     ];
     rml:predicateObjectMap [
       rml:predicate <http://example.org/ns/p> ;