--- a/xml/schema/prov-dictionary.xsd	Thu Mar 28 15:59:07 2013 +0100
+++ b/xml/schema/prov-dictionary.xsd	Thu Mar 28 17:20:50 2013 +0100
@@ -25,8 +25,8 @@
 	
 	<xs:element name="emptyDictionary" type="prov:EmptyDictionary" substitutionGroup="prov:internalElement" />
 		
-	<!-- Key-Value Pair -->
-	<xs:complexType name="KeyValuePair">
+	<!-- Key-Entity Pair -->
+	<xs:complexType name="KeyEntityPair">
         <xs:sequence>
     	  <xs:element name="entity" type="prov:IDRef" />
     	  <xs:element name="key" type="xs:anySimpleType" />
@@ -34,13 +34,13 @@
 	</xs:complexType>
 	
 	<!-- do we need to have this use the substitutionGroup? -->
-	<xs:element name="keyValuePair" type="prov:KeyValuePair" substitutionGroup="prov:internalElement"/>
+	<xs:element name="keyEntityPair" type="prov:KeyEntityPair" substitutionGroup="prov:internalElement"/>
 
 	<!-- Dictionary Membership -->
 	<xs:complexType name="DictionaryMembership">
 	  <xs:sequence>
 		<xs:element name="dictionary" type="prov:IDRef"/>
-		<xs:element name="keyValuePair" type="prov:KeyValuePair" maxOccurs="unbounded"/>
+		<xs:element name="keyEntityPair" type="prov:KeyEntityPair" maxOccurs="unbounded"/>
 	  </xs:sequence>
 	</xs:complexType>
 	
@@ -51,7 +51,7 @@
 	  <xs:sequence>
 		<xs:element name="newDictionary" type="prov:IDRef"/>
 		<xs:element name="oldDictionary" type="prov:IDRef"/>
-		<xs:element name="keyValuePair" type="prov:KeyValuePair" maxOccurs="unbounded"/>
+		<xs:element name="keyEntityPair" type="prov:KeyEntityPair" maxOccurs="unbounded"/>
 	  </xs:sequence>
 	</xs:complexType>