diff --git a/Signal/test/util/FTS/GRDBFullTextSearcherTest.swift b/Signal/test/util/FTS/GRDBFullTextSearcherTest.swift
index 847d837a19..19ba735d2e 100644
--- a/Signal/test/util/FTS/GRDBFullTextSearcherTest.swift
+++ b/Signal/test/util/FTS/GRDBFullTextSearcherTest.swift
@@ -9,11 +9,11 @@ import XCTest
 // TODO: We might be able to merge this with OWSFakeContactsManager.
 @objc
 class GRDBFullTextSearcherContactsManager: NSObject, ContactsManagerProtocol {
-    func displayName(for address: SignalServiceAddress?, transaction: SDSAnyReadTransaction) -> String {
+    func displayName(for address: SignalServiceAddress, transaction: SDSAnyReadTransaction) -> String {
         return self.displayName(for: address)
     }
 
-    func displayName(for address: SignalServiceAddress?) -> String {
+    func displayName(for address: SignalServiceAddress) -> String {
         if address == aliceRecipient {
             return "Alice"
         } else if address == bobRecipient {
@@ -27,7 +27,11 @@ class GRDBFullTextSearcherContactsManager: NSObject, ContactsManagerProtocol {
         return []
     }
 
-    func isSystemContact(_ recipientId: String) -> Bool {
+    func isSystemContact(phoneNumber: String) -> Bool {
+        return true
+    }
+
+    func isSystemContact(address: SignalServiceAddress) -> Bool {
         return true
     }
 
diff --git a/Signal/test/util/FTS/YDBFullTextSearcherTest.swift b/Signal/test/util/FTS/YDBFullTextSearcherTest.swift
index ed16af6aa4..ae44c0a99b 100644
--- a/Signal/test/util/FTS/YDBFullTextSearcherTest.swift
+++ b/Signal/test/util/FTS/YDBFullTextSearcherTest.swift
@@ -9,11 +9,11 @@ import XCTest
 // TODO: We might be able to merge this with OWSFakeContactsManager.
 @objc
 class YDBFullTextSearcherContactsManager: NSObject, ContactsManagerProtocol {
-    func displayName(for address: SignalServiceAddress?, transaction: SDSAnyReadTransaction) -> String {
+    func displayName(for address: SignalServiceAddress, transaction: SDSAnyReadTransaction) -> String {
         return self.displayName(for: address)
     }
 
-    func displayName(for address: SignalServiceAddress?) -> String {
+    func displayName(for address: SignalServiceAddress) -> String {
         if address == aliceRecipient {
             return "Alice"
         } else if address == bobRecipient {
@@ -27,7 +27,11 @@ class YDBFullTextSearcherContactsManager: NSObject, ContactsManagerProtocol {
         return []
     }
 
-    func isSystemContact(_ recipientId: String) -> Bool {
+    func isSystemContact(phoneNumber: String) -> Bool {
+        return true
+    }
+
+    func isSystemContact(address: SignalServiceAddress) -> Bool {
         return true
     }
 
diff --git a/Signal/test/util/ProtoParsingTest.m b/Signal/test/util/ProtoParsingTest.m
index f752e23966..6e61884bb7 100644
--- a/Signal/test/util/ProtoParsingTest.m
+++ b/Signal/test/util/ProtoParsingTest.m
@@ -28,12 +28,23 @@ NS_ASSUME_NONNULL_BEGIN
     return address.stringForDisplay;
 }
 
+- (nonnull NSString *)displayNameForAddress:(SignalServiceAddress *)address
+                                transaction:(nonnull YapDatabaseReadTransaction *)transaction
+{
+    return nil;
+}
+
 - (NSArray<SignalAccount *> *)signalAccounts
 {
     return @[];
 }
 
-- (BOOL)isSystemContact:(NSString *)phoneNumber
+- (BOOL)isSystemContactWithPhoneNumber:(NSString *)phoneNumber
+{
+    return YES;
+}
+
+- (BOOL)isSystemContactWithAddress:(SignalServiceAddress *)address
 {
     return YES;
 }
@@ -63,12 +74,6 @@ NS_ASSUME_NONNULL_BEGIN
     return nil;
 }
 
-- (nonnull NSString *)displayNameForAddress:(SignalServiceAddress *)address
-                                transaction:(nonnull YapDatabaseReadTransaction *)transaction
-{
-    return nil;
-}
-
 @end
 
 #pragma mark -
diff --git a/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h b/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
index aa7d455cee..a5981b92e8 100644
--- a/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
+++ b/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)isSystemContactWithPhoneNumber:(NSString *)phoneNumber NS_SWIFT_NAME(isSystemContact(phoneNumber:));
 - (BOOL)isSystemContactWithAddress:(SignalServiceAddress *)address NS_SWIFT_NAME(isSystemContact(address:));
-;
+
 - (BOOL)isSystemContactWithSignalAccount:(NSString *)phoneNumber;
 
 - (NSComparisonResult)compareSignalAccount:(SignalAccount *)left