diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 5a708b109..79957c086 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -158,9 +158,9 @@ static NSTimeInterval launchStartedAt;
     return AppEnvironment.shared.legacyNotificationActionHandler;
 }
 
-- (LKFriendRequestExpirationJob *)lokiFriendRequestExpireJob
+- (LKFriendRequestExpirationJob *)lokiFriendRequestExpirationJob
 {
-    return SSKEnvironment.shared.lokiFriendRequestExpireJob;
+    return SSKEnvironment.shared.lokiFriendRequestExpirationJob;
 }
 
 #pragma mark -
@@ -689,7 +689,7 @@ static NSTimeInterval launchStartedAt;
                 [self.disappearingMessagesJob startIfNecessary];
                 
                 // Start Loki friend request expire job
-                [self.lokiFriendRequestExpireJob startIfNecessary];
+                [self.lokiFriendRequestExpirationJob startIfNecessary];
 
                 [self enableBackgroundRefreshIfNecessary];
 
@@ -1327,7 +1327,7 @@ static NSTimeInterval launchStartedAt;
         [self.profileManager ensureLocalProfileCached];
         
         // Start Loki friend request expire job
-        [self.lokiFriendRequestExpireJob startIfNecessary];
+        [self.lokiFriendRequestExpirationJob startIfNecessary];
 
         // For non-legacy users, read receipts are on by default.
         [self.readReceiptManager setAreReadReceiptsEnabled:YES];
diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m
index 7ddb81377..946daef19 100644
--- a/SignalMessaging/environment/AppSetup.m
+++ b/SignalMessaging/environment/AppSetup.m
@@ -127,8 +127,8 @@ NS_ASSUME_NONNULL_BEGIN
                                                               attachmentDownloads:attachmentDownloads]];
         
         // Loki
-        LKFriendRequestExpirationJob *lokiFriendRequestExpireJob = [[LKFriendRequestExpirationJob alloc] initWithPrimaryStorage:primaryStorage];
-        SSKEnvironment.shared.lokiFriendRequestExpireJob = lokiFriendRequestExpireJob;
+        LKFriendRequestExpirationJob *lokiFriendRequestExpirationJob = [[LKFriendRequestExpirationJob alloc] initWithPrimaryStorage:primaryStorage];
+        SSKEnvironment.shared.lokiFriendRequestExpirationJob = lokiFriendRequestExpirationJob;
 
         appSpecificSingletonBlock();
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index eeb458043..3e85b5a64 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -90,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN
     _incomingMessageFinder = [[OWSIncomingMessageFinder alloc] initWithPrimaryStorage:primaryStorage];
     
     // Loki: Add observation for new session
-    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(onNewSessionAdopted:) name:kNSNotificationName_SessionAdopted object:nil];
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(handleNewSessionAdopted:) name:kNSNotificationName_SessionAdopted object:nil];
 
     OWSSingletonAssert();
 
@@ -1013,15 +1013,15 @@ NS_ASSUME_NONNULL_BEGIN
      * ================
      */
 
-    /// Loki: Archive all our sessions
-    /// Ref: SignalServiceKit/Loki/Docs/SessionReset.md
+    // Loki: Archive all our session
+    // Ref: SignalServiceKit/Loki/Docs/SessionReset.md
     [self.primaryStorage archiveAllSessionsForContact:envelope.source protocolContext:transaction];
     
-    /// Loki: Set our session reset state
+    // Loki: Set our session reset state
     thread.sessionResetState = TSContactThreadSessionResetStateRequestReceived;
     [thread saveWithTransaction:transaction];
     
-    /// Loki: Send an empty message to trigger the session reset code for both parties
+    // Loki: Send an empty message to trigger the session reset code for both parties
     LKEphemeralMessage *emptyMessage = [LKEphemeralMessage createEmptyOutgoingMessageInThread:thread];
     [self.messageSenderJobQueue addMessage:emptyMessage transaction:transaction];
 
@@ -1699,7 +1699,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 # pragma mark - Loki Session
 
-- (void)onNewSessionAdopted:(NSNotification *)notification {
+- (void)handleNewSessionAdopted:(NSNotification *)notification {
     NSString *pubKey = notification.userInfo[kNSNotificationKey_ContactPubKey];
     if (pubKey.length == 0) { return; }
     
diff --git a/SignalServiceKit/src/SSKEnvironment.h b/SignalServiceKit/src/SSKEnvironment.h
index 983925ad3..94fb5a316 100644
--- a/SignalServiceKit/src/SSKEnvironment.h
+++ b/SignalServiceKit/src/SSKEnvironment.h
@@ -26,9 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class TSNetworkManager;
 @class TSSocketManager;
 @class YapDatabaseConnection;
-
-// Loki
-@class LKFriendRequestExpirationJob;
+@class LKFriendRequestExpirationJob; // Loki
 
 @protocol ContactsManagerProtocol;
 @protocol NotificationsProtocol;
@@ -113,10 +111,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (atomic, readonly) YapDatabaseConnection *sessionStoreDBConnection;
 @property (atomic, readonly) YapDatabaseConnection *migrationDBConnection;
 @property (atomic, readonly) YapDatabaseConnection *analyticsDBConnection;
-
-// Loki
-@property (nonatomic, readonly) LKFriendRequestExpirationJob *lokiFriendRequestExpireJob;
-- (void)setLokiFriendRequestExpireJob:(LKFriendRequestExpirationJob *)lokiFriendRequestExpireJob;
+@property (nonatomic) LKFriendRequestExpirationJob *lokiFriendRequestExpirationJob; // Loki
 
 - (BOOL)isComplete;
 
diff --git a/SignalServiceKit/src/SSKEnvironment.m b/SignalServiceKit/src/SSKEnvironment.m
index 14e77587b..6c54d985f 100644
--- a/SignalServiceKit/src/SSKEnvironment.m
+++ b/SignalServiceKit/src/SSKEnvironment.m
@@ -37,9 +37,6 @@ static SSKEnvironment *sharedSSKEnvironment;
 @property (nonatomic) id<OWSTypingIndicators> typingIndicators;
 @property (nonatomic) OWSAttachmentDownloads *attachmentDownloads;
 
-// Loki
-@property (nonatomic) LKFriendRequestExpirationJob *lokiFriendRequestExpireJob;
-
 @end
 
 #pragma mark -
@@ -199,12 +196,12 @@ static SSKEnvironment *sharedSSKEnvironment;
     }
 }
 
-- (void)setLokiFriendRequestExpireJob:(LKFriendRequestExpirationJob *)lokiFriendRequestExpireJob {
+- (void)setLokiFriendRequestExpirationJob:(LKFriendRequestExpirationJob *)lokiFriendRequestExpirationJob {
     @synchronized(self) {
-        OWSAssertDebug(lokiFriendRequestExpireJob);
-        OWSAssertDebug(!_lokiFriendRequestExpireJob);
+        OWSAssertDebug(lokiFriendRequestExpirationJob);
+        OWSAssertDebug(_lokiFriendRequestExpirationJob == nil);
         
-        _lokiFriendRequestExpireJob = lokiFriendRequestExpireJob;
+        _lokiFriendRequestExpirationJob = lokiFriendRequestExpirationJob;
     }
 }
 
diff --git a/SignalServiceKit/src/Storage/OWSPrimaryStorage.m b/SignalServiceKit/src/Storage/OWSPrimaryStorage.m
index 52cc1b3b3..91a87b3ac 100644
--- a/SignalServiceKit/src/Storage/OWSPrimaryStorage.m
+++ b/SignalServiceKit/src/Storage/OWSPrimaryStorage.m
@@ -214,8 +214,7 @@ void VerifyRegistrationsForPrimaryStorage(OWSStorage *storage)
     [OWSMediaGalleryFinder asyncRegisterDatabaseExtensionsWithPrimaryStorage:self];
     [TSDatabaseView asyncRegisterLazyRestoreAttachmentsDatabaseView:self];
     [SSKJobRecordFinder asyncRegisterDatabaseExtensionObjCWithStorage:self];
-    
-    [LKFriendRequestExpirationMessageFinder asyncRegisterDatabaseExtensions:self];
+    [LKFriendRequestExpirationMessageFinder asyncRegisterDatabaseExtensions:self]; // Loki
 
     [self.database
         flushExtensionRequestsWithCompletionQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)