--- a/examples/eg-44-xml-dict/xml/Dict-5-KeyValuePair.xml	Thu Mar 28 17:29:18 2013 +0000
+++ b/examples/eg-44-xml-dict/xml/Dict-5-KeyValuePair.xml	Thu Mar 28 12:03:32 2013 -0600
@@ -7,14 +7,14 @@
   <prov:entity prov:id="e0"/>
   <prov:entity prov:id="e1"/>
   
-  <prov:keyValuePair>
+  <prov:keyEntityPair>
     <prov:entity prov:ref="e0"/>
     <prov:key>k0</prov:key>
-  </prov:keyValuePair>
+  </prov:keyEntityPair>
   
-  <prov:keyValuePair>
+  <prov:keyEntityPair>
     <prov:entity prov:ref="e1"/>
     <prov:key>k1</prov:key>
-  </prov:keyValuePair>
+  </prov:keyEntityPair>
 
 </prov:document>

--- a/examples/eg-44-xml-dict/xml/Dict-6-Membership.xml	Thu Mar 28 17:29:18 2013 +0000
+++ b/examples/eg-44-xml-dict/xml/Dict-6-Membership.xml	Thu Mar 28 12:03:32 2013 -0600
@@ -13,18 +13,18 @@
 
   <prov:hadDictionaryMember>
     <prov:dictionary prov:ref="d"/>
-    <prov:keyValuePair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e0"/>
       <prov:key>k0</prov:key>
-    </prov:keyValuePair>
-    <prov:keyValuePair>
+    </prov:keyEntityPair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e1"/>
       <prov:key>k1</prov:key>
-    </prov:keyValuePair>
-    <prov:keyValuePair>
+    </prov:keyEntityPair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e2"/>
       <prov:key>k2</prov:key>
-    </prov:keyValuePair>
+    </prov:keyEntityPair>
   </prov:hadDictionaryMember>
 
 </prov:document>

--- a/examples/eg-44-xml-dict/xml/Dict-7-Insertion.xml	Thu Mar 28 17:29:18 2013 +0000
+++ b/examples/eg-44-xml-dict/xml/Dict-7-Insertion.xml	Thu Mar 28 12:03:32 2013 -0600
@@ -17,23 +17,23 @@
 
   <prov:hadDictionaryMember>
     <prov:dictionary prov:ref="d1"/>
-    <prov:keyValuePair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e0"/>
       <prov:key>k0</prov:key>
-    </prov:keyValuePair>
+    </prov:keyEntityPair>
   </prov:hadDictionaryMember>
   
   <prov:derivedByInsertionFrom>
     <prov:newDictionary prov:ref="d2"/>
     <prov:oldDictionary prov:ref="d1"/>
-    <prov:keyValuePair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e1"/>
       <prov:key>k1</prov:key>
-    </prov:keyValuePair>
-    <prov:keyValuePair>
+    </prov:keyEntityPair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e2"/>
       <prov:key>k2</prov:key>
-    </prov:keyValuePair>
+    </prov:keyEntityPair>
   </prov:derivedByInsertionFrom>
   
 </prov:document>

--- a/examples/eg-44-xml-dict/xml/Dict-8-Removal.xml	Thu Mar 28 17:29:18 2013 +0000
+++ b/examples/eg-44-xml-dict/xml/Dict-8-Removal.xml	Thu Mar 28 12:03:32 2013 -0600
@@ -17,18 +17,18 @@
 
   <prov:hadDictionaryMember>
     <prov:dictionary prov:ref="d1"/>
-    <prov:keyValuePair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e0"/>
       <prov:key>k0</prov:key>
-    </prov:keyValuePair>
-    <prov:keyValuePair>
+    </prov:keyEntityPair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e1"/>
       <prov:key>k1</prov:key>
-    </prov:keyValuePair>
-    <prov:keyValuePair>
+    </prov:keyEntityPair>
+    <prov:keyEntityPair>
       <prov:entity prov:ref="e2"/>
       <prov:key>k2</prov:key>
-    </prov:keyValuePair>
+    </prov:keyEntityPair>
   </prov:hadDictionaryMember>
   
   <prov:derivedByRemovalFrom>