Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r35470 -r35536
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35470)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35536)
@@ -115,7 +115,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Naam variaties - Een naam en een toenaam worden geconcateneerd">
+<Method name="Test: Naam variaties - De Toenaam mag niet geconverteerd worden">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("Toenaam")
@@ -125,9 +125,9 @@
 	#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 Toenaam")
-	do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam Toenaam")
-	do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam Toenaam")
+	do $$$AssertEquals(Party.Name,"Klantnaam")
+	do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam")
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam")
 ]]></Implementation>
 </Method>
 
@@ -939,7 +939,7 @@
 		do $$$AssertEquals(PostalAddresFictief.IsPrimary,"Yes")
 		do $$$AssertEquals(PostalAddresFictief.CountryRegionId,"NLD")
 		do $$$AssertEquals(PostalAddresFictief.Roles,"Business")
-		do $$$AssertEquals(PostalAddresFictief.LocationName,"Een Willekeurige naam Toenaam")
+		do $$$AssertEquals(PostalAddresFictief.LocationName,"Een Willekeurige naam")
 	}
 	
 	#dim PostalAddresEcht As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r35470 -r35536
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 35470)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 35536)
@@ -153,7 +153,7 @@
 <FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Name As %String = $$$Trim(Partij.GeefNaam())_$$$IfLength($$$Trim(Partij.GeefToenaam())," ","")
+	#dim Name As %String = $$$Trim(Partij.GeefNaam())
 	set:##class(APPS.common.enu.JuridischeVorm).IsValid(Partij.GeefAanspreking()) Name = Name _ $$$IfLength(Partij.GeefAanspreking()," ","")
 	quit $Extract($$$Trim(##class(TECH.StringUtils).Replace(Name,";"," ")),1,60)
 ]]></Implementation>