diff --git a/services/api.ts b/services/api.ts
index 727a73a..4e62e51 100644
--- a/services/api.ts
+++ b/services/api.ts
@@ -675,9 +675,10 @@ class ApiService {
       // Map API response to Beneficiary type
       const beneficiaries: Beneficiary[] = (data.beneficiaries || []).map((item: any) => ({
         id: item.id,
-        name: item.name || item.email,
+        name: item.originalName || item.name || item.email, // Original name from server
         customName: item.customName || null, // User's custom name for this beneficiary
-        displayName: item.customName || item.name || item.email, // For UI display
+        displayName: item.displayName || item.customName || item.name || item.email, // Server-provided displayName
+        originalName: item.originalName || item.name, // Original name from beneficiaries table
         avatar: item.avatarUrl || undefined, // Use uploaded avatar from server
         status: 'offline' as const,
         email: item.email,
@@ -729,9 +730,10 @@ class ApiService {
 
       const beneficiary: Beneficiary = {
         id: data.id,
-        name: data.name || data.email,
+        name: data.originalName || data.name || data.email, // Original name from server
         customName: data.customName || null, // User's custom name for this beneficiary
-        displayName: data.customName || data.name || data.email, // For UI display
+        displayName: data.displayName || data.customName || data.name || data.email, // Server-provided displayName
+        originalName: data.originalName || data.name, // Original name from beneficiaries table
         avatar: data.avatarUrl || undefined,
         status: 'offline' as const,
         email: data.email,
diff --git a/types/index.ts b/types/index.ts
index 020da51..95b9270 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -85,6 +85,7 @@ export interface Beneficiary {
   name: string;
   customName?: string | null;  // User's custom display name (e.g., "Mom", "Dad")
   displayName: string;         // Computed: customName || name (for UI display)
+  originalName?: string;       // Original name from beneficiaries table (same as name)
   avatar?: string;
   device_id?: string;
   status: 'online' | 'offline';