From 4582e7ede469382469db7ad6fcb34eacf444969b Mon Sep 17 00:00:00 2001
From: Monish Deb <>
Date: Tue, 6 Jul 2021 21:00:25 +0530
Subject: [PATCH] Prevent duplicate names in mailing labels

---
 CRM/Utils/Address.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Utils/Address.php b/CRM/Utils/Address.php
index 90163f0117..5b8331ec60 100644
--- a/CRM/Utils/Address.php
+++ b/CRM/Utils/Address.php
@@ -141,8 +141,8 @@ class CRM_Utils_Address {
         'contact.contact_source' => $fields['contact_source'] ?? NULL,
         'contact.external_identifier' => $fields['external_identifier'] ?? NULL,
         'contact.contact_id' => $fields['id'] ?? NULL,
-        'contact.household_name' => $fields['display_name'] ?? NULL,
-        'contact.organization_name' => $fields['display_name'] ?? NULL,
+        'contact.household_name' => $fields['household_name'] ?? NULL,
+        'contact.organization_name' => $fields['organization_name'] ?? NULL,
         'contact.legal_name' => $fields['legal_name'] ?? NULL,
         'contact.preferred_communication_method' => $fields['preferred_communication_method'] ?? NULL,
         'contact.communication_style' => $fields['communication_style'] ?? NULL,
-- 
2.25.1