Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml
===================================================================
diff -u -r49738 -r49742
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 49738)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 49742)
@@ -60,6 +60,36 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Voor het HoofdAdres moet Naam  afgekapt worden op 27 karakters">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdres()
+	Set Address.Description = "12345678901234567890123456789012345678901234567890"
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	#dim IsPrimairAdres As %Boolean = $$$True
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefNaam(),"123456789012345678901234567")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Voor een LeverAdres moet Naam moet afgekapt worden op 25 karakters">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdres()
+	Set Address.Description = "12345678901234567890123456789012345678901234567890"
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	#dim IsPrimairAdres As %Boolean = $$$False
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefNaam(),"1234567890123456789012345")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Opmerking1 en Opmerking2 moeten afgekapt worden op 40 karakters">
 <Implementation><![CDATA[
 	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
Index: AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml
===================================================================
diff -u -r49738 -r49742
--- AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 49738)
+++ AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 49742)
@@ -48,7 +48,7 @@
 <FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,BestaandLeverAdres:DOM.VKP.LeverAdres,IsPrimairAdres:%Boolean</FormalSpec>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
-	Do Adres.ZetNaam(Address.Description)
+	Do Adres.ZetNaam($Extract(Address.Description,1,27))
 	Do Adres.ZetAanspreking("")
 	Do Adres.ZetStraat(Address.Street)
 	Do Adres.ZetPostcode(Address.ZipCode)
@@ -58,6 +58,7 @@
 	Do Adres.ZetVerzendingWijze(..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, Address.LocationId))
 	Do Adres.ZetType("")
 	If $$$Not(IsPrimairAdres) {
+		Do Adres.ZetNaam($Extract(Address.Description,1,25))
 		Do Adres.ZetTelefoon(BestaandLeverAdres.GeefTelefoon())
 		Do Adres.ZetOpmerking1($Extract(Address.Nota1External,1,40))
 		Do Adres.ZetOpmerking2($Extract(Address.Nota2External,1,40))