Revert unwanted changes.

SignalMessaging/contacts/OWSContactsSyncing.m

@@ -16,9 +16,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSString *const kOWSPrimaryStorageOWSContactsSyncingCollection = @"kOWSPrimaryStorageOWSContactsSyncingCollection";
+NSString *const kOWSPrimaryStorageOWSContactsSyncingCollection = @"kTSStorageManagerOWSContactsSyncingCollection";
 NSString *const kOWSPrimaryStorageOWSContactsSyncingLastMessageKey
-    = @"kOWSPrimaryStorageOWSContactsSyncingLastMessageKey";
+    = @"kTSStorageManagerOWSContactsSyncingLastMessageKey";
 
 @interface OWSContactsSyncing ()
 

SignalServiceKit/src/Devices/OWSDevice.m

@@ -14,8 +14,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 uint32_t const OWSDevicePrimaryDeviceId = 1;
-NSString *const kOWSPrimaryStorage_OWSDeviceCollection = @"kOWSPrimaryStorage_OWSDeviceCollection";
-NSString *const kOWSPrimaryStorage_MayHaveLinkedDevices = @"kOWSPrimaryStorage_MayHaveLinkedDevices";
+NSString *const kOWSPrimaryStorage_OWSDeviceCollection = @"kTSStorageManager_OWSDeviceCollection";
+NSString *const kOWSPrimaryStorage_MayHaveLinkedDevices = @"kTSStorageManager_MayHaveLinkedDevices";
 
 @interface OWSDeviceManager ()
 

SignalServiceKit/src/Network/OWSSignalService.m

@@ -15,13 +15,13 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSString *const kOWSPrimaryStorage_OWSSignalService = @"kOWSPrimaryStorage_OWSSignalService";
+NSString *const kOWSPrimaryStorage_OWSSignalService = @"kTSStorageManager_OWSSignalService";
 NSString *const kOWSPrimaryStorage_isCensorshipCircumventionManuallyActivated
-    = @"kOWSPrimaryStorage_isCensorshipCircumventionManuallyActivated";
+    = @"kTSStorageManager_isCensorshipCircumventionManuallyActivated";
 NSString *const kOWSPrimaryStorage_ManualCensorshipCircumventionDomain
-    = @"kOWSPrimaryStorage_ManualCensorshipCircumventionDomain";
+    = @"kTSStorageManager_ManualCensorshipCircumventionDomain";
 NSString *const kOWSPrimaryStorage_ManualCensorshipCircumventionCountryCode
-    = @"kOWSPrimaryStorage_ManualCensorshipCircumventionCountryCode";
+    = @"kTSStorageManager_ManualCensorshipCircumventionCountryCode";
 
 NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange =
     @"kNSNotificationName_IsCensorshipCircumventionActiveDidChange";