Index: vhUnitTest/TECH/Query/impl/InsertStatementBuilder/Test.cls.xml
===================================================================
diff -u -r1770 -r1791
--- vhUnitTest/TECH/Query/impl/InsertStatementBuilder/Test.cls.xml	(.../Test.cls.xml)	(revision 1770)
+++ vhUnitTest/TECH/Query/impl/InsertStatementBuilder/Test.cls.xml	(.../Test.cls.xml)	(revision 1791)
@@ -17,25 +17,25 @@
 
 <Method name="Test: One field one value">
 <Implementation><![CDATA[
-	set Values = ##class(TECH.KeyValueList).%New()
-	do Values.InsertKeyValuePair("Field1","Value1")
+	set Values = ##class(TECH.KeyValue.List).%New()
+	do Values.InsertKeyValue("Field1","Value1")
 	
 	Do ..AssertStatement(Values, "INSERT INTO Package.Table (Field1) VALUES ('Value1')")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Two field two values">
 <Implementation><![CDATA[
-	set Values = ##class(TECH.KeyValueList).%New()
-	do Values.InsertKeyValuePair("Field1", "Value1")
-	do Values.InsertKeyValuePair("Field2", "Value2")
+	set Values = ##class(TECH.KeyValue.List).%New()
+	do Values.InsertKeyValue("Field1", "Value1")
+	do Values.InsertKeyValue("Field2", "Value2")
 	
 	Do ..AssertStatement(Values, "INSERT INTO Package.Table (Field1,Field2) VALUES ('Value1','Value2')")
 ]]></Implementation>
 </Method>
 
 <Method name="AssertStatement">
-<FormalSpec>Values:TECH.KeyValueList,ExpectedStatement:%String</FormalSpec>
+<FormalSpec>Values:TECH.KeyValue.List,ExpectedStatement:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[	do $$$AssertEquals(..InsertStatementBuilderImpl.Build( "Package.Table",Values),ExpectedStatement)
 ]]></Implementation>