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")