diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m
index 9082ddce5..f74d3c8a4 100644
--- a/Signal/src/util/MainAppContext.m
+++ b/Signal/src/util/MainAppContext.m
@@ -283,9 +283,9 @@ NS_ASSUME_NONNULL_BEGIN
     backgroundTask = nil;
 }
 
-- (id<KeychainStorage>)keychainStorage
+- (id<SSKKeychainStorage>)keychainStorage
 {
-    return [SSKKeychainStorage shared];
+    return [SSKDefaultKeychainStorage shared];
 }
 
 - (NSString *)appDocumentDirectoryPath
diff --git a/SignalServiceKit/src/Storage/KeychainStorage.swift b/SignalServiceKit/src/Storage/KeychainStorage.swift
index 5dece1c54..12e76e4da 100644
--- a/SignalServiceKit/src/Storage/KeychainStorage.swift
+++ b/SignalServiceKit/src/Storage/KeychainStorage.swift
@@ -11,7 +11,7 @@ public enum KeychainStorageError: Error {
 
 // MARK: -
 
-@objc public protocol KeychainStorage: class {
+@objc public protocol SSKKeychainStorage: class {
 
     @objc func string(forService service: String, key: String) throws -> String
 
@@ -27,9 +27,9 @@ public enum KeychainStorageError: Error {
 // MARK: -
 
 @objc
-public class SSKKeychainStorage: NSObject, KeychainStorage {
+public class SSKDefaultKeychainStorage: NSObject, SSKKeychainStorage {
 
-    @objc public static let shared = SSKKeychainStorage()
+    @objc public static let shared = SSKDefaultKeychainStorage()
 
     // Force usage as a singleton
     override private init() {
diff --git a/SignalServiceKit/src/Storage/TestKeychainStorage.swift b/SignalServiceKit/src/Storage/TestKeychainStorage.swift
index 06b7a86fd..828637ec3 100644
--- a/SignalServiceKit/src/Storage/TestKeychainStorage.swift
+++ b/SignalServiceKit/src/Storage/TestKeychainStorage.swift
@@ -5,7 +5,7 @@
 import Foundation
 
 @objc
-public class TestKeychainStorage: NSObject, KeychainStorage {
+public class SSKTestKeychainStorage: NSObject, SSKKeychainStorage {
 
     private var dataMap = [String: Data]()
 
diff --git a/SignalServiceKit/src/Tests/TestAppContext.m b/SignalServiceKit/src/Tests/TestAppContext.m
index d19e7dea1..527f3e757 100644
--- a/SignalServiceKit/src/Tests/TestAppContext.m
+++ b/SignalServiceKit/src/Tests/TestAppContext.m
@@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface TestAppContext ()
 
-@property (nonatomic) TestKeychainStorage *testKeychainStorage;
+@property (nonatomic) SSKTestKeychainStorage *testKeychainStorage;
 @property (nonatomic) NSString *mockAppDocumentDirectoryPath;
 @property (nonatomic) NSString *mockAppSharedDataDirectoryPath;
 
@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
         return self;
     }
 
-    self.testKeychainStorage = [TestKeychainStorage new];
+    self.testKeychainStorage = [SSKTestKeychainStorage new];
 
     NSString *temporaryDirectory = NSTemporaryDirectory();
     self.mockAppDocumentDirectoryPath = [temporaryDirectory stringByAppendingPathComponent:NSUUID.UUID.UUIDString];
@@ -133,7 +133,7 @@ NS_ASSUME_NONNULL_BEGIN
 {
 }
 
-- (id<KeychainStorage>)keychainStorage
+- (id<SSKKeychainStorage>)keychainStorage
 {
     return self.testKeychainStorage;
 }
diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h
index dbba732b4..b42a7042d 100755
--- a/SignalServiceKit/src/Util/AppContext.h
+++ b/SignalServiceKit/src/Util/AppContext.h
@@ -22,7 +22,7 @@ NSString *NSStringForUIApplicationState(UIApplicationState value);
 
 @class OWSAES256Key;
 
-@protocol KeychainStorage;
+@protocol SSKKeychainStorage;
 
 @protocol AppContext <NSObject>
 
@@ -98,7 +98,7 @@ NSString *NSStringForUIApplicationState(UIApplicationState value);
 
 @property (atomic, readonly) NSDate *appLaunchTime;
 
-- (id<KeychainStorage>)keychainStorage;
+- (id<SSKKeychainStorage>)keychainStorage;
 
 - (NSString *)appDocumentDirectoryPath;
 
diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m
index 709802417..86d22afc5 100644
--- a/SignalShareExtension/utils/ShareAppExtensionContext.m
+++ b/SignalShareExtension/utils/ShareAppExtensionContext.m
@@ -214,9 +214,9 @@ NS_ASSUME_NONNULL_BEGIN
     OWSFailDebug(@"cannot run main app active blocks in share extension.");
 }
 
-- (id<KeychainStorage>)keychainStorage
+- (id<SSKKeychainStorage>)keychainStorage
 {
-    return [SSKKeychainStorage shared];
+    return [SSKDefaultKeychainStorage shared];
 }
 
 - (NSString *)appDocumentDirectoryPath