Index: vhUnitTest/APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaProductProgrammaToepasser/TAOR/Test.cls.xml
===================================================================
diff -u -r34079 -r37234
--- vhUnitTest/APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaProductProgrammaToepasser/TAOR/Test.cls.xml	(.../Test.cls.xml)	(revision 34079)
+++ vhUnitTest/APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaProductProgrammaToepasser/TAOR/Test.cls.xml	(.../Test.cls.xml)	(revision 37234)
@@ -55,7 +55,7 @@
 <Implementation><![CDATA[
 	#dim TAORKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken).LegeKenmerken()
 	
-	Do ..PasToeDefaults(TAORKenmerken, ##class(vhTest.Fake.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New())
+	Do ..PasToeDefaults(TAORKenmerken, ##class(vhTest.Fake.APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New())
 	
 	Do $$$AssertEquals(TAORKenmerken.FrontBevestiging,##class(DOM.PM.enu.TAORFrontBevestiging).Expando())
 	Do $$$AssertEquals(TAORKenmerken.VerpakkingType,##class(DOM.PM.enu.TAORVerpakkingType).FlatpackV1())
@@ -65,11 +65,11 @@
 </Method>
 
 <Method name="PasToeDefaults">
-<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken,CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler=""</FormalSpec>
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken,TaxExportVerpakkingBepaler:APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim WinkelkarDummy As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.EC.Winkelkar.dto.Winkelkar).%New()
-	Do TAORKenmerken.Accept(##class(APPS.PM.Maatwerk.impl.MaatwerkDefaultsViaProductProgrammaToepasser).%New(WinkelkarDummy,CheckoutTypeBepaler))
+	Do TAORKenmerken.Accept(##class(APPS.PM.Maatwerk.impl.MaatwerkDefaultsViaProductProgrammaToepasser).%New(WinkelkarDummy,TaxExportVerpakkingBepaler))
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml
===================================================================
diff -u -r37233 -r37234
--- APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml	(.../TaxExportVerpakkingBepaler.cls.xml)	(revision 37233)
+++ APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml	(.../TaxExportVerpakkingBepaler.cls.xml)	(revision 37234)
@@ -21,7 +21,7 @@
 
 <Method name="Bepaal">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
-<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
+<ReturnType>APPS.EC.Unishop.enu.TaxExportVerpakkingType</ReturnType>
 <Implementation><![CDATA[
 	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.TaxExportVerpakkingType).Standaard() 	
 
Index: APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaProductProgrammaToepasser.cls.xml
===================================================================
diff -u -r37033 -r37234
--- APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaProductProgrammaToepasser.cls.xml	(.../MaatwerkDefaultsViaProductProgrammaToepasser.cls.xml)	(revision 37033)
+++ APPS/PM/Maatwerk/impl/MaatwerkDefaultsViaProductProgrammaToepasser.cls.xml	(.../MaatwerkDefaultsViaProductProgrammaToepasser.cls.xml)	(revision 37234)
@@ -12,20 +12,20 @@
 <Private>1</Private>
 </Property>
 
-<Property name="CheckoutTypeBepaler">
-<Type>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Type>
+<Property name="TaxExportVerpakkingBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Winkelkar:APPS.EC.Winkelkar.dto.Winkelkar="",CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</FormalSpec>
+<FormalSpec>Winkelkar:APPS.EC.Winkelkar.dto.Winkelkar="",TaxExportVerpakkingBepaler:APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..Winkelkar = Winkelkar	
-	Set ..CheckoutTypeBepaler = $$$Inject(CheckoutTypeBepaler, ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New())
+	Set ..TaxExportVerpakkingBepaler = $$$Inject(TaxExportVerpakkingBepaler, ##class(APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -88,7 +88,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Quit:(..Winkelkar = "") 0
-	Quit (..CheckoutTypeBepaler.Bepaal(..Winkelkar.Personality.ID, ..Winkelkar.Klant.ID) = ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Quit (..TaxExportVerpakkingBepaler.Bepaal(..Winkelkar.Personality.ID, ..Winkelkar.Klant.ID) = ##class(APPS.EC.Unishop.enu.TaxExportVerpakkingType).GeenKeuze())
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EC/impl/ConfiguratorService/TaxExportVerpakkingBepaler.cls.xml	(revision 37234)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler">
+<Super>APPS.EC.impl.ConfiguratorService.TaxExportVerpakkingBepaler</Super>
+
+<Property name="TaxExportVerpakkingType">
+<Type>APPS.EC.Unishop.enu.TaxExportVerpakkingType</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Bepaal">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<ReturnType>APPS.EC.Unishop.enu.TaxExportVerpakkingType</ReturnType>
+<Implementation><![CDATA[
+	Quit:..TaxExportVerpakkingType="" ##class(APPS.EC.Unishop.enu.TaxExportVerpakkingType).GeenKeuze() 
+	Quit ..TaxExportVerpakkingType
+]]></Implementation>
+</Method>
+
+<Method name="ZetTaxExportVerpakkingType">
+<FormalSpec>TaxExportVerpakkingType:APPS.EC.Unishop.enu.TaxExportVerpakkingType</FormalSpec>
+<Implementation><![CDATA[	Set ..TaxExportVerpakkingType = TaxExportVerpakkingType
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>