Index: vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml
===================================================================
diff -u -r35503 -r35542
--- vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35503)
+++ vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35542)
@@ -60,12 +60,17 @@
 	
 	#dim PartijAPI As vhTest.Mock.DOM.PARTIJ.PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
 	#dim Partij As vhTest.Mock.DOM.PARTIJ.Partij = ##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij()
-	do Partij.IndienMethodCall("GeefNaam").DanReturn("EEN ANDERE NAAM")
+		do Partij.IndienMethodCall("GeefNaam").DanReturn("EEN ANDERE NAAM")
+		do Partij.IndienMethodCall("GeefTelefoon1").DanReturn("09 123.12.11")
+		do Partij.IndienMethodCall("GeefTelefax").DanReturn("09 123.12.88")
+		do Partij.IndienMethodCall("GeefEmail").DanReturn("iemand@ergensanders.be")
 	do PartijAPI.IndienMethodCall("GeefPartij","K||1234").DanReturn(Partij)
 	
+		
 	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
 	#dim Klant As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	do Klant.IndienMethodCall("GeefNaam").DanReturn("EEN ANDERE NAAM")
+	
 	do VerkoopAPI.IndienMethodCall("GeefKlant","K||1234").DanReturn(Klant)
 	
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"\AIF",..#Applicatie)
Index: AX/common/impl/FileWriter.cls.xml
===================================================================
diff -u -r35032 -r35542
--- AX/common/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 35032)
+++ AX/common/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 35542)
@@ -74,6 +74,11 @@
 	
 	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
 	
+	set From = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"" action=""update"">"
+	set To = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" action=""update"" class=""entity"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">"	
+
+	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
+	
 	set From = "<Values>"
 	set To = "<Values xmlns=""http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"">"
 	
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Create/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r35539 -r35542
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Create/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(.../Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml)	(revision 35539)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Create/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(.../Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml)	(revision 35542)
@@ -96,7 +96,7 @@
           <UnitedVATInvoice_LT>No</UnitedVATInvoice_LT>
           <UseCashDisc>Normal</UseCashDisc>
           <WebSalesOrderDisplay>All</WebSalesOrderDisplay>
-          <DirParty xsi:type="AxdEntity_DirParty_DirOrganization" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" class="entity">
+          <DirParty xsi:type="AxdEntity_DirParty_DirOrganization" action="update" class="entity" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <LanguageId>nl-be</LanguageId>
             <Name>EEN ANDERE NAAM</Name>
             <PartyNumber>000000719</PartyNumber>
@@ -106,7 +106,7 @@
             <PrimaryContactPhone>5637145033</PrimaryContactPhone>
             <RecId>5637152302</RecId>
             <RecVersion>1238470994</RecVersion>
-            <DirPartyPostalAddressView class="entity">
+            <DirPartyPostalAddressView class="entity" action="update" updateMode="Correction">
               <_RecId_LogisticsPostalAddress>5637147302</_RecId_LogisticsPostalAddress>
               <_recVersion_LogisticsPostalAddress>1</_recVersion_LogisticsPostalAddress>
               <City>DUMMYGEMEENTE</City>
@@ -128,7 +128,7 @@
               <ValidTo>2154-12-31T23:59:59Z</ValidTo>
               <ZipCode>9100</ZipCode>
             </DirPartyPostalAddressView>
-            <DirPartyContactInfoView class="entity">
+            <DirPartyContactInfoView class="entity" action="update">
               <ElectronicAddress>5637145033</ElectronicAddress>
               <IsInstantMessage>No</IsInstantMessage>
               <IsLocationOwner>Yes</IsLocationOwner>
@@ -138,7 +138,7 @@
               <Location>5637147496</Location>
               <LocationId>000000450</LocationId>
               <LocationName>Telefoon 1</LocationName>
-              <Locator>011-32 39 91</Locator>
+              <Locator>09 123.12.11</Locator>
               <Party>000000719</Party>
               <PartyLocation>5637146496</PartyLocation>
               <RecId>5637145033</RecId>
@@ -147,7 +147,7 @@
               <TypeIcon>2637</TypeIcon>
               <ValidTo>2154-12-31T23:59:59Z</ValidTo>
             </DirPartyContactInfoView>
-            <DirPartyContactInfoView class="entity">
+            <DirPartyContactInfoView class="entity" action="update">
               <ElectronicAddress>5637145034</ElectronicAddress>
               <IsInstantMessage>No</IsInstantMessage>
               <IsLocationOwner>Yes</IsLocationOwner>
@@ -157,7 +157,7 @@
               <Location>5637147496</Location>
               <LocationId>000000450</LocationId>
               <LocationName>Fax</LocationName>
-              <Locator>011-33 20 84</Locator>
+              <Locator>09 123.12.88</Locator>
               <Party>000000719</Party>
               <PartyLocation>5637146496</PartyLocation>
               <RecId>5637145034</RecId>
@@ -166,7 +166,7 @@
               <TypeIcon>2637</TypeIcon>
               <ValidTo>2154-12-31T23:59:59Z</ValidTo>
             </DirPartyContactInfoView>
-            <DirPartyContactInfoView class="entity">
+            <DirPartyContactInfoView class="entity" action="update">
               <ElectronicAddress>5637145035</ElectronicAddress>
               <IsInstantMessage>No</IsInstantMessage>
               <IsLocationOwner>Yes</IsLocationOwner>
@@ -176,7 +176,7 @@
               <Location>5637147496</Location>
               <LocationId>000000450</LocationId>
               <LocationName>E-mail</LocationName>
-              <Locator>iemand@ergens.be</Locator>
+              <Locator>iemand@ergensanders.be</Locator>
               <Party>000000719</Party>
               <PartyLocation>5637146496</PartyLocation>
               <RecId>5637145035</RecId>
@@ -186,8 +186,8 @@
               <ValidTo>2154-12-31T23:59:59Z</ValidTo>
             </DirPartyContactInfoView>
             <ABC>None</ABC>
-            <OrganizationName class="entity">
-              <Name>DE NAAM</Name>
+            <OrganizationName class="entity" action="update" updateMode="Correction">
+              <Name>EEN ANDERE NAAM</Name>
               <RecId>5637149552</RecId>
               <RecVersion>1</RecVersion>
               <ValidFrom>2016-06-21T08:53:54Z</ValidFrom>
Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r35519 -r35542
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35519)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35542)
@@ -131,17 +131,45 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("action",,"set Output=""update""")
 	do ConvertOptions.Add("LanguageId")
 	do ConvertOptions.Add("Name")
 	do ConvertOptions.Add("NameAlias")
 	
 	do ..ObjectConverter.Convert(DirPartyTableCreate,DirPartyTableUpdate,ConvertOptions)
 	
+	do ..MergeOrganizationNames(DirPartyTableCreate,.DirPartyTableUpdate)
 	do ..MergePostalAddressViews(DirPartyTableCreate,.DirPartyTableUpdate)
 	do ..MergeContactInfoViews(DirPartyTableCreate,.DirPartyTableUpdate)
 ]]></Implementation>
 </Method>
 
+<Method name="MergeOrganizationNames">
+<FormalSpec><![CDATA[DirPartyTableCreate:AXaif.Customer.AxdEntityDirPartyDirOrganization,&DirPartyTableUpdate:AXaif.Customer.AxdEntityDirPartyDirOrganization]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set OrganizationNameIterator = ##class(TECH.ListIterator).%New(DirPartyTableCreate.OrganizationName)
+	while OrganizationNameIterator.HasNext() {
+		#dim OrganizationNameViewCreate As AXaif.Customer.AxdEntityOrganizationName = OrganizationNameIterator.Next()
+		#dim OrganizationNameViewUpdate As AXaif.Customer.AxdEntityOrganizationName = DirPartyTableUpdate.OrganizationName.GetAt(OrganizationNameIterator.Key())
+		do ..MergeOrganizationName(OrganizationNameViewCreate,.OrganizationNameViewUpdate)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MergeOrganizationName">
+<FormalSpec><![CDATA[OrganizationNameViewCreate:AXaif.Customer.AxdEntityOrganizationName,&OrganizationNameViewUpdate:AXaif.Customer.AxdEntityOrganizationName]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("action",,"set Output=""update""")
+	do ConvertOptions.Add("updateMode",,"set Output=""Correction""")
+	do ConvertOptions.Add("Name")
+
+	do ..ObjectConverter.Convert(OrganizationNameViewCreate,OrganizationNameViewUpdate,ConvertOptions)
+]]></Implementation>
+</Method>
+
 <Method name="MergePostalAddressViews">
 <FormalSpec><![CDATA[DirPartyTableCreate:AXaif.Customer.AxdEntityDirPartyDirPartyTable,&DirPartyTableUpdate:AXaif.Customer.AxdEntityDirPartyDirPartyTable]]></FormalSpec>
 <Private>1</Private>
@@ -160,6 +188,8 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("action",,"set Output=""update""")
+	do ConvertOptions.Add("updateMode",,"set Output=""Correction""")
 	do ConvertOptions.Add("Address")
 	do ConvertOptions.Add("City")
 	do ConvertOptions.Add("CountryRegionId")
@@ -190,8 +220,8 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("action",,"set Output=""update""")
 	do ConvertOptions.Add("IsPrimary")
-	do ConvertOptions.Add("IsPrivate")
 	do ConvertOptions.Add("LocationName")
 	do ConvertOptions.Add("Locator")
 	do ConvertOptions.Add("Roles")