diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 11532cca..db6cef6d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -221,8 +221,8 @@ class ThreadActivity : SimpleActivity() {
             privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
             if (privateContacts.isNotEmpty()) {
                 val senderNumbersToReplace = HashMap<String, String>()
-                participants.filter { it.doesContainPhoneNumber(it.name) }.forEach { participant ->
-                    privateContacts.firstOrNull { it.doesContainPhoneNumber(participant.phoneNumbers.first()) }?.apply {
+                participants.filter { it.doesHavePhoneNumber(it.name) }.forEach { participant ->
+                    privateContacts.firstOrNull { it.doesHavePhoneNumber(participant.phoneNumbers.first()) }?.apply {
                         senderNumbersToReplace[participant.phoneNumbers.first()] = name
                         participant.name = name
                         participant.photoUri = photoUri
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index a4c845db..c67adaf8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -415,7 +415,7 @@ fun Context.getThreadContactNames(phoneNumbers: List<String>, privateContacts: A
         if (name != number) {
             names.add(name)
         } else {
-            val privateContact = privateContacts.firstOrNull { it.doesContainPhoneNumber(number) }
+            val privateContact = privateContacts.firstOrNull { it.doesHavePhoneNumber(number) }
             if (privateContact == null) {
                 names.add(name)
             } else {
@@ -682,7 +682,7 @@ fun Context.getNameFromAddress(address: String, privateCursor: Cursor?): String
     var sender = getNameAndPhotoFromPhoneNumber(address).name
     if (address == sender) {
         val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
-        sender = privateContacts.firstOrNull { it.doesContainPhoneNumber(address) }?.name ?: address
+        sender = privateContacts.firstOrNull { it.doesHavePhoneNumber(address) }?.name ?: address
     }
     return sender
 }