diff --git a/Signal/src/Loki/FriendRequestView.swift b/Signal/src/Loki/FriendRequestView.swift
index 627cbb7d1..79458f5e5 100644
--- a/Signal/src/Loki/FriendRequestView.swift
+++ b/Signal/src/Loki/FriendRequestView.swift
@@ -1,5 +1,6 @@
 
-@objc final class FriendRequestView : UIView {
+@objc(LKFriendRequestView)
+final class FriendRequestView : UIView {
     private let message: TSMessage
     @objc weak var delegate: FriendRequestViewDelegate?
 
diff --git a/Signal/src/Loki/FriendRequestViewDelegate.swift b/Signal/src/Loki/FriendRequestViewDelegate.swift
index a15f36c06..18d6f7639 100644
--- a/Signal/src/Loki/FriendRequestViewDelegate.swift
+++ b/Signal/src/Loki/FriendRequestViewDelegate.swift
@@ -1,5 +1,6 @@
 
-@objc protocol FriendRequestViewDelegate {
+@objc(LKFriendRequestViewDelegate)
+protocol FriendRequestViewDelegate {
     /// Implementations of this method should update the thread's friend request status
     /// and send a friend request accepted message.
     @objc func acceptFriendRequest(_ friendRequest: TSIncomingMessage)
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
index 4b73d50ef..95726a7aa 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
@@ -5,14 +5,14 @@
 #import "ConversationViewCell.h"
 
 @class OWSMessageBubbleView;
-@protocol FriendRequestViewDelegate;
+@protocol LKFriendRequestViewDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSMessageCell : ConversationViewCell
 
 @property (nonatomic, readonly) OWSMessageBubbleView *messageBubbleView;
-@property (nonatomic, nullable, weak) id<FriendRequestViewDelegate> friendRequestViewDelegate;
+@property (nonatomic, nullable, weak) id<LKFriendRequestViewDelegate> friendRequestViewDelegate;
 
 + (NSString *)cellReuseIdentifier;
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 1dec55af3..b71d39867 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) OWSMessageBubbleView *messageBubbleView;
 @property (nonatomic) NSLayoutConstraint *messageBubbleViewBottomConstraint;
 @property (nonatomic) AvatarImageView *avatarView;
-@property (nonatomic, nullable) FriendRequestView *friendRequestView;
+@property (nonatomic, nullable) LKFriendRequestView *friendRequestView;
 @property (nonatomic, nullable) UIImageView *sendFailureBadgeView;
 
 @property (nonatomic, nullable) NSMutableArray<NSLayoutConstraint *> *viewConstraints;
@@ -207,7 +207,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
     
     if (self.message.isFriendRequest) {
-        self.friendRequestView = [[FriendRequestView alloc] initWithMessage:self.message];
+        self.friendRequestView = [[LKFriendRequestView alloc] initWithMessage:self.message];
         self.friendRequestView.delegate = self.friendRequestViewDelegate;
         [self.contentView addSubview:self.friendRequestView];
         [self.messageBubbleViewBottomConstraint setActive:NO];
@@ -357,7 +357,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     if (self.message.isFriendRequest) {
-        cellSize.height += [FriendRequestView calculateHeightWithMessage:self.message conversationStyle:self.conversationStyle];
+        cellSize.height += [LKFriendRequestView calculateHeightWithMessage:self.message conversationStyle:self.conversationStyle];
     }
     
     cellSize = CGSizeCeil(cellSize);
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 1868f83fc..ded5e3991 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -124,7 +124,7 @@ typedef enum : NSUInteger {
     ConversationViewCellDelegate,
     ConversationInputTextViewDelegate,
     ConversationSearchControllerDelegate,
-    FriendRequestViewDelegate,
+    LKFriendRequestViewDelegate,
     LongTextViewDelegate,
     MessageActionsDelegate,
     MessageDetailViewDelegate,