Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u -r34102 -r34105
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34102)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34105)
@@ -25,8 +25,8 @@
 	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
 	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("DummyKey","DummyValue")
 	
-	Do $$$AssertEquals(KeyValuePair.Key, "DummyKey")
-	Do $$$AssertEquals(KeyValuePair.Value, "DummyValue")
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "DummyValue")
 ]]></Implementation>
 </Method>
 
@@ -38,8 +38,8 @@
 <Method name="VoegToeDummyKeyValuePair">
 <Implementation><![CDATA[
 	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
-	Set KeyValuePair.Key = "DummyKey"
-	Set KeyValuePair.Value = "DummyValue"
+	Set KeyValuePair.Sleutel = "DummyKey"
+	Set KeyValuePair.Waarde = "DummyValue"
 
 	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
 	Do KeyValuePairRepository.Bewaar(KeyValuePair)
Index: vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml
===================================================================
diff -u -r34102 -r34105
--- vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(.../KeyValuePairRepository.cls.xml)	(revision 34102)
+++ vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(.../KeyValuePairRepository.cls.xml)	(revision 34105)
@@ -19,9 +19,9 @@
 </Method>
 
 <Method name="GeefViaKeyValue">
-<FormalSpec>Key:%String,Value:%String</FormalSpec>
+<FormalSpec>Sleutel:%String,Waarde:%String</FormalSpec>
 <ReturnType>TECH.Persistent</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefViaFilter("Value = ?", $LB(Value))
+<Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? AND Waarde = ?", $LB(Sleutel,Waarde))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Utils/TECH/Persistent/KeyValuePair.cls.xml
===================================================================
diff -u -r34102 -r34105
--- vhTest/Utils/TECH/Persistent/KeyValuePair.cls.xml	(.../KeyValuePair.cls.xml)	(revision 34102)
+++ vhTest/Utils/TECH/Persistent/KeyValuePair.cls.xml	(.../KeyValuePair.cls.xml)	(revision 34105)
@@ -4,21 +4,21 @@
 <ClassType>persistent</ClassType>
 <Super>TECH.Persistent</Super>
 
-<Property name="Key">
+<Property name="Sleutel">
 <Type>%String</Type>
 </Property>
 
-<Property name="Value">
+<Property name="Waarde">
 <Type>%String</Type>
 </Property>
 
 <Index name="IndexKey">
-<Properties>Key</Properties>
+<Properties>Sleutel</Properties>
 <Unique>1</Unique>
 </Index>
 
 <Index name="IndexValue">
-<Properties>Value</Properties>
+<Properties>Waarde</Properties>
 </Index>
 
 <Storage name="Default">
@@ -29,16 +29,14 @@
 <IndexLocation>^vhTest.Utils.TDF0.KeyValuePairI</IndexLocation>
 <StreamLocation>^vhTest.Utils.TDF0.KeyValuePairS</StreamLocation>
 <Data name="KeyValuePairDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>
 <Value name="2">
-<Value>Key</Value>
+<Value>Sleutel</Value>
 </Value>
 <Value name="3">
-<Value>Value</Value>
+<Value>Waarde</Value>
 </Value>
 </Data>
 </Storage>