diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 0198c819d..ed9307e85 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -1106,12 +1106,10 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
     id<ProfileManagerProtocol> profileManager = SSKEnvironment.shared.profileManager;
     NSString *displayName = profileManager.localProfileName;
     if (displayName != nil) {
-        SSKProtoDataMessageContactBuilder *profileBuilder = [SSKProtoDataMessageContact builder];
-        SSKProtoDataMessageContactNameBuilder *nameBuilder = [SSKProtoDataMessageContactName builder];
-        [nameBuilder setDisplayName:displayName];
-        SSKProtoDataMessageContactName *name = [nameBuilder buildIgnoringErrors];
-        [profileBuilder setName:name];
-        SSKProtoDataMessageContact *profile = [profileBuilder buildIgnoringErrors];
+        SSKProtoDataMessageLokiProfileBuilder *profileBuilder = [SSKProtoDataMessageLokiProfile builder];
+        [profileBuilder setDisplayName:displayName];
+        
+        SSKProtoDataMessageLokiProfile *profile = [profileBuilder buildIgnoringErrors];
         [builder setProfile:profile];
     }
     
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 2e7f18d0c..3b7a62eab 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -1445,7 +1445,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                         serverTimestamp:serverTimestamp
                                                         wasReceivedByUD:wasReceivedByUD];
 
-        NSString *displayName = dataMessage.profile.name.displayName;
+        NSString *displayName = dataMessage.profile.displayName;
         [self.profileManager setDisplayNameForContactWithID:thread.contactIdentifier to:displayName with:transaction];
         
         if (envelope.isPtpMessage) { incomingMessage.isP2P = YES; }