Index: APPS/PM/Maatwerk/TBX/Conversie/KenmerkConvertor.cls.xml
===================================================================
diff -u -r44139 -r44154
--- APPS/PM/Maatwerk/TBX/Conversie/KenmerkConvertor.cls.xml	(.../KenmerkConvertor.cls.xml)	(revision 44139)
+++ APPS/PM/Maatwerk/TBX/Conversie/KenmerkConvertor.cls.xml	(.../KenmerkConvertor.cls.xml)	(revision 44154)
@@ -71,7 +71,7 @@
 	
 	#dim Toepassing As DOM.PM.enu.TBXToepassing = ##class(DOM.PM.enu.TBXToepassing).Lade()
 	If (Product.IsSpoelbakLade()) { Set Toepassing = ##class(DOM.PM.enu.TBXToepassing).Spoelbak() }
-	If (Product.IsSifonLade() && (Product.GeefUitsparingen().GetAt(1).GeefUitsparingType() = ##class(DOM.PM.enu.TBXUitsparingType).SifonType1())) { Set Toepassing = ##class(DOM.PM.enu.TBXToepassing).Sifon() }
+	If (Product.IsSifonLade() && (Product.GeefUitsparingen().GetAt(1).GeefUitsparingType() = ##class(DOM.PM.enu.TBXUitsparingType).SifonType1())) { Set Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonType1() }
   	If (Product.IsSifonLade() && (Product.GeefUitsparingen().GetAt(1).GeefUitsparingType() = ##class(DOM.PM.enu.TBXUitsparingType).SifonType2())) { Set Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonTypeBlum() }   ; To be done  (added by WimV on 11/08/2011)
 	Set TBXKenmerken.Toepassing = Toepassing
 	
Index: BL/Flow/Offerte/ProductGAData.cls.xml
===================================================================
diff -u -r38568 -r44154
--- BL/Flow/Offerte/ProductGAData.cls.xml	(.../ProductGAData.cls.xml)	(revision 38568)
+++ BL/Flow/Offerte/ProductGAData.cls.xml	(.../ProductGAData.cls.xml)	(revision 44154)
@@ -356,7 +356,7 @@
 			; SpoelbakBreedte (SPBR) wordt berekend in Prod.BWValuesToProduct()
 		}
 	} 
-	ElseIf Klas=##class(DOM.PM.enu.TBXToepassing).Sifon() {
+	ElseIf Klas=##class(DOM.PM.enu.TBXToepassing).SifonType1() {
 		Set arKenm("SpoelbakZkLi")=$P($$$GetKenm("ItemSPZK"),";",2)
 		Set arKenm("SpoelbakZkRe")=$P($$$GetKenm("ItemSPZK"),";",3)
 		Set arKenm("SpoelbakZkMi")=$P($$$GetKenm("ItemSPZK"),";",4)
Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSifonEvaluator.cls.xml
===================================================================
diff -u -r38570 -r44154
--- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSifonEvaluator.cls.xml	(.../BevatSifonEvaluator.cls.xml)	(revision 38570)
+++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSifonEvaluator.cls.xml	(.../BevatSifonEvaluator.cls.xml)	(revision 44154)
@@ -9,7 +9,7 @@
 <Method name="Evalueer">
 <FormalSpec>HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (IngegevenKenmerken.Toepassing = ##class(DOM.PM.enu.TBXToepassing).Sifon()) || (IngegevenKenmerken.Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonTypeBlum())
+<Implementation><![CDATA[	Quit (IngegevenKenmerken.Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonType1()) || (IngegevenKenmerken.Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonTypeBlum())
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator.cls.xml
===================================================================
diff -u -r38568 -r44154
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator.cls.xml	(.../FrontOndersteuningValidator.cls.xml)	(revision 38568)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator.cls.xml	(.../FrontOndersteuningValidator.cls.xml)	(revision 44154)
@@ -12,7 +12,7 @@
 		Do Exceptions.Insert(Exception)
 	}
 	
-	If ((Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).Spoelbak()) || (Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).SifonTypeBlum()) || (Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).Sifon()) && (+Product.FrontOndersteuningAantal > 0)) {
+	If ((Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).Spoelbak()) || (Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).SifonTypeBlum()) || (Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).SifonType1()) && (+Product.FrontOndersteuningAantal > 0)) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
 		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
 		Do Exception.AddCombination($classname(Product),"FrontOndersteuningAantal",Product.FrontOndersteuningAantal)
Index: DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml
===================================================================
diff -u -r41564 -r44154
--- DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml	(.../TBXKenmerken.cls.xml)	(revision 41564)
+++ DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml	(.../TBXKenmerken.cls.xml)	(revision 44154)
@@ -370,7 +370,7 @@
 
 <Method name="MaakSifonlade">
 <Implementation><![CDATA[
-	Set ..Toepassing = ##class(DOM.PM.enu.TBXToepassing).Sifon()
+	Set ..Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonType1()
 	Set ..IsBinnenlade = 0
 	Set ..FrontBevestiging = ##class(DOM.PM.enu.TBXFrontBevestiging).Schroef()
 	Set ..UitsparingBreedte1 = 119
@@ -380,7 +380,7 @@
 
 <Method name="MaakSifonBinnenlade">
 <Implementation><![CDATA[
-	Set ..Toepassing = ##class(DOM.PM.enu.TBXToepassing).Sifon()
+	Set ..Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonType1()
 	Set ..IsBinnenlade = 1
 	Set ..FrontBevestiging = ##class(DOM.PM.enu.TBXFrontBevestiging).Zonder()
 	Set ..UitsparingBreedte1 = 119
Index: DOM/PM/Maatwerk/Calc/Common/impl/IngegevenKenmerkenSifonladeHelper.cls.xml
===================================================================
diff -u -r38570 -r44154
--- DOM/PM/Maatwerk/Calc/Common/impl/IngegevenKenmerkenSifonladeHelper.cls.xml	(.../IngegevenKenmerkenSifonladeHelper.cls.xml)	(revision 38570)
+++ DOM/PM/Maatwerk/Calc/Common/impl/IngegevenKenmerkenSifonladeHelper.cls.xml	(.../IngegevenKenmerkenSifonladeHelper.cls.xml)	(revision 44154)
@@ -29,7 +29,7 @@
 
 <Method name="VerwerkTBXKenmerken">
 <FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
-<Implementation><![CDATA[	Set ..IsSifonlade = (TBXKenmerken.Toepassing = ##class(DOM.PM.enu.TBXToepassing).Sifon())
+<Implementation><![CDATA[	Set ..IsSifonlade = (TBXKenmerken.Toepassing = ##class(DOM.PM.enu.TBXToepassing).SifonType1())
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r44146 -r44154
--- DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 44146)
+++ DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 44154)
@@ -48,7 +48,7 @@
 		{
 			Set Product = ##class(DOM.PM.TBXProduct.impl.TBXLadeImpl).%New(ProductID)
 		}
-		Elseif (Klas = ##class(DOM.PM.enu.TBXToepassing).Sifon())
+		Elseif (Klas = ##class(DOM.PM.enu.TBXToepassing).SifonType1())
 		{
 			Set Product = ##class(DOM.PM.TBXProduct.impl.TBXSifonladeType1).%New(ProductID)
 		}
Index: DOM/PM/enu/TBXToepassing.cls.xml
===================================================================
diff -u -r42717 -r44154
--- DOM/PM/enu/TBXToepassing.cls.xml	(.../TBXToepassing.cls.xml)	(revision 42717)
+++ DOM/PM/enu/TBXToepassing.cls.xml	(.../TBXToepassing.cls.xml)	(revision 44154)
@@ -34,7 +34,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Sifon">
+<Method name="SifonType1">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.PM.enu.TBXToepassing</ReturnType>
 <Implementation><![CDATA[	Quit "SY"
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator/Test.cls.xml
===================================================================
diff -u -r38568 -r44154
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 38568)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/FrontOndersteuningValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 44154)
@@ -76,7 +76,7 @@
 <Method name="Test: Sifon en wel frontstabilisatie -&gt; False">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
-	Set Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).Sifon()
+	Set Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).SifonType1()
 	Set Product.FrontOndersteuningAantal = "1"
 	Set Exceptions = ##class(TECH.ExceptionList).%New()
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.FrontOndersteuningValidator).%New()
@@ -88,7 +88,7 @@
 <Method name="Test: Sifon en geen frontstabilisatie -&gt; True">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
-	Set Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).Sifon()
+	Set Product.Klasse = ##class(DOM.PM.enu.TBXToepassing).SifonType1()
 	Set Product.FrontOndersteuningAantal = ""
 	Set Exceptions = ##class(TECH.ExceptionList).%New()
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.FrontOndersteuningValidator).%New()