Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34216 -r34220
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34216)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34220)
@@ -836,6 +836,42 @@
 	do $$$AssertEquals(CustTable.CustGroup,"EX")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Geldige Aanspreking">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("NV")
+	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
+	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
+	
+	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	
+	do $$$AssertEquals(Party.Name,"Klantnaam NV")
+	do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam NV")
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam NV")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen geldige Aanspreking">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("oink")
+	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
+	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
+	
+	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	
+	do $$$AssertEquals(Party.Name,"Klantnaam")
+	do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam")
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/common/enu/JuridischeVorm.cls.xml
===================================================================
diff -u
--- APPS/common/enu/JuridischeVorm.cls.xml	(revision 0)
+++ APPS/common/enu/JuridischeVorm.cls.xml	(revision 34220)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.enu.JuridischeVorm">
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="VALUELIST">
+<Default>,AB,AG,AS,ASBL,BV,BVBA,BV BVBA,BV CVBA,BV VOF,CA,CV,CVA,CVBA,COMM VA,CVOA,CVOHA,EBVBA,EZ,FV,GCV,GMBH,LDA,LTD,MBH,NV,OHG,PGMBH,PLC,SA,SARL,SC,SCRL ,SCS,SECS,SL,SNC,SPA,SPRL,SPRLU ,SRL,SRO,SAS ,SC SPRL,SCA ,SCRI ,SETR,UA,VOF,VZW,VVZRL</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34193 -r34220
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34193)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34220)
@@ -46,7 +46,7 @@
 	set DirParty = ##class(AXaif.Customer.AxdEntityDirPartyDirOrganization).%New()
 	set DirParty.class = "entity"
 	set DirParty.LanguageId = ..FormatLanuageId(Partij.GeefTaal())
-	set DirParty.Name = $$$Trim(Partij.GeefNaam()_$$$IfLength(Partij.GeefToenaam()," ",""))
+	set DirParty.Name = $$$Trim(Partij.GeefNaam()_$$$IfLength(Partij.GeefToenaam()," ","")_$s(##class(APPS.common.enu.JuridischeVorm).IsValid(Partij.GeefAanspreking()):" "_Partij.GeefAanspreking(),1:""))
 	
 	set OrganizationName = ##class(AXaif.Customer.AxdEntityOrganizationName).%New()
 	set OrganizationName.class = "entity"