Index: APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r55796 -r55802
--- APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 55796)
+++ APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 55802)
@@ -168,20 +168,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVroegsteDeliveryDateViaPickupDate">
+<Method name="GeefVroegstePickupDate">
 <FormalSpec>PickupDate:%Date</FormalSpec>
 <ReturnType>%Date</ReturnType>
 <Implementation><![CDATA[
 	#dim Params As %List = $LB(PickupDate)
 	#dim Filter As %String = "PickupDate >= ?"
 	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
-	#dim SqlStatement As TECH.String = "SELECT Min(DeliveryDate) As VroegsteDeliveryDate FROM " _SqlTableName _" WHERE " _Filter
+	#dim SqlStatement As TECH.String = "SELECT Min(PickupDate) As VroegstePickupDate FROM " _SqlTableName _" WHERE " _Filter
 
 	Set DynamicQuery = ##class(TECH.DynamicQuery).%New(SqlStatement,Params)
 	Set DynamicQuery.RuntimeMode = ##class(TECH.enu.ResultSetRuntimeMode).Logical()
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(DynamicQuery)
 	
-	Quit:ResultSet.Next() ResultSet.Get("VroegsteDeliveryDate")
+	Quit:ResultSet.Next() ResultSet.Get("VroegstePickupDate")
 	Quit ""
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r55798 -r55802
--- vhTest/Mock/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 55798)
+++ vhTest/Mock/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 55802)
@@ -91,10 +91,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVroegsteDeliveryDateViaPickupDate">
+<Method name="GeefVroegstePickupDate">
 <FormalSpec>PickupDate:%Date</FormalSpec>
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVroegsteDeliveryDateViaPickupDate",PickupDate)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVroegstePickupDate",PickupDate)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r55797 -r55802
--- vhTest/Fake/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 55797)
+++ vhTest/Fake/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 55802)
@@ -35,7 +35,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVroegsteDeliveryDateViaPickupDate">
+<Method name="GeefVroegstePickupDate">
 <FormalSpec>PickupDate:%Date</FormalSpec>
 <ReturnType>%Date</ReturnType>
 <Implementation><![CDATA[	Quit ""
Index: vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetVroegsteLeverDag/Test.cls.xml
===================================================================
diff -u -r55801 -r55802
--- vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetVroegsteLeverDag/Test.cls.xml	(.../Test.cls.xml)	(revision 55801)
+++ vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetVroegsteLeverDag/Test.cls.xml	(.../Test.cls.xml)	(revision 55802)
@@ -3,22 +3,21 @@
 <Class name="vhUnitTest.APPS.VKP.LeveringsTermijnSFS.GetVroegsteLeverDag.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Geef vroegste leverdatum adhv een afhaaldatum">
+<Method name="Test: Geef vroegste leverdag (afhaaldatum SFS) adhv een pickdatum">
 <Implementation><![CDATA[
 	#dim OrderDate As %Date = ##class(TECH.DateTime).TextToDate("30/12/17")
 	
 	Set VerzendWijzeSFS = ##class(APPS.VKP.VerzendWijze).%New("12486","EX")
 	
 	Set SFSKalenderRepositoryMock = ##class(vhTest.Mock.APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository).%New()
-	Do SFSKalenderRepositoryMock.VerwachtMethodCall("GeefVroegsteDeliveryDateViaPickupDate","64649").DanReturn("VroegsteLeverdatum")
+	Do SFSKalenderRepositoryMock.VerwachtMethodCall("GeefVroegstePickupDate","64649").DanReturn("VroegsteAfhaaldatum")
 	
 	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(OrderDate,VerzendWijzeSFS, SFSKalenderRepositoryMock)
 	
 	#dim PickDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")
 	
+	Do $$$AssertEquals("VroegsteAfhaaldatum",LeveringsTermijnSFS.GetVroegsteLeverDag(PickDatum))
 	
-	Do $$$AssertEquals("VroegsteLeverdatum",LeveringsTermijnSFS.GetVroegsteLeverDag(PickDatum))
-	
 	Do SFSKalenderRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: APPS/VKP/LeveringsTermijnSFS.cls.xml
===================================================================
diff -u -r55800 -r55802
--- APPS/VKP/LeveringsTermijnSFS.cls.xml	(.../LeveringsTermijnSFS.cls.xml)	(revision 55800)
+++ APPS/VKP/LeveringsTermijnSFS.cls.xml	(.../LeveringsTermijnSFS.cls.xml)	(revision 55802)
@@ -69,7 +69,7 @@
 <Method name="GetVroegsteLeverDag">
 <FormalSpec>PickDatum:%Date</FormalSpec>
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit ..SFSKalenderRepository.GeefVroegsteDeliveryDateViaPickupDate(PickDatum)
+<Implementation><![CDATA[	Quit ..SFSKalenderRepository.GeefVroegstePickupDate(PickDatum)
 ]]></Implementation>
 </Method>
 </Class>