Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml
===================================================================
diff -u -r73543 -r73582
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 73543)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 73582)
@@ -8,7 +8,7 @@
 	#dim DomKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken  = ##class(DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerkenv01).%New()
 	#dim DummyCID As %String = "ABC123"
 	#dim DummyMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = " { ""CID"": """ _ DummyCID _ """} "
-	#dim DummyResponse As %Stream.GlobalBinary = "{""CID"": null, ""VhConfig"": {""isValid"": ""null"", ""MaatwerkDetails"": { ""Halffabrikaten"": {}, ""Kosten"": [], ""VerwijderdeHalffabItems"": [] }, ""Characteristics"": {}, ""Model"": null, ""CalculatedCharacteristics"": {} }}"
+	#dim DummyResponse As %Stream.GlobalBinary = "{""CID"": null, ""VhConfig"": {""isValid"": ""null"", ""MaatwerkDetails"": { ""SemiFinishedProducts"": {}, ""Kosten"": [], ""VerwijderdeHalffabItems"": [] }, ""Characteristics"": {}, ""Model"": null, ""CalculatedCharacteristics"": {} }}"
 	Set DummyResponse = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse).%New()
 	Set DummyVhConfig = ##class(APPS.PM.Maatwerk.dto.VhConfig).%New()
 	Set DummyVhConfig.IsValid = $$$True
Index: APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml
===================================================================
diff -u -r73118 -r73582
--- APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml	(.../MaatwerkDetails.cls.xml)	(revision 73118)
+++ APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml	(.../MaatwerkDetails.cls.xml)	(revision 73582)
@@ -4,7 +4,7 @@
 <ClassType>serial</ClassType>
 <Super>%SerialObject</Super>
 
-<Property name="Halffabrikaten">
+<Property name="SemiFinishedProducts">
 <Type>APPS.PM.Maatwerk.dto.VhConfig.Halffabrikaat</Type>
 <Collection>array</Collection>
 </Property>
@@ -33,6 +33,9 @@
 <Value name="3">
 <Value>VerwijderdeHalffabItems</Value>
 </Value>
+<Value name="4">
+<Value>SemiFinishedProducts</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml
===================================================================
diff -u -r73543 -r73582
--- APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 73543)
+++ APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 73582)
@@ -39,11 +39,11 @@
 <Method name="GeefHalffabrikatenListIterator">
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not($$$HasLength(..VhConfig.CustomBuildDetails.Halffabrikaten)) {
+	If $$$Not($$$HasLength(..VhConfig.CustomBuildDetails.SemiFinishedProducts)) {
 		Quit ##class(TECH.ListIterator).%New(##class(%ArrayOfObjects).%New())
 	}
 	
-	Quit ##class(TECH.ListIterator).%New(..VhConfig.CustomBuildDetails.Halffabrikaten)
+	Quit ##class(TECH.ListIterator).%New(..VhConfig.CustomBuildDetails.SemiFinishedProducts)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u -r73005 -r73582
--- vhTest/Fake/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 73005)
+++ vhTest/Fake/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 73582)
@@ -23,8 +23,7 @@
 
 <Method name="Bewaar">
 <FormalSpec>Data:TECH.Persistent</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="Dupliceer">
@@ -56,32 +55,27 @@
 
 <Method name="SaveVhConfig">
 <FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,IsTestData:%Boolean=0</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderCID">
 <FormalSpec>CID:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderTestData">
 <FormalSpec>OfferteID:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderViaID">
 <FormalSpec>ID:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderViaObject">
 <FormalSpec>Data:TECH.Persistent</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ZoekAlle">
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml
===================================================================
diff -u -r73581 -r73582
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 73581)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 73582)
@@ -7,7 +7,7 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-LegeJsonStream  /* Test lege halffabrikaten en kosten 
+LegeJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {	}
 */
 ]]></Implementation>
@@ -31,7 +31,7 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-OngeldigeJsonStream  /* Test lege halffabrikaten en kosten 
+OngeldigeJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {  
 	"UTOnbekendeProperty": null
   }
@@ -57,7 +57,7 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-NullableCharacteristicsJsonStream  /* Test lege halffabrikaten en kosten 
+NullableCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {
 	"CID": "abc-123",
 	"VhConfig": {
@@ -101,12 +101,12 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-LegeCharacteristicsJsonStream  /* Test lege halffabrikaten en kosten 
+LegeCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {
 	"CID": "abc-123",
 	"VhConfig": {
 	    "CustomBuildDetails": {
-	    	Halffabrikaten: {},
+	    	"SemiFinishedProducts": {},
 	        "Kosten": [],
 	        "VerwijderdeHalffabItems": []
 	    },
@@ -148,16 +148,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Assign: Ingevulde halffabrikaten">
+<Method name="Assign: Ingevulde SemiFinishedProducts">
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-IngevuldeHalffabrikatenJsonStream  /* Test lege halffabrikaten en kosten 
+IngevuldeSemiFinishedProductsJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {
 	"CID": "abc-123",
 	"VhConfig": {
 	    "CustomBuildDetails": {
-	        "Halffabrikaten": {
+	        "SemiFinishedProducts": {
 	            "Verpakking.V1DoosMetDeksel": {
 	                "Aantal": 1.139346,
 	                "ProductId": "9.537.438.3",
@@ -206,9 +206,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Ingevulde halffabrikaten">
+<Method name="Test: Ingevulde SemiFinishedProducts">
 <Implementation><![CDATA[
-	#dim JsonStream As %Stream = ..GeefStream("IngevuldeHalffabrikatenJsonStream")
+	#dim JsonStream As %Stream = ..GeefStream("IngevuldeSemiFinishedProductsJsonStream")
 	
 	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
 	#dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.ParseMaatwerkDetailsResponse(JsonStream)
@@ -221,20 +221,20 @@
 			
 			Do $$$AssertEquals(VhConfig.Model,"M_LBX")
 			If $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) {
-				Do $$$AssertEquals(VhConfig.CustomBuildDetails.Halffabrikaten.Count(), 2)
+				Do $$$AssertEquals(VhConfig.CustomBuildDetails.SemiFinishedProducts.Count(), 2)
 				
-				#dim Halffabrikaten As %Collection.ArrayOfObj = VhConfig.CustomBuildDetails.Halffabrikaten
-				#dim HalffabrikatenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Halffabrikaten)
+				#dim SemiFinishedProducts As %Collection.ArrayOfObj = VhConfig.CustomBuildDetails.SemiFinishedProducts
+				#dim SemiFinishedProductsKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(SemiFinishedProducts)
 				
-				#dim FrontBevestigingKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(1)
+				#dim FrontBevestigingKeyValuePair As TECH.KeyValuePair = SemiFinishedProductsKeyValueList.GetAt(1)
 				Do ..AssertHalffabrikaat(FrontBevestigingKeyValuePair, "FrontBevestiging", "Standaard", 2, "0.705.488.1", "ZF7M70E2   FROB  V500  ZN", $$$True, $$$False)
 				
 				#dim FrontBevestigingKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(FrontBevestigingKeyValuePair.Value.Kenmerken)
 				Do $$$AssertEquals(FrontBevestigingKenmerkenKeyValuePair.Count(), 2)
 				Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(1), "Frontbevestiging", "E")
 				Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(2), "LadeHoogte", "M")
 				
-				#dim V1DoosMetDekselKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(2)
+				#dim V1DoosMetDekselKeyValuePair As TECH.KeyValuePair = SemiFinishedProductsKeyValueList.GetAt(2)
 				Do ..AssertHalffabrikaat(V1DoosMetDekselKeyValuePair, "Verpakking.V1DoosMetDeksel", "Bewerkt",  1.139346, "9.537.438.3", "VFF.TB143EB ZZCARTON   BR", $$$True, $$$False, 1, 1244.6, 1150, 1147, 1244.6, 1306.83, "V1 ladedoos", "Verpakking")
 				
 				#dim V1DoosMetDekselKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.Kenmerken)
@@ -255,12 +255,12 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-IngevuldeKostenJsonStream  /* Test lege halffabrikaten en kosten 
+IngevuldeKostenJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {
 	"CID": "abc-123",
 	"VhConfig": {
 	    "CustomBuildDetails": {
-	        "Halffabrikaten": {},
+	        "SemiFinishedProducts": {},
 	        "Kosten": [
 	            {
 	                "Groep": "KostHoofdlijn",
@@ -343,12 +343,12 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-IngevuldeCharacteristicsJsonStream  /* Test lege halffabrikaten en kosten 
+IngevuldeCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {
 	  "CID": "abc-123",
 	  "VhConfig": {
 		    "CustomBuildDetails": {
-		        "Halffabrikaten": {},
+		        "SemiFinishedProducts": {},
 		        "Kosten": [],
 		        "VerwijderdeHalffabItems": []
 		    },
@@ -399,12 +399,12 @@
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-IngevuldeCalculatedCharacteristicsJsonStream  /* Test lege halffabrikaten en kosten 
+IngevuldeCalculatedCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en kosten 
   {
 	"CID": "abc-123",
 	"VhConfig": {
 	    "CustomBuildDetails": {
-	        "Halffabrikaten": {},
+	        "SemiFinishedProducts": {},
 	        "Kosten": [],
 	        "VerwijderdeHalffabItems": []
 	    },