Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugv001.cls.xml
===================================================================
diff -u -r29059 -r38571
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugv001.cls.xml	(.../HFRugv001.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugv001.cls.xml	(.../HFRugv001.cls.xml)	(revision 38571)
@@ -57,7 +57,7 @@
 	
 	Set IngegevenKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken).%New()
 	Set IngegevenKenmerken.RugKleur = "LG"
-	Set IngegevenKenmerken.RugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Staal()
+	Set IngegevenKenmerken.RugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()
 	Set IngegevenKenmerken.RugHoogte = "D"
 	Set IngegevenKenmerken.CorpusBinnenbreedte = 863
 	
Index: DOM/PM/TBXProduct/impl/TBXRechteUitsparing.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/TBXProduct/impl/TBXRechteUitsparing.cls.xml	(.../TBXRechteUitsparing.cls.xml)	(revision 29059)
+++ DOM/PM/TBXProduct/impl/TBXRechteUitsparing.cls.xml	(.../TBXRechteUitsparing.cls.xml)	(revision 38571)
@@ -13,12 +13,12 @@
 </Property>
 
 <Property name="TussenrugMateriaal">
-<Type>DOM.PM.enu.TBXRugMateriaal</Type>
+<Type>DOM.PM.enu.TBXRugwandMateriaal</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Diepte:%Integer,Breedte:%Integer,AfstandTotZijkantLinks:%Integer,AfstandTotZijkantRechts:%Integer,ZijkantKleur:%String,TussenrugMateriaal:DOM.PM.enu.TBXRugMateriaal</FormalSpec>
+<FormalSpec>Diepte:%Integer,Breedte:%Integer,AfstandTotZijkantLinks:%Integer,AfstandTotZijkantRechts:%Integer,ZijkantKleur:%String,TussenrugMateriaal:DOM.PM.enu.TBXRugwandMateriaal</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -66,7 +66,7 @@
 </Method>
 
 <Method name="GeefTussenrugMateriaal">
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
 <Implementation><![CDATA[	Quit ..TussenrugMateriaal
 ]]></Implementation>
 </Method>
Index: DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugHouderv001.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugHouderv001.cls.xml	(.../HFRugHouderv001.cls.xml)	(revision 29059)
+++ DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugHouderv001.cls.xml	(.../HFRugHouderv001.cls.xml)	(revision 38571)
@@ -22,7 +22,7 @@
 <Implementation><![CDATA[
 	; if $$$Not( LosseOnderdelen ) 
 	Quit:(IngegevenKenmerken.RugMateriaal = "") 1
-	Quit (IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Hout())
+	Quit (IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout())
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml
===================================================================
diff -u -r37477 -r38571
--- DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml	(.../TBXLadeImpl.cls.xml)	(revision 37477)
+++ DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml	(.../TBXLadeImpl.cls.xml)	(revision 38571)
@@ -374,11 +374,11 @@
 	If ('$IsObject(..Rug) && ..BevatRug())
 	{
 		#dim Bouwsteen As DOM.PM.Bouwstenen.Bouwsteen = ""
-		If (..GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout())
+		If (..GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout())
 		{
 			Set Bouwsteen = ##class(DOM.PM.Bouwstenen.Bouwsteen).%OpenId(..GeefPRNr()_"||"_..GeefBouwsteenNaamVoorHoutenRug())
 		}
-		ElseIf (..GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Staal())
+		ElseIf (..GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())
 		{
 			Set Bouwsteen = ##class(DOM.PM.Bouwstenen.Bouwsteen).%OpenId(..GeefPRNr()_"||"_"PRSRUG.001")
 		}
@@ -729,11 +729,11 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set RugKleur = ""
-	If (..GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugMateriaal).Staal())
+	If (..GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())
 	{
 		Set RugKleur = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",..GeefPRNr(),"KR"))
 	}
-	ElseIf (..GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugMateriaal).Hout())
+	ElseIf (..GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout())
 	{
 		Set RugKleur = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",..GeefPRNr(),"KB"))
 	}
@@ -742,17 +742,17 @@
 </Method>
 
 <Method name="GeefRugMateriaal">
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
 <Implementation><![CDATA[
-	Set Materiaal = ##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set Materiaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	Set IsStaal = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",..GeefPRNr(),"IsSR"))
 	If (IsStaal = "")
 	{
 		Set IsStaal = ($LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",..GeefPRNr(),"SR")) = "V")
 	}
 	If (IsStaal)
 	{
-		Set Materiaal = ##class(DOM.PM.enu.TBXRugMateriaal).Staal()
+		Set Materiaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()
 	}
 	Quit Materiaal
 ]]></Implementation>
Index: BL/PPS/TBX/DocLijnvullerLijst.cls.xml
===================================================================
diff -u -r31550 -r38571
--- BL/PPS/TBX/DocLijnvullerLijst.cls.xml	(.../DocLijnvullerLijst.cls.xml)	(revision 31550)
+++ BL/PPS/TBX/DocLijnvullerLijst.cls.xml	(.../DocLijnvullerLijst.cls.xml)	(revision 38571)
@@ -133,7 +133,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim ODSP As %String = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",Tandembox.GeefID(),"ODSP")) ; Onderdelen Special
-	Quit ((ODSP '= "F") && (ODSP '= "B") && (Tandembox.GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugMateriaal).Staal()))
+	Quit ((ODSP '= "F") && (ODSP '= "B") && (Tandembox.GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()))
 ]]></Implementation>
 </Method>
 
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r38548 -r38571
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 38548)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 38571)
@@ -684,7 +684,7 @@
 	. Set pxLabel.BreedteB=IB-75
 	
 	#dim Lade As DOM.PM.TBXProduct.TBXLade = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(PRNr)
-	if Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout() {
+	if Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout() {
 		set pxLabel.RWHInfo = "RWH: "_Lade.GeefRugHouderKleur()_" "_Lade.GeefZijwandHoogte()
 		
 		#dim InfoLabelRug As %String = "Rug"
@@ -697,7 +697,7 @@
 			set pxLabel.RWHInfo = pxLabel.RWHInfo_" .22"
 		}
 	}
-	elseif Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Staal() {
+	elseif Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal() {
 		Set pxLabel.RugInfo = "StalenRug: "_Lade.GeefRugKleur()_" "_Lade.GeefRugHoogte()_" "_(pxLabel.IB-28)
 		Set pxLabel.RWHInfo = "RWH: -- -- --"
 	}
Index: DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugv001.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugv001.cls.xml	(.../HFRugv001.cls.xml)	(revision 29059)
+++ DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugv001.cls.xml	(.../HFRugv001.cls.xml)	(revision 38571)
@@ -48,7 +48,7 @@
 		Set HalffabList = Context.SelecteerHalffabrikaten(##this,SelectieKenmerken)
 
 		
-		Set IsStalenRug=(IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Staal())
+		Set IsStalenRug=(IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())
 		
 		If (IsStalenRug) 
 		{
@@ -113,7 +113,7 @@
 <Implementation><![CDATA[
 	// Bij het effectief bouwen van een lade gebruiken we de rugbreedte als selectiecriterium
 	Set SelectieKenmerken = ..GenereerKenmerken(IngegevenKenmerken)
-	Set IsStalenRug=(IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Staal())
+	Set IsStalenRug=(IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())
 	If (IsStalenRug) 
 	{
 		Do SelectieKenmerken.SetAt(Rugbreedte,"LadeBreedte")
@@ -133,7 +133,7 @@
 	Do SelectieKenmerken.SetAt(IngegevenKenmerken.RugHoogte,"RugHoogte")
 
 	// TODO FMA MateriaalType niet meer gebruiken, gewoon rechtstreeks RugMateriaal opnemen als selectiekenmerk
-	Set IsStalenRug=(IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Staal())
+	Set IsStalenRug=(IngegevenKenmerken.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal())
 	If (IsStalenRug) 
 	{
 		// Stalen Rug, reeds op maat in de DB (exact, standaard halffab) 
Index: DOM/PM/TBXProduct/impl/TBXRugStrookImpl.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/TBXProduct/impl/TBXRugStrookImpl.cls.xml	(.../TBXRugStrookImpl.cls.xml)	(revision 29059)
+++ DOM/PM/TBXProduct/impl/TBXRugStrookImpl.cls.xml	(.../TBXRugStrookImpl.cls.xml)	(revision 38571)
@@ -16,8 +16,8 @@
 </Method>
 
 <Method name="GeefMateriaal">
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/PM/TBXProduct/TBXLade.cls.xml
===================================================================
diff -u -r37477 -r38571
--- DOM/PM/TBXProduct/TBXLade.cls.xml	(.../TBXLade.cls.xml)	(revision 37477)
+++ DOM/PM/TBXProduct/TBXLade.cls.xml	(.../TBXLade.cls.xml)	(revision 38571)
@@ -15,404 +15,484 @@
 <Method name="BevatInTeKortenAntislipmat">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenGlas">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenFront">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenFrontGlas">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenReling">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenFrontReling">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenStabilisator">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenZijkantGlas">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatGreep">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatMeenemer">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatReling">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatStabilisator">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatSynchro">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTipOn">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTiponLinks">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTiponRechts">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTOBSynchroStang">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatInTeKortenTOBSynchroStang">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTOBSynchroStangVoorStandaardBreedte">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTussenReling">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatTussenRelingAdapter">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatBodem">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatOpvullijstLinks">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatOpvullijstRechts">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatLVormigeRugHouder">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatVoorgezaagdeBodem">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatVerlaagdeRug">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BevatRug">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRug">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.TBXProduct.TBXRug</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBodemBewerking">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXBodemBewerking</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBodem">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.TBXProduct.TBXBodem</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefAantalHangmappen">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefAantalBovenRelingen">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefAantalTussenRelingen">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefAntislipmat">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXAntislipmat</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBlumotion">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXBlumotion</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBodemBreedte">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBodemDiepte">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBodemKleur">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBoxsideKleur">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXBoxsideKleur</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefDraagkracht">
 <Abstract>1</Abstract>
 <ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefDwarsverdeling">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXDwarsverdeling</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefFrontBevestiging">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXFrontBevestiging</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefFrontHouderKleur">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefFrontOndersteuningAantal">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefFrontOndersteuningType">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXFrontOndersteuningType</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefInterneBreedte">
 <Description>
 DEPRECATED: Gebruik GeefInbouwBreedte()</Description>
 <Abstract>1</Abstract>
 <ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefInbouwBreedte">
 <Abstract>1</Abstract>
 <ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefLadeDiepte">
 <Abstract>1</Abstract>
 <ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefLadeType">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXLadeType</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefOnderdelenSpeciaal">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefOpvullijstLengte">
 <Abstract>1</Abstract>
 <ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefPlaatMateriaal">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefReling">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.TBXProduct.TBXReling</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRelingKleur">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRugHoogte">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXRugHoogte</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRugHoogteMM">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRugHouderKleur">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRugKleur">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefRugMateriaal">
 <Abstract>1</Abstract>
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefTussenReling">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.TBXProduct.TBXReling</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefUittrekbaarheid">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXUittrekbaarheid</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefVerpakking">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXVerpakking</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefVoorwandVerhogingType">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXVoorwandVerhogingType</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefVoorwandVerhogingMateriaal">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXVoorwandVerhogingMateriaal</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefVoorwandVerhogingKleur">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXVoorwandVerhogingKleur</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefWandDikte">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijkantDesign">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijkantDesign</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijkantHoogte">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijkantHoogte</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijkantKleur">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijkantKleur</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijwandHoogte">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijwandHoogte</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijwandVerhogingAantal">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijwandVerhogingKleur">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijwandVerhogingKleur</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijwandVerhogingMateriaal">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijwandVerhogingMateriaal</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefZijwandVerhogingType">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.TBXZijwandVerhogingType</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="IsSpoelbakLade">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="IsSifonLade">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="IsBinnenlade">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefFicheURL">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefLosseOnderdeelIterator">
 <Abstract>1</Abstract>
 <ReturnType>TECH.Iterator</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.PM.Bouwstenen.BouwsteenKind"</ReturnTypeParams>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/DOM/PM/Maatwerk/HF/CreateDataTBX.cls.xml
===================================================================
diff -u -r29059 -r38571
--- vhUnitTest/DOM/PM/Maatwerk/HF/CreateDataTBX.cls.xml	(.../CreateDataTBX.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/HF/CreateDataTBX.cls.xml	(.../CreateDataTBX.cls.xml)	(revision 38571)
@@ -54,7 +54,7 @@
 	Set TBX.BodemKleur="UTLG"       ; = UnitTest LichtGrijs 
 	Set TBX.RugHoogte="D"
 	Set TBX.RugKleur="UTLG"       ; = UnitTest LichtGrijs 
-	Set TBX.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set TBX.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	
 	// Calculated Properties 
 	;Set TBX.CorpusBinnenmaat=863
@@ -100,7 +100,7 @@
 	Set TBX.BodemKleur="UTLG"       ; = UnitTest LichtGrijs 
 	Set TBX.RugHoogte="C"
 	Set TBX.RugKleur="UTLG"       ; = UnitTest LichtGrijs 
-	Set TBX.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set TBX.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	
 	// Calculated Properties 
 	;Set TBX.CorpusBinnenmaat=863
@@ -156,7 +156,7 @@
 	Set TBX.BodemKleur="UTLG"       ; = UnitTest LichtGrijs 
 	Set TBX.RugHoogte="B"
 	Set TBX.RugKleur="UTLG"       ; = UnitTest LichtGrijs 
-	Set TBX.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set TBX.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	
 	// Calculated Properties 
 	;Set TBX.CorpusBinnenmaat=863
Index: BL/PPS/TBX/DocStaalRugOverzichtLijst.cls.xml
===================================================================
diff -u -r29059 -r38571
--- BL/PPS/TBX/DocStaalRugOverzichtLijst.cls.xml	(.../DocStaalRugOverzichtLijst.cls.xml)	(revision 29059)
+++ BL/PPS/TBX/DocStaalRugOverzichtLijst.cls.xml	(.../DocStaalRugOverzichtLijst.cls.xml)	(revision 38571)
@@ -35,7 +35,7 @@
 		Set oQ=##class(DS.PPS.TBX.Queue).%OpenId(ResultSet.Data("ID"))
 		Continue:oQ.Status="PB" ; sequencelijnen met status "PB" worden overgeslagen
 		Set Product = ProductAPI.GeefProduct(oQ.ProductGetObjectId())
-		If (('Product.%Extends("DOM.PM.TBXProduct.TBXLadeMetUitsparing")) && (Product.GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugMateriaal).Staal()) && Product.BevatRug())
+		If (('Product.%Extends("DOM.PM.TBXProduct.TBXLadeMetUitsparing")) && (Product.GeefRugMateriaal() = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()) && Product.BevatRug())
 		{
 			Set Rug = Product.GeefRug()
 			Set RugPRNr = Rug.GeefPRNr()
Index: zTryout/FM/DOM/PM/Maatwerk/HalffabSelector.cls.xml
===================================================================
diff -u -r31421 -r38571
--- zTryout/FM/DOM/PM/Maatwerk/HalffabSelector.cls.xml	(.../HalffabSelector.cls.xml)	(revision 31421)
+++ zTryout/FM/DOM/PM/Maatwerk/HalffabSelector.cls.xml	(.../HalffabSelector.cls.xml)	(revision 38571)
@@ -463,7 +463,7 @@
 	Set IK.BodemKleur="UTLG"       ; = UnitTest LichtGrijs 
 	Set IK.RugHoogte="D"
 	Set IK.RugKleur="UTLG"       ; = UnitTest LichtGrijs 
-	Set IK.RugMateriaal=##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set IK.RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	*/
 	Set IngegevenKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken).%New()
 	/*
Index: DOM/PM/TBXProduct/TBXRechteUitsparing.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/TBXProduct/TBXRechteUitsparing.cls.xml	(.../TBXRechteUitsparing.cls.xml)	(revision 29059)
+++ DOM/PM/TBXProduct/TBXRechteUitsparing.cls.xml	(.../TBXRechteUitsparing.cls.xml)	(revision 38571)
@@ -15,11 +15,13 @@
 <Method name="GeefZijkantKleur">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefTussenrugMateriaal">
 <Abstract>1</Abstract>
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: DOM/PM/TBXProduct/impl/TBXSifonladeTypeBlumImpl.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/TBXProduct/impl/TBXSifonladeTypeBlumImpl.cls.xml	(.../TBXSifonladeTypeBlumImpl.cls.xml)	(revision 29059)
+++ DOM/PM/TBXProduct/impl/TBXSifonladeTypeBlumImpl.cls.xml	(.../TBXSifonladeTypeBlumImpl.cls.xml)	(revision 38571)
@@ -106,17 +106,17 @@
 
 <Method name="GeefTussenrugMateriaal">
 <Private>1</Private>
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
 <Implementation><![CDATA[
 	Set SPZK = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",..GeefPRNr(),"SPZK"))
 	Set TussenrugMateriaal = ""
 	If ($Extract(SPZK,1,1) = "M")
 	{
-		Set TussenrugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+		Set TussenrugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	}
 	Else
 	{
-		Set TussenrugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Staal()
+		Set TussenrugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()
 	}
 	Quit TussenrugMateriaal
 ]]></Implementation>
Index: DOM/PM/TBXProduct/impl/TBXSpoelbakladeImpl.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/TBXProduct/impl/TBXSpoelbakladeImpl.cls.xml	(.../TBXSpoelbakladeImpl.cls.xml)	(revision 29059)
+++ DOM/PM/TBXProduct/impl/TBXSpoelbakladeImpl.cls.xml	(.../TBXSpoelbakladeImpl.cls.xml)	(revision 38571)
@@ -51,7 +51,7 @@
 
 <Method name="GeefTussenrugMateriaal">
 <Private>1</Private>
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefRugMateriaal()
 ]]></Implementation>
 </Method>
Index: vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml
===================================================================
diff -u -r38290 -r38571
--- vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml	(.../TestTBXLade.cls.xml)	(revision 38290)
+++ vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml	(.../TestTBXLade.cls.xml)	(revision 38571)
@@ -78,7 +78,7 @@
 	Do $$$AssertEquals(Product.GeefRugHoogteMM(),199,"D rughoogte")
 	Do $$$AssertEquals(Product.GeefRugKleur(),"LG","Rugkleur metaalgrijs")
 	Do $$$AssertEquals(Product.GeefRugHouderKleur(),"MG","Rughouderkleur metaalgrijs")
-	Do $$$AssertEquals(Product.GeefRugMateriaal(),##class(DOM.PM.enu.TBXRugMateriaal).Hout(),"Rugmateriaal hout")
+	Do $$$AssertEquals(Product.GeefRugMateriaal(),##class(DOM.PM.enu.TBXRugwandMateriaal).Hout(),"Rugmateriaal hout")
 	Do $$$AssertTrue('$IsObject(Product.GeefTussenReling()),"Product heeft geen tussenreling")
 	Do $$$AssertEquals(Product.GeefUittrekbaarheid(),##class(DOM.PM.enu.TBXUittrekbaarheid).Volledig(),"Enkele uittrekbaarheid")
 	Do $$$AssertEquals(Product.GeefWandDikte(),0,"Wanddikte 0 (niet ingesteld)")
@@ -107,9 +107,9 @@
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefBreedteInBodem(),634+63,"Spoelbak is 697mm breed")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefDiepte(),360,"Spoelbak is 360mm diep tov front")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefDiepteInBodem(),360-24,"Spoelbak is 336mm diep in de bodem uitgewerkt")
-	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefTussenrugMateriaal(),##class(DOM.PM.enu.TBXRugMateriaal).Hout(),"Tussenrugmateriaal is hout")
+	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefTussenrugMateriaal(),##class(DOM.PM.enu.TBXRugwandMateriaal).Hout(),"Tussenrugmateriaal is hout")
 	
-	Do $$$AssertEquals(Product.GeefRugMateriaal(),##class(DOM.PM.enu.TBXRugMateriaal).Hout(),"De rug is in hout")
+	Do $$$AssertEquals(Product.GeefRugMateriaal(),##class(DOM.PM.enu.TBXRugwandMateriaal).Hout(),"De rug is in hout")
 
 	// Testen TussenstukDiepte (bij LD=500) 
 	Do $$$AssertEquals(Product.GeefLadeDiepte(),500,"Ladediepte van 500")   ; ter controle
@@ -183,15 +183,15 @@
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefAfstandTotBodemRechts(),537-69,"Sifon zit 468mm van rechts van de bodem")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefDiepte(),360,"Sifon is 360mm diep")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefZijkantKleur(),"MG","Kleur van de binnenzijkant")
-	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefTussenrugMateriaal(),##class(DOM.PM.enu.TBXRugMateriaal).Hout(),"Tussenrugmateriaal is hout")
+	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(1).GeefTussenrugMateriaal(),##class(DOM.PM.enu.TBXRugwandMateriaal).Hout(),"Tussenrugmateriaal is hout")
 	
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefAfstandTotZijkantLinks(),61+69+263+144,"Sifon zit 606.5mm van links van de zijkant")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefAfstandTotZijkantRechts(),81+69,"Sifon zit 162.5mm van rechts van de zijkant")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefAfstandTotBodemLinks(),61+263+144,"Sifon zit 162.5mm van links van de bodem")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefAfstandTotBodemRechts(),81,"Sifon zit 81mm van rechts van de bodem")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefDiepte(),360,"Sifon is 360mm diep")
 	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefZijkantKleur(),"MG","Kleur van de binnenzijkant")
-	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefTussenrugMateriaal(),##class(DOM.PM.enu.TBXRugMateriaal).Hout(),"Tussenrugmateriaal is hout")
+	Do $$$AssertEquals(Product.GeefUitsparingen().GetAt(2).GeefTussenrugMateriaal(),##class(DOM.PM.enu.TBXRugwandMateriaal).Hout(),"Tussenrugmateriaal is hout")
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugHouderv001.cls.xml
===================================================================
diff -u -r30379 -r38571
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugHouderv001.cls.xml	(.../HFRugHouderv001.cls.xml)	(revision 30379)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TBX/HFRugHouderv001.cls.xml	(.../HFRugHouderv001.cls.xml)	(revision 38571)
@@ -13,7 +13,7 @@
 	Set IngegevenKenmerken.RugHouderKleur ="SW"
 	Set IngegevenKenmerken.ZijwandHoogte = "B"
 	Set IngegevenKenmerken.RugHoogte = "B"
-	Set IngegevenKenmerken.RugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set IngegevenKenmerken.RugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	
 	Set HFBuilder = ##class(DOM.PM.Maatwerk.Calc.HF.impl.TBX.HFRugHouderv001).%New("")
 	
Index: APPS/PM/Maatwerk/TBX/Frees/Generator.cls.xml
===================================================================
diff -u -r29059 -r38571
--- APPS/PM/Maatwerk/TBX/Frees/Generator.cls.xml	(.../Generator.cls.xml)	(revision 29059)
+++ APPS/PM/Maatwerk/TBX/Frees/Generator.cls.xml	(.../Generator.cls.xml)	(revision 38571)
@@ -63,7 +63,7 @@
 		#dim Diepte As %Decimal = TandemBox.GeefBodemDiepte()
 		#dim Dikte As %Decimal = 16.1
 	
-		#dim Variabelen As %String  ; Multi-dimensional 
+		#dim Variabelen As %String  ; Multi-dimensional
 	
 		Set Variabelen("l") = Breedte // Bodemlengte = ladebreedte
 		Set Variabelen("b") = Diepte // Bodembreedte = ladediepte
@@ -100,7 +100,7 @@
 			If (Uitsparingen.GetAt(1).IsRechteUitsparing())
 			{
 				Set Variabelen("CorrSp") = 0.8
-				If (Uitsparingen.GetAt(1).GeefTussenrugMateriaal() = ##class(DOM.PM.enu.TBXRugMateriaal).Hout())
+				If (Uitsparingen.GetAt(1).GeefTussenrugMateriaal() = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout())
 				{
 					Set Variabelen("CorrSp") = Variabelen("CorrSp") + 3 // extra uitsparing nodig bij houten ruggen
 				}
Index: APPS/Halux/PPS/TBXZaag/Opdrachten.cls.xml
===================================================================
diff -u -r29059 -r38571
--- APPS/Halux/PPS/TBXZaag/Opdrachten.cls.xml	(.../Opdrachten.cls.xml)	(revision 29059)
+++ APPS/Halux/PPS/TBXZaag/Opdrachten.cls.xml	(.../Opdrachten.cls.xml)	(revision 38571)
@@ -120,7 +120,7 @@
 	{
 		If Lade.BevatBodem() && 'Lade.GeefBodem().HeeftInkeping()
 		{
-			If (Lade.BevatRug())&&(Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout())&&(SubBatch'=##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).SpoelbakSifon())
+			If (Lade.BevatRug())&&(Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout())&&(SubBatch'=##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).SpoelbakSifon())
 			{
 				Set Code=##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).BodemRug()
 			}
@@ -129,7 +129,7 @@
 				Set Code=##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Bodem()
 			}
 		}
-		Elseif Lade.BevatRug()&&(Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout())
+		Elseif Lade.BevatRug()&&(Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout())
 		{
 			If (SubBatch'=##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).SpoelbakSifon())
 			{
Index: EXT/Unishop/PurchaseOrder001/ProductConverter.cls.xml
===================================================================
diff -u -r38425 -r38571
--- EXT/Unishop/PurchaseOrder001/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 38425)
+++ EXT/Unishop/PurchaseOrder001/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 38571)
@@ -183,7 +183,7 @@
 		Do ..ConverterData.Add(PropertyName,PropertyName)
 	}
 	Do ..ConverterData.Add("LadeHoogte", "RugHoogte")
-	Do ..ConverterData.Add("TussenrugMateriaal","TussenrugMateriaal","Set Output = $Case(Input, ""W"":##class(DOM.PM.enu.TBXRugMateriaal).Hout(), ""S"":##class(DOM.PM.enu.TBXRugMateriaal).Staal(), :Input)")
+	Do ..ConverterData.Add("TussenrugMateriaal","TussenrugMateriaal","Set Output = $Case(Input, ""W"":##class(DOM.PM.enu.TBXRugwandMateriaal).Hout(), ""S"":##class(DOM.PM.enu.TBXRugwandMateriaal).Staal(), :Input)")
 	
 	Quit ..ConverterData
 ]]></Implementation>
Index: DOM/PM/enu/TBXRugwandMateriaal.cls.xml
===================================================================
diff -u -r38307 -r38571
--- DOM/PM/enu/TBXRugwandMateriaal.cls.xml	(.../TBXRugwandMateriaal.cls.xml)	(revision 38307)
+++ DOM/PM/enu/TBXRugwandMateriaal.cls.xml	(.../TBXRugwandMateriaal.cls.xml)	(revision 38571)
@@ -4,11 +4,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;Hout;Staal</Default>
+<Default>,Hout,Staal</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;Hout;Staal</Default>
+<Default>,Hout,Staal</Default>
 </Parameter>
 
 <Method name="Hout">
Index: vhUnitTest/DOM/PM/impl/IKCanonischeWaarde/TestTBXKenmerken.cls.xml
===================================================================
diff -u -r38570 -r38571
--- vhUnitTest/DOM/PM/impl/IKCanonischeWaarde/TestTBXKenmerken.cls.xml	(.../TestTBXKenmerken.cls.xml)	(revision 38570)
+++ vhUnitTest/DOM/PM/impl/IKCanonischeWaarde/TestTBXKenmerken.cls.xml	(.../TestTBXKenmerken.cls.xml)	(revision 38571)
@@ -36,9 +36,9 @@
 	Set TBXKenmerken.RugKleur = "DG"
 	Set TBXKenmerken.RugHouderKleur = "RHK"
 	Set TBXKenmerken.RugHoogte = ##class(DOM.PM.enu.TBXRugHoogte).N()
-	Set TBXKenmerken.RugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set TBXKenmerken.RugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	Set TBXKenmerken.SpoelbakBinnenzijwandHoogte = "M"
-	Set TBXKenmerken.TussenrugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Staal() 
+	Set TBXKenmerken.TussenrugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal() 
 	Set TBXKenmerken.UitsparingZijkantKleur = "SZK"
 	Set TBXKenmerken.HeeftZijstabilisering = 1
 	Set TBXKenmerken.UitsparingBreedte1 = 102
Index: DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml
===================================================================
diff -u -r38570 -r38571
--- DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml	(.../TBXKenmerken.cls.xml)	(revision 38570)
+++ DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml	(.../TBXKenmerken.cls.xml)	(revision 38571)
@@ -105,7 +105,7 @@
 </Property>
 
 <Property name="RugMateriaal">
-<Type>DOM.PM.enu.TBXRugMateriaal</Type>
+<Type>DOM.PM.enu.TBXRugwandMateriaal</Type>
 </Property>
 
 <Property name="SpoelbakBinnenzijwandHoogte">
@@ -118,7 +118,7 @@
 </Property>
 
 <Property name="TussenrugMateriaal">
-<Type>DOM.PM.enu.TBXRugMateriaal</Type>
+<Type>DOM.PM.enu.TBXRugwandMateriaal</Type>
 </Property>
 
 <Property name="UitsparingBreedte1">
@@ -269,7 +269,7 @@
 	Set ..FrontOndersteuningType = ##class(DOM.PM.enu.TBXFrontOndersteuningType).FrontSteun()
 	Set ..HangmapBoringAantal = 0
 	Set ..DwarsverdelingAantal = ##class(DOM.PM.enu.TBXDwarsverdeling).Zonder()
-	Set ..RugMateriaal = ##class(DOM.PM.enu.TBXRugMateriaal).Hout()
+	Set ..RugMateriaal = ##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()
 	Set ..Verpakking = ##class(DOM.PM.enu.TBXVerpakking).StukMetOnderdelen()   ; Stuk 
 	Set ..PlaatMateriaal="HS"
 ]]></Implementation>
Index: DOM/PM/TBXProduct/TBXRug.cls.xml
===================================================================
diff -u -r29059 -r38571
--- DOM/PM/TBXProduct/TBXRug.cls.xml	(.../TBXRug.cls.xml)	(revision 29059)
+++ DOM/PM/TBXProduct/TBXRug.cls.xml	(.../TBXRug.cls.xml)	(revision 38571)
@@ -13,20 +13,24 @@
 
 <Method name="GeefHoogte">
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefHoogteVanLade">
 <ReturnType>DOM.PM.enu.TBXRugHoogte</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBreedte">
 <Abstract>1</Abstract>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefMateriaal">
 <Abstract>1</Abstract>
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: APPS/PM/Maatwerk/dto/TBXKenmerken.cls.xml
===================================================================
diff -u -r38568 -r38571
--- APPS/PM/Maatwerk/dto/TBXKenmerken.cls.xml	(.../TBXKenmerken.cls.xml)	(revision 38568)
+++ APPS/PM/Maatwerk/dto/TBXKenmerken.cls.xml	(.../TBXKenmerken.cls.xml)	(revision 38571)
@@ -102,7 +102,7 @@
 </Property>
 
 <Property name="RugMateriaal">
-<Type>DOM.PM.enu.TBXRugMateriaal</Type>
+<Type>DOM.PM.enu.TBXRugwandMateriaal</Type>
 </Property>
 
 <Property name="SpoelbakBinnenzijwandHoogte">
@@ -119,7 +119,7 @@
 </Property>
 
 <Property name="TussenrugMateriaal">
-<Type>DOM.PM.enu.TBXRugMateriaal</Type>
+<Type>DOM.PM.enu.TBXRugwandMateriaal</Type>
 </Property>
 
 <Property name="UitsparingBreedte1">
Index: zTryout/FM/TBX/ZaagEtiket.cls.xml
===================================================================
diff -u -r29059 -r38571
--- zTryout/FM/TBX/ZaagEtiket.cls.xml	(.../ZaagEtiket.cls.xml)	(revision 29059)
+++ zTryout/FM/TBX/ZaagEtiket.cls.xml	(.../ZaagEtiket.cls.xml)	(revision 38571)
@@ -90,7 +90,7 @@
 	. Set pxLabel.BreedteB=IB-75
 	
  	set Lade = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(PRNr)
-	if Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout() {
+	if Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout() {
 		set pxLabel.RWHInfo = "RWH: "_Lade.GeefRugHouderKleur()_" "_Lade.GeefZijwandHoogte()
 	  	if Lade.BevatVerlaagdeRug() {
 			set pxLabel.RugInfo = "VRug "_RH_":"_pxLabel.RHNet_" "_pxLabel.BreedteR_" #"_pxLabel.Bor
@@ -101,7 +101,7 @@
 			set pxLabel.RWHInfo = pxLabel.RWHInfo_" .22"
 		}
 	}
-	elseif Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Staal() {
+	elseif Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal() {
 		Set pxLabel.RugInfo = "StalenRug: "_Lade.GeefRugKleur()_" "_Lade.GeefRugHoogte()_" "_(pxLabel.IB-28)
 		Set pxLabel.RWHInfo = "RWH: -- -- --"
 	}
Index: DOM/PM/TBXProduct/impl/TBXRugOpMaatImpl.cls.xml
===================================================================
diff -u -r29214 -r38571
--- DOM/PM/TBXProduct/impl/TBXRugOpMaatImpl.cls.xml	(.../TBXRugOpMaatImpl.cls.xml)	(revision 29214)
+++ DOM/PM/TBXProduct/impl/TBXRugOpMaatImpl.cls.xml	(.../TBXRugOpMaatImpl.cls.xml)	(revision 38571)
@@ -21,8 +21,8 @@
 </Method>
 
 <Method name="GeefMateriaal">
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.PM.enu.TBXRugMateriaal).Staal()
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()
 ]]></Implementation>
 </Method>
 </Class>
Index: BL/PPS/TBX/DocRugwandhouderLijst.cls.xml
===================================================================
diff -u -r30901 -r38571
--- BL/PPS/TBX/DocRugwandhouderLijst.cls.xml	(.../DocRugwandhouderLijst.cls.xml)	(revision 30901)
+++ BL/PPS/TBX/DocRugwandhouderLijst.cls.xml	(.../DocRugwandhouderLijst.cls.xml)	(revision 38571)
@@ -45,7 +45,7 @@
 		#dim PRNr As DOM.common.ProductID = oQ.ProductGetObjectId()
 		#dim Lade As DOM.PM.TBXProduct.TBXLade = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(PRNr)
 		
-		If (Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout()) &&
+		If (Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout()) &&
 		   ( Lade.%Extends("DOM.PM.TBXProduct.TBXLadeMetUitsparing") || (Lade.GeefBlumotion() = ##class(DOM.PM.enu.TBXBlumotion).TipOn()) )
 		{
 			For BouwsteenLabel = "PRRUGLI.001","PRRUGRE.001","PRRUGSPLI.001","PRRUGSPRE.001"
Index: zTryout/FM/TBX/LadeFinder.cls.xml
===================================================================
diff -u -r29059 -r38571
--- zTryout/FM/TBX/LadeFinder.cls.xml	(.../LadeFinder.cls.xml)	(revision 29059)
+++ zTryout/FM/TBX/LadeFinder.cls.xml	(.../LadeFinder.cls.xml)	(revision 38571)
@@ -164,7 +164,7 @@
 	#dim Rug As DOM.PM.TBXProduct.TBXRug = Product.GeefRug()
 	If ((Rug ="") || (Rug.GeefID() = 89322) || (Rug.GeefID() = 89325)) {
 		Set Resultaat = 0	// skip laden waarvan de rug is vervangen door het generisch product
-	} ElseIf (Rug.GeefMateriaal() = ##class(DOM.PM.enu.TBXRugMateriaal).Staal()) {
+	} ElseIf (Rug.GeefMateriaal() = ##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()) {
 		Set Resultaat = 1
 	} Else {
 		Set Resultaat = 0
Index: zTryout/FM/BL/PPS/TBX/EtiketSimulatie.cls.xml
===================================================================
diff -u -r29059 -r38571
--- zTryout/FM/BL/PPS/TBX/EtiketSimulatie.cls.xml	(.../EtiketSimulatie.cls.xml)	(revision 29059)
+++ zTryout/FM/BL/PPS/TBX/EtiketSimulatie.cls.xml	(.../EtiketSimulatie.cls.xml)	(revision 38571)
@@ -73,7 +73,7 @@
 	
 	
  	set Lade = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(PRNr)
-	if Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout() {
+	if Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Hout() {
 		set pxLabel.RWHInfo = "RWH: "_Lade.GeefRugHouderKleur()_" "_Lade.GeefZijwandHoogte()
 	  	if Lade.BevatVerlaagdeRug() {
 			set pxLabel.RugInfo = "VRug "_RH_":"_pxLabel.RHNet_" "_pxLabel.BreedteR_" #"_pxLabel.Bor
@@ -85,7 +85,7 @@
 			set pxLabel.RugInfo = "Rug:  "_pxLabel.RHNet_" "_pxLabel.BreedteR_" #"_pxLabel.Bor
 		}
 	}
-	elseif Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Staal() {
+	elseif Lade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal() {
 		Set pxLabel.RugInfo = "StalenRug: "_Lade.GeefRugKleur()_" "_Lade.GeefRugHoogte()_" "_(pxLabel.IB-28)
 		Set pxLabel.RWHInfo = "RWH: -- -- --"
 	}
Index: vhTest/Mock/DOM/PM/TBXProduct/TBXLade.cls.xml
===================================================================
diff -u -r34548 -r38571
--- vhTest/Mock/DOM/PM/TBXProduct/TBXLade.cls.xml	(.../TBXLade.cls.xml)	(revision 34548)
+++ vhTest/Mock/DOM/PM/TBXProduct/TBXLade.cls.xml	(.../TBXLade.cls.xml)	(revision 38571)
@@ -363,7 +363,7 @@
 </Method>
 
 <Method name="GeefRugMateriaal">
-<ReturnType>DOM.PM.enu.TBXRugMateriaal</ReturnType>
+<ReturnType>DOM.PM.enu.TBXRugwandMateriaal</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefRugMateriaal")
 ]]></Implementation>
 </Method>