--- a/rdf-primer/index.html	Tue Nov 05 17:17:02 2013 +0000
+++ b/rdf-primer/index.html	Wed Nov 06 16:10:11 2013 +0000
@@ -389,8 +389,8 @@
 <http://example.org/bob#me> <http://schema.org/birthDate> "1990-07-04"^^<http://www.w3.org/2001/XMLSchema#date>.
 <http://example.org/bob#me> <http://xmlns.com/foaf/0.1/topic_interest> <http://www.wikidata.org/entity/Q12418>.
 <http://viaf.org/viaf/24604287/> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>.
-<http://viaf.org/viaf/24604287/> <http://xmlns.com/foaf/0.1/made> <http://www.wikidata.org/entity/Q12418>.
-<http://viaf.org/viaf/24604287/> <http://xmlns.com/foaf/0.1/name> "Leonardo da Vinci" .
+<http://viaf.org/viaf/24604287/> <http://xmlns.com/foaf/0.1/name> "Leonardo da Vinci".
+<http://www.wikidata.org/entity/Q12418> <http://purl.org/dc/terms/creator> <http://viaf.org/viaf/24604287/>.
 <http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619> <http://purl.org/dc/terms/subject> <http://www.wikidata.org/entity/Q12418>.
       </pre>
 
@@ -424,8 +424,10 @@
 
 &lt;http://viaf.org/viaf/24604287/&gt;
   a foaf:Person ;
-  foaf:name "Leonardo da Vinci" ;
-  foaf:made wd:Q12418 .
+  foaf:name "Leonardo da Vinci" .
+
+wd:Q12418
+  dcterms:creator &lt;http://viaf.org/viaf/24604287/&gt; .
 
 &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619&gt;
   dcterms:subject wd:Q12418 .
@@ -469,7 +471,7 @@
     "subject_of": {
         "@id": "http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619"
     },
-    "foaf:maker": {
+    "dcterms:creator": {
       "@id": "http://viaf.org/viaf/24604287/",
       "@type": "foaf:Person",
       "foaf:name": "Leonardo da Vinci"
@@ -504,7 +506,7 @@
         Bob is interested in &lt;a rel="foaf:topic_interest" resource="wd:Q12418"&gt;the Mona Lisa&lt;/a&gt;.
       &lt;/p&gt;
       &lt;div about="wd:Q12418"&gt;
-        The Mona Lisa was painted by &lt;a rev="foaf:maker" typeof="foaf:Person" href="http://viaf.org/viaf/24604287/"&gt;&lt;span property="foaf:name"&gt;Leonardo da Vinci&lt;/span&gt;&lt;/a&gt;
+        The Mona Lisa was painted by &lt;a rev="dcterms:creator" typeof="foaf:Person" href="http://viaf.org/viaf/24604287/"&gt;&lt;span property="foaf:name"&gt;Leonardo da Vinci&lt;/span&gt;&lt;/a&gt;
         and is the subject of this &lt;a rev="dcterms:subject" href="http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619"&gt;video document&lt;/a&gt;.
       &lt;/div&gt;
   &lt;/div&gt;
@@ -536,9 +538,11 @@
     &lt;foaf:topic_interest rdf:resource="http://www.wikidata.org/entity/Q12418"/&gt;
   &lt;/foaf:Person&gt;
   &lt;foaf:Person rdf:about="http://viaf.org/viaf/24604287/"&gt;
-    &lt;foaf:made rdf:resource="http://www.wikidata.org/entity/Q12418"/&gt;
     &lt;foaf:name&gt;Leonardo da Vinci&lt;/foaf:name&gt;
   &lt;/foaf:Person&gt;
+  &lt;rdf:Description rdf:about="http://www.wikidata.org/entity/Q12418"&gt;
+    &lt;dcterms:creator rdf:resource="http://viaf.org/viaf/24604287/"/&gt;
+  &lt;/rdf:Description&gt;
   &lt;rdf:Description rdf:about="http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619"&gt;
     &lt;dcterms:subject rdf:resource="http://www.wikidata.org/entity/Q12418"/&gt;
   &lt;/rdf:Description&gt;
@@ -572,7 +576,7 @@
 &lt;http://example.org/bob#me&gt; &lt;http://xmlns.com/foaf/0.1/topic_interest&gt; &lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://example.org/bob&gt; .
 &lt;http://viaf.org/viaf/24604287/&gt; &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; &lt;http://xmlns.com/foaf/0.1/Person&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
 &lt;http://viaf.org/viaf/24604287/&gt; &lt;http://xmlns.com/foaf/0.1/name&gt; "Leonardo da Vinci" &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
-&lt;http://viaf.org/viaf/24604287/&gt; &lt;http://xmlns.com/foaf/0.1/made&gt; &lt;http://www.wikidata.org/entity/Q12418&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
+&lt;http://www.wikidata.org/entity/Q12418&gt; &lt;http://purl.org/dc/terms/creator&gt; &lt;http://viaf.org/viaf/24604287/&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
 &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619&gt; &lt;http://purl.org/dc/terms/subject&gt; &lt;http://www.wikidata.org/entity/Q12418&gt; &lt;https://www.wikidata.org/wiki/Special:EntityData/Q12418&gt; .
       </pre>
 
@@ -607,8 +611,10 @@
   {
     &lt;http://viaf.org/viaf/24604287/&gt;
       a foaf:Person ;
-      foaf:name "Leonardo da Vinci" ;
-      foaf:made wd:Q12418 .
+      foaf:name "Leonardo da Vinci" .
+
+    wd:Q12418
+      dcterms:creator &lt;http://viaf.org/viaf/24604287/&gt; .
 
     &lt;http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619&gt;
       dcterms:subject wd:Q12418 .
@@ -659,16 +665,13 @@
         {
           "@id": "http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619",
           "dc:subject": {
-            "@id": "http://www.wikidata.org/entity/Q12418"
+            "@id": "http://www.wikidata.org/entity/Q12418",
+            "dcterms:creator": {
+              "@id": "http://viaf.org/viaf/24604287/",
+              "@type": "foaf:Person",
+              "foaf:name": "Leonardo da Vinci"
+            }
           }
-        },
-        {
-          "@id": "http://viaf.org/viaf/24604287/",
-          "@type": "foaf:Person",
-          "foaf:made": {
-            "@id": "http://www.wikidata.org/entity/Q12418"
-          },
-          "foaf:name": "Leonardo da Vinci"
         }
       ]
     }