Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetailsResponse.cls.xml
===================================================================
diff -u -r73021 -r73623
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetailsResponse.cls.xml	(.../GeefMaatwerkDetailsResponse.cls.xml)	(revision 73021)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetailsResponse.cls.xml	(.../GeefMaatwerkDetailsResponse.cls.xml)	(revision 73623)
@@ -7,7 +7,7 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="VhConfig">
+<Property name="CPConfig">
 <Type>APPS.PM.Maatwerk.dto.VhConfig</Type>
 </Property>
 </Class>
Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml
===================================================================
diff -u -r73125 -r73623
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 73125)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 73623)
@@ -66,8 +66,8 @@
 			Set MaatwerkDetailsResponseJsonString = ..EncowayHttpClient.BerekenVhConfig(GeefMaatwerkDetailsRequestJsonStream)
 			
 			#dim MaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = ..EncowayJsonConverter.ParseMaatwerkDetailsResponse(MaatwerkDetailsResponseJsonString)
-			If (MaatwerkDetailsResponse.VhConfig.IsValid) {
-				Set VhConfig = MaatwerkDetailsResponse.VhConfig
+			If (MaatwerkDetailsResponse.CPConfig.IsValid) {
+				Set VhConfig = MaatwerkDetailsResponse.CPConfig
 				Do ..VhConfigRepository.SaveVhConfig(CID, VhConfig, IsTestRunTimeContext)
 			} Else {
 				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen geldige VhConfig verkregen na berekening voor CID '" _ CID _ "'."))
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml
===================================================================
diff -u -r73587 -r73623
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 73587)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 73623)
@@ -22,7 +22,7 @@
 	
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"")
-		Do $$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))
+		Do $$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))
 	}
 ]]></Implementation>
 </Method>
@@ -60,7 +60,7 @@
 NullableCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en Costs 
   {
 	"CID": "abc-123",
-	"VhConfig": {
+	"CPConfig": {
 	    "CustomBuildDetails": null,
 	    "Characteristics": null,
 	    "Model": null,
@@ -81,8 +81,8 @@
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123")
 		
-		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) {
-			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig
+		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) {
+			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig
 			
 			Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig")
 			Do $$$AssertEquals(VhConfig.Model,"")
@@ -104,7 +104,7 @@
 LegeCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en Costs 
   {
 	"CID": "abc-123",
-	"VhConfig": {
+	"CPConfig": {
 	    "CustomBuildDetails": {
 	    	"SemiFinishedProducts": {},
 	        "Costs": [],
@@ -129,8 +129,8 @@
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123")
 		
-		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) {
-			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig
+		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) {
+			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig
 			
 			Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig")
 			Do $$$AssertEquals(VhConfig.Model,"")
@@ -155,7 +155,7 @@
 IngevuldeSemiFinishedProductsJsonStream  /* Test SemiFinishedProducts en Costs 
   {
 	"CID": "abc-123",
-	"VhConfig": {
+	"CPConfig": {
 	    "CustomBuildDetails": {
 	        "SemiFinishedProducts": {
 	            "Verpakking.V1DoosMetDeksel": {
@@ -216,8 +216,8 @@
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123")
 		
-		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) {
-			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig
+		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) {
+			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig
 			
 			Do $$$AssertEquals(VhConfig.Model,"M_LBX")
 			If $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) {
@@ -258,7 +258,7 @@
 IngevuldeCostsJsonStream  /* Test lege SemiFinishedProducts en Costs 
   {
 	"CID": "abc-123",
-	"VhConfig": {
+	"CPConfig": {
 	    "CustomBuildDetails": {
 	        "SemiFinishedProducts": {},
 	        "Costs": [
@@ -311,8 +311,8 @@
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123")
 		
-		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) {
-			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig
+		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) {
+			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig
 			Do $$$AssertEquals(VhConfig.Model,"M_LBX")
 			If $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) {
 				Do $$$AssertEquals(VhConfig.CustomBuildDetails.Costs.Count(), 2)
@@ -346,7 +346,7 @@
 IngevuldeCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en Costs 
   {
 	  "CID": "abc-123",
-	  "VhConfig": {
+	  "CPConfig": {
 		    "CustomBuildDetails": {
 		        "SemiFinishedProducts": {},
 		        "Costs": [],
@@ -376,8 +376,8 @@
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123")
 		
-		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) {
-			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig
+		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) {
+			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig
 			
 			Do $$$AssertEquals(VhConfig.Model,"M_LBX")
 			If $$$AssertTrue($IsObject(VhConfig.Characteristics)) {
@@ -402,7 +402,7 @@
 IngevuldeCalculatedCharacteristicsJsonStream  /* Test lege SemiFinishedProducts en Costs 
   {
 	"CID": "abc-123",
-	"VhConfig": {
+	"CPConfig": {
 	    "CustomBuildDetails": {
 	        "SemiFinishedProducts": {},
 	        "Costs": [],
@@ -437,8 +437,8 @@
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123")
 		
-		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) {
-			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig
+		If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) {
+			#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig
 			
 			Do $$$AssertEquals(VhConfig.Model,"M_LBX")
 			If $$$AssertTrue($IsObject(VhConfig.CalculatedCharacteristics)) {
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml
===================================================================
diff -u -r73583 -r73623
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 73583)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 73623)
@@ -8,11 +8,11 @@
 	#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"": { ""SemiFinishedProducts"": {}, ""Costs"": [], ""RemovedSemiFinishedProducts"": [] }, ""Characteristics"": {}, ""Model"": null, ""CalculatedCharacteristics"": {} }}"
+	#dim DummyResponse As %Stream.GlobalBinary = "{""CID"": null, ""CPConfig"": {""isValid"": ""null"", ""MaatwerkDetails"": { ""SemiFinishedProducts"": {}, ""Costs"": [], ""RemovedSemiFinishedProducts"": [] }, ""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
-	Set DummyResponse.VhConfig = DummyVhConfig
+	Set DummyResponse.CPConfig = DummyVhConfig
 	
 	Set EncowayJsonConverterMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
 	Do EncowayJsonConverterMock.VerwachtMethodCall("Stringify", $$$ElkeWaarde).DanReturn(DummyMaatwerkDetailsRequestJsonStream)