--- a/D001-1table1row/r2rmla.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D001-1table1row/r2rmla.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,10 +5,9 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-    a rr:TriplesMapClass;
+    a rr:TriplesMap;
     
-    rr:tableOwner "boricles";
-    rr:tableName "Student";
+    rr:logicalTable [ rr:tableName "boricles.Student" ];
 
     rr:subjectMap [ rr:template "http://example.com/{Name}" ]; 
 	
@@ -17,4 +16,4 @@
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ rr:column "Name" ]
     ]
-    .
\ No newline at end of file
+    .

--- a/D001-1table1row/r2rmlb.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D001-1table1row/r2rmlb.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,16 +5,15 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-    a rr:TriplesMapClass;
+    a rr:TriplesMap;
     
-    rr:tableOwner "boricles";
-    rr:tableName "Student";
+    rr:logicalTable [ rr:tableName "boricles.Student" ];
 
-    rr:subjectMap [ rr:column "Name"; rr:termtype "BlankNode" ]; 
+    rr:subjectMap [ rr:column "Name"; rr:termType "BlankNode" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ rr:column "Name" ]
     ]
-    .
\ No newline at end of file
+    .

--- a/D002-1table2columns1row/r2rmla.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D002-1table2columns1row/r2rmla.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,10 +5,9 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-    a rr:TriplesMapClass;
+    a rr:TriplesMap;
     
-    rr:tableOwner "boricles";
-    rr:tableName "Student";
+    rr:logicalTable [ rr:tableName "boricles.Student" ];
 
     rr:subjectMap [ rr:template "http://example.com/{ID}{Name}";
                     rr:class foaf:Person ];

--- a/D002-1table2columns1row/r2rmlb.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D002-1table2columns1row/r2rmlb.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,16 +5,18 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-     a rr:TriplesMapClass;
+     a rr:TriplesMap;
     
-    rr:SQLQuery """
-       Select ('Student' || ID ) AS "StudentId"
-            , ID
-            , Name
-         from Student
-       """;
+    rr:logicalTable [ 
+                     rr:sqlQuery """
+                       Select ('Student' || ID ) AS "StudentId"
+                            , ID
+                            , Name
+                         from Student
+                       """
+                       ];
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termtype "BlankNode"; rr:class foaf:Person ];
+    rr:subjectMap [ rr:column "StudentId"; rr:termType "BlankNode"; rr:class foaf:Person ];
 
     rr:predicateObjectMap
     [ 
@@ -27,4 +29,4 @@
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ rr:column "Name" ]
     ]
-    .
\ No newline at end of file
+    .

--- a/D003-1table3columns1row/mappeda.trig	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/mappeda.trig	Wed Jul 20 17:51:28 2011 +0100
@@ -3,7 +3,7 @@
 @prefix ex: <http://example.com/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-ex:Student10VenusWilliams rdf:type foaf:Person
+ex:Student10VenusWilliams rdf:type foaf:Person;
                           ex:id "10"^^xsd:integer;
                           foaf:firstName "Venus";
-                          foaf:lastName "Williams".
\ No newline at end of file
+                          foaf:lastName "Williams".

--- a/D003-1table3columns1row/mappedb.trig	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/mappedb.trig	Wed Jul 20 17:51:28 2011 +0100
@@ -3,6 +3,6 @@
 @prefix ex: <http://example.com/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-ex:Student10VenusWilliams rdf:type foaf:Person
+ex:Student10VenusWilliams rdf:type foaf:Person;
                           ex:id "10"^^xsd:integer;
-                          foaf:name "Venus Williams". 
\ No newline at end of file
+                          foaf:name "Venus Williams". 

--- a/D003-1table3columns1row/mappedc.trig	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/mappedc.trig	Wed Jul 20 17:51:28 2011 +0100
@@ -3,7 +3,7 @@
 @prefix ex: <http://example.com/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-_:Student10VenusWilliams rdf:type foaf:Person
+_:Student10VenusWilliams rdf:type foaf:Person;
                          ex:id "10"^^xsd:integer;
                          foaf:firstName "Venus";
-                         foaf:lastName "Williams". 
\ No newline at end of file
+                         foaf:lastName "Williams". 

--- a/D003-1table3columns1row/mappedd.trig	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/mappedd.trig	Wed Jul 20 17:51:28 2011 +0100
@@ -3,6 +3,6 @@
 @prefix ex: <http://example.com/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-_:Student10VenusWilliams rdf:type foaf:Person
+_:Student10VenusWilliams rdf:type foaf:Person;
                          ex:id "10"^^xsd:integer;
-                         foaf:name "Venus Williams". 
\ No newline at end of file
+                         foaf:name "Venus Williams". 

--- a/D003-1table3columns1row/r2rmla.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/r2rmla.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,10 +5,9 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-     a rr:TriplesMapClass;
+     a rr:TriplesMap;
 
-    rr:tableOwner "boricles";
-    rr:tableName "Student";
+     rr:logicalTable [ rr:tableName "boricles.Student" ];
 
     rr:subjectMap [ rr:template "http://example.com/Student{ID}{FirstName}{LastName}";
                     rr:class foaf:Person  ];
@@ -30,4 +29,4 @@
       rr:predicateMap [ rr:predicate foaf:lastName ]; 
       rr:objectMap    [ rr:column "LastName" ]
     ]
-    .
\ No newline at end of file
+    .

--- a/D003-1table3columns1row/r2rmlb.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/r2rmlb.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,15 +5,17 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-     a rr:TriplesMapClass;
+     a rr:TriplesMap;
 
-      rr:SQLQuery """
-      SELECT ID,
-             (FirstName || ' ' || LastName) AS Name,
-             FirstName,
-             LastName
-      FROM Student
-      """;
+     rr:logicalTable [ 
+                     rr:sqlQuery """
+                     SELECT ID,
+                            (FirstName || ' ' || LastName) AS Name,
+                            FirstName,
+                            LastName
+                     FROM Student
+                     """
+                     ];
 
     rr:subjectMap [ rr:template "http://example.com/Student{ID}{FirstName}{LastName}"; 
                     rr:class foaf:Person ];
@@ -29,4 +31,4 @@
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ rr:column "Name" ]
     ]
-    .
\ No newline at end of file
+    .

--- a/D003-1table3columns1row/r2rmlc.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/r2rmlc.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,17 +5,19 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-     a rr:TriplesMapClass;
+     a rr:TriplesMap;
 
-      rr:SQLQuery """
-      SELECT ('Student' || ID || FirstName || LastName) as StudentID,
-             ID,
-             FirstName,
-             LastName
-      FROM Student
-      """;
+     rr:logicalTable [ 
+                      rr:sqlQuery """
+                     SELECT ('Student' || ID || FirstName || LastName) as StudentID,
+                            ID,
+                            FirstName,
+                            LastName
+                     FROM Student
+                     """
+                     ];
 
-    rr:subjectMap [ rr:column "StudentID"; rr:termtype "BlankNode";
+    rr:subjectMap [ rr:column "StudentID"; rr:termType "BlankNode";
                     rr:class foaf:Person  ];
 	
     rr:predicateObjectMap
@@ -35,4 +37,4 @@
       rr:predicateMap [ rr:predicate foaf:lastName ]; 
       rr:objectMap    [ rr:column "LastName" ]
     ]
-    .
\ No newline at end of file
+    .

--- a/D003-1table3columns1row/r2rmld.ttl	Wed Jul 13 15:39:53 2011 +0100
+++ b/D003-1table3columns1row/r2rmld.ttl	Wed Jul 20 17:51:28 2011 +0100
@@ -5,16 +5,18 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-     a rr:TriplesMapClass;
+     a rr:TriplesMap;
 
-      rr:SQLQuery """
-      SELECT ('Student' || ID || FirstName || LastName) as StudentID,
-             ID,
-             (FirstName || ' ' || LastName) AS Name
-      FROM Student
-      """;
+     rr:logicalTable [ 
+                      rr:sqlQuery """
+                     SELECT ('Student' || ID || FirstName || LastName) as StudentID,
+                            ID,
+                            (FirstName || ' ' || LastName) AS Name
+                     FROM Student
+                     """
+                     ];
 
-    rr:subjectMap [ rr:column "StudentID"; rr:termtype "BlankNode";
+    rr:subjectMap [ rr:column "StudentID"; rr:termType "BlankNode";
                     rr:class foaf:Person  ];
 	
     rr:predicateObjectMap
@@ -28,4 +30,4 @@
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ rr:column "Name" ]
     ]
-    .
\ No newline at end of file
+    .