--- a/examples/eg-44-xml-dict/xml/Dict-5-KeyValuePair.xml	Tue Apr 16 14:01:49 2013 +0100
+++ b/examples/eg-44-xml-dict/xml/Dict-5-KeyValuePair.xml	Tue Apr 16 09:26:21 2013 -0400
@@ -8,13 +8,13 @@
   <prov:entity prov:id="e1"/>
   
   <prov:keyEntityPair>
+    <prov:key>k0</prov:key>
     <prov:entity prov:ref="e0"/>
-    <prov:key>k0</prov:key>
   </prov:keyEntityPair>
   
   <prov:keyEntityPair>
+    <prov:key>k1</prov:key>
     <prov:entity prov:ref="e1"/>
-    <prov:key>k1</prov:key>
   </prov:keyEntityPair>
 
 </prov:document>

--- a/examples/eg-44-xml-dict/xml/Dict-6-Membership.xml	Tue Apr 16 14:01:49 2013 +0100
+++ b/examples/eg-44-xml-dict/xml/Dict-6-Membership.xml	Tue Apr 16 09:26:21 2013 -0400
@@ -7,23 +7,21 @@
   <prov:entity prov:id="e1"/>
   <prov:entity prov:id="e2"/>
 
-  <prov:entity prov:id="d">
-    <prov:type xsi:type="xsd:QName">prov:Dictionary</prov:type>
-  </prov:entity>
+  <prov:dictionary prov:id="d" />
 
   <prov:hadDictionaryMember>
     <prov:dictionary prov:ref="d"/>
     <prov:keyEntityPair>
+      <prov:key>k0</prov:key>
       <prov:entity prov:ref="e0"/>
-      <prov:key>k0</prov:key>
     </prov:keyEntityPair>
     <prov:keyEntityPair>
+      <prov:key>k1</prov:key>
       <prov:entity prov:ref="e1"/>
-      <prov:key>k1</prov:key>
     </prov:keyEntityPair>
     <prov:keyEntityPair>
+      <prov:key>k2</prov:key>
       <prov:entity prov:ref="e2"/>
-      <prov:key>k2</prov:key>
     </prov:keyEntityPair>
   </prov:hadDictionaryMember>
 

--- a/examples/eg-44-xml-dict/xml/Dict-7-Insertion.xml	Tue Apr 16 14:01:49 2013 +0100
+++ b/examples/eg-44-xml-dict/xml/Dict-7-Insertion.xml	Tue Apr 16 09:26:21 2013 -0400
@@ -7,19 +7,15 @@
   <prov:entity prov:id="e1"/>
   <prov:entity prov:id="e2"/>
 
-  <prov:entity prov:id="d1">
-    <prov:type xsi:type="xsd:QName">prov:Dictionary</prov:type>
-  </prov:entity>
+  <prov:dictionary prov:id="d1" />
   
-  <prov:entity prov:id="d2">
-    <prov:type xsi:type="xsd:QName">prov:Dictionary</prov:type>
-  </prov:entity>
+  <prov:dictionary prov:id="d2" />
 
   <prov:hadDictionaryMember>
     <prov:dictionary prov:ref="d1"/>
     <prov:keyEntityPair>
+      <prov:key>k0</prov:key>
       <prov:entity prov:ref="e0"/>
-      <prov:key>k0</prov:key>
     </prov:keyEntityPair>
   </prov:hadDictionaryMember>
   
@@ -27,12 +23,12 @@
     <prov:newDictionary prov:ref="d2"/>
     <prov:oldDictionary prov:ref="d1"/>
     <prov:keyEntityPair>
+      <prov:key>k1</prov:key>
       <prov:entity prov:ref="e1"/>
-      <prov:key>k1</prov:key>
     </prov:keyEntityPair>
     <prov:keyEntityPair>
+      <prov:key>k2</prov:key>
       <prov:entity prov:ref="e2"/>
-      <prov:key>k2</prov:key>
     </prov:keyEntityPair>
   </prov:derivedByInsertionFrom>
   

--- a/examples/eg-44-xml-dict/xml/Dict-8-Removal.xml	Tue Apr 16 14:01:49 2013 +0100
+++ b/examples/eg-44-xml-dict/xml/Dict-8-Removal.xml	Tue Apr 16 09:26:21 2013 -0400
@@ -7,27 +7,23 @@
   <prov:entity prov:id="e1"/>
   <prov:entity prov:id="e2"/>
 
-  <prov:entity prov:id="d1">
-    <prov:type xsi:type="xsd:QName">prov:Dictionary</prov:type>
-  </prov:entity>
+  <prov:dictionary prov:id="d1" />
   
-  <prov:entity prov:id="d2">
-    <prov:type xsi:type="xsd:QName">prov:Dictionary</prov:type>
-  </prov:entity>
+  <prov:dictionary prov:id="d2" />
 
   <prov:hadDictionaryMember>
     <prov:dictionary prov:ref="d1"/>
     <prov:keyEntityPair>
+      <prov:key>k0</prov:key>
       <prov:entity prov:ref="e0"/>
-      <prov:key>k0</prov:key>
     </prov:keyEntityPair>
     <prov:keyEntityPair>
+      <prov:key>k1</prov:key>
       <prov:entity prov:ref="e1"/>
-      <prov:key>k1</prov:key>
     </prov:keyEntityPair>
     <prov:keyEntityPair>
+      <prov:key>k2</prov:key>
       <prov:entity prov:ref="e2"/>
-      <prov:key>k2</prov:key>
     </prov:keyEntityPair>
   </prov:hadDictionaryMember>