Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34277 -r34296
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34277)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34296)
@@ -46,7 +46,7 @@
 	set DirParty = ##class(AXaif.Customer.AxdEntityDirPartyDirOrganization).%New()
 	set DirParty.class = "entity"
 	set DirParty.LanguageId = ..Formatter.FormatLanguageId(Partij.GeefTaal())
-	set DirParty.Name = $$$Trim(Partij.GeefNaam()_$$$IfLength(Partij.GeefToenaam()," ","")_$s(##class(APPS.common.enu.JuridischeVorm).IsValid(Partij.GeefAanspreking()):" "_Partij.GeefAanspreking(),1:""))
+	set DirParty.Name = ..FormatPartyName(Partij)
 	set:(Partij.GeefAdres().GeefLandNr()=##class(DOM.common.enu.Land).Nederland()) DirParty.DunsNumberRecId = Partij.GeefHandelRegisterNr()
 	
 	set OrganizationName = ##class(AXaif.Customer.AxdEntityOrganizationName).%New()
@@ -84,6 +84,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="FormatPartyName">
+<FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Name As %String = Partij.GeefNaam()_$$$IfLength(Partij.GeefToenaam()," ","")
+	set:##class(APPS.common.enu.JuridischeVorm).IsValid(Partij.GeefAanspreking()) Name = Name _ $$$IfLength(Partij.GeefAanspreking()," ","")
+	quit $$$Trim(Name)
+]]></Implementation>
+</Method>
+
 <Method name="ConvertPaymMode">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
 <Private>1</Private>