Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34273 -r34277
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34273)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34277)
@@ -147,18 +147,19 @@
 	set PostalAddres.ZipCode = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Adres.GeefPostcode(),Adres.GeefLandNr())	
 	set PostalAddres.LocationName = DirParty.Name
 	
-	If ..VergelijkLandCodeMetBTWnummer(Partij) {	
+	If ..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) {	
 		Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
 	} Else {
-		#dim DummyPostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView
+		#dim FictiefPostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView
 		
-		Set DummyPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()		
-		Set DummyPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
-		Set DummyPostalAddres.CountryRegionId = Partij.GeefAdres().GeefLand().GeefIso3()
-		Set DummyPostalAddres.Roles = "Business"
+		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()		
+		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
+		Set FictiefPostalAddres.CountryRegionId = Partij.GeefAdres().GeefLand().GeefIso3()
+		Set FictiefPostalAddres.Roles = "Business"
+		Set FictiefPostalAddres.LocationName = DirParty.Name
 		Set PostalAddres.LocationName = DirParty.Name
 		Set PostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).No()
-		Do DirParty.DirPartyPostalAddressView.Insert(DummyPostalAddres)
+		Do DirParty.DirPartyPostalAddressView.Insert(FictiefPostalAddres)
 		Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
 	}
 ]]></Implementation>
@@ -202,7 +203,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VergelijkLandCodeMetBTWnummer">
+<Method name="IsLandCodeInAdresGelijkAanLandInBTWnummer">
 <FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34266 -r34277
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34266)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34277)
@@ -886,10 +886,13 @@
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
-	#dim PostalAddresDummy As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	#dim PostalAddresFictief As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
 	#dim PostalAddresEcht As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
 	
-	do $$$AssertEquals(PostalAddresDummy.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddresFictief.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddresFictief.CountryRegionId,"BEL")
+	do $$$AssertEquals(PostalAddresFictief.Roles,"Business")
+	do $$$AssertEquals(PostalAddresFictief.LocationName,"Een Willekeurige naam Toenaam")
 	do $$$AssertEquals(PostalAddresEcht.IsPrimary,"No")
 	do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),2)
 ]]></Implementation>
@@ -905,8 +908,10 @@
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
 	
 	do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),1)
+	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
 ]]></Implementation>
 </Method>
 </Class>