diff --git a/SessionMessagingKit/Database/Storage+OpenGroups.swift b/SessionMessagingKit/Database/Storage+OpenGroups.swift
index ed3fcd90a..a6b87a1b1 100644
--- a/SessionMessagingKit/Database/Storage+OpenGroups.swift
+++ b/SessionMessagingKit/Database/Storage+OpenGroups.swift
@@ -198,8 +198,8 @@ extension Storage {
         return result
     }
     
-    public func setOpenGroupDisplayName(to displayName: String, for publicKey: String, on channel: UInt64, server: String, using transaction: Any) {
-        let collection = "\(server).\(channel)" // FIXME: This should be a proper collection
+    public func setOpenGroupDisplayName(to displayName: String, for publicKey: String, inOpenGroupWithID openGroupID: String, using transaction: Any) {
+        let collection = openGroupID
         (transaction as! YapDatabaseReadWriteTransaction).setObject(displayName, forKey: publicKey, inCollection: collection)
     }
     
diff --git a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift
index 7c75c7672..004920a41 100644
--- a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift	
+++ b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift	
@@ -262,7 +262,7 @@ public final class OpenGroupAPI : DotNetAPI {
                             let endIndex = hexEncodedPublicKey.endIndex
                             let cutoffIndex = hexEncodedPublicKey.index(endIndex, offsetBy: -8)
                             let displayName = "\(rawDisplayName) (...\(hexEncodedPublicKey[cutoffIndex..<endIndex]))"
-                            storage.setOpenGroupDisplayName(to: displayName, for: hexEncodedPublicKey, on: channel, server: server, using: transaction)
+                            storage.setOpenGroupDisplayName(to: displayName, for: hexEncodedPublicKey, inOpenGroupWithID: "\(server).\(channel)", using: transaction)
                         }
                     }
                 }
diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
index 0b3b2d8cd..155154500 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift	
@@ -157,6 +157,13 @@ extension MessageReceiver {
                 profileKey != oldProfile?.profileKey?.keyData {
                 profileManager.setProfileKeyData(profileKey, forRecipientId: message.sender!, avatarURL: profilePictureURL)
             }
+            if let rawDisplayName = newProfile.displayName, let openGroupID = openGroupID {
+                let publicKey = message.sender!
+                let endIndex = publicKey.endIndex
+                let cutoffIndex = publicKey.index(endIndex, offsetBy: -8)
+                let displayName = "\(rawDisplayName) (...\(publicKey[cutoffIndex..<endIndex]))"
+                Storage.shared.setOpenGroupDisplayName(to: displayName, for: message.sender!, inOpenGroupWithID: openGroupID, using: transaction)
+            }
         }
         // Get or create thread
         guard let threadID = storage.getOrCreateThread(for: message.sender!, groupPublicKey: message.groupPublicKey, openGroupID: openGroupID, using: transaction) else { throw Error.noThread }
diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index 4c3bf0eb2..bd5635132 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -192,7 +192,7 @@ public final class MessageSender : NSObject {
         // Handle completion
         let _ = promise.done(on: DispatchQueue.main) {
             storage.withAsync({ transaction in
-                MessageSender.handleSuccessfulMessageSend(message, to: destination,X using: transaction)
+                MessageSender.handleSuccessfulMessageSend(message, to: destination, using: transaction)
             }, completion: { })
             if case .contact(_) = destination, message is VisibleMessage, !isSelfSend {
                 NotificationCenter.default.post(name: .messageSent, object: NSNumber(value: message.sentTimestamp!))
diff --git a/SessionMessagingKit/Storage.swift b/SessionMessagingKit/Storage.swift
index 650f2acf7..1ebeac99c 100644
--- a/SessionMessagingKit/Storage.swift
+++ b/SessionMessagingKit/Storage.swift
@@ -67,7 +67,7 @@ public protocol SessionMessagingKitStorageProtocol {
 
     func setUserCount(to newValue: Int, forOpenGroupWithID openGroupID: String, using transaction: Any)
     func getIDForMessage(withServerID serverID: UInt64) -> UInt64?
-    func setOpenGroupDisplayName(to displayName: String, for publicKey: String, on channel: UInt64, server: String, using transaction: Any)
+    func setOpenGroupDisplayName(to displayName: String, for publicKey: String, inOpenGroupWithID openGroupID: String, using transaction: Any)
     func setLastProfilePictureUploadDate(_ date: Date) // Stored in user defaults so no transaction is needed
 
     // MARK: - Message Handling