diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index ae30fce7b2..0903e3c959 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -66,7 +66,7 @@ import org.thoughtcrime.securesms.loki.api.PublicChatManager;
 import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
-import org.thoughtcrime.securesms.loki.protocol.PushSessionRequestMessageSendJob;
+import org.thoughtcrime.securesms.loki.protocol.SessionRequestMessageSendJob;
 import org.thoughtcrime.securesms.loki.protocol.SessionResetImplementation;
 import org.thoughtcrime.securesms.loki.utilities.Broadcaster;
 import org.thoughtcrime.securesms.notifications.DefaultMessageNotifier;
@@ -621,7 +621,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     // Send the session request
     long timestamp = new Date().getTime();
     apiDB.setSessionRequestSentTimestamp(publicKey, timestamp);
-    PushSessionRequestMessageSendJob job = new PushSessionRequestMessageSendJob(publicKey, timestamp);
+    SessionRequestMessageSendJob job = new SessionRequestMessageSendJob(publicKey, timestamp);
     jobManager.add(job);
   }
   // endregion
diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
index c4aa802414..353dcd2149 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.jobs.SmsSentJob;
 import org.thoughtcrime.securesms.jobs.TrimThreadJob;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
 import org.thoughtcrime.securesms.jobs.UpdateApkJob;
-import org.thoughtcrime.securesms.loki.protocol.PushNullMessageSendJob;
+import org.thoughtcrime.securesms.loki.protocol.NullMessageSendJob;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -75,7 +75,7 @@ public class WorkManagerFactoryMappings {
     put(PushMediaSendJob.class.getName(), PushMediaSendJob.KEY);
     put(PushNotificationReceiveJob.class.getName(), PushNotificationReceiveJob.KEY);
     put(PushTextSendJob.class.getName(), PushTextSendJob.KEY);
-    put(PushNullMessageSendJob.class.getName(), PushNullMessageSendJob.KEY);
+    put(NullMessageSendJob.class.getName(), NullMessageSendJob.KEY);
     put(RefreshAttributesJob.class.getName(), RefreshAttributesJob.KEY);
     put(RefreshPreKeysJob.class.getName(), RefreshPreKeysJob.KEY);
     put(RefreshUnidentifiedDeliveryAbilityJob.class.getName(), RefreshUnidentifiedDeliveryAbilityJob.KEY);
diff --git a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
index aa628dc7cc..66bf564ad9 100644
--- a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -14,8 +14,8 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkOrCellServiceConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraint;
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
 import org.thoughtcrime.securesms.loki.protocol.shelved.MultiDeviceOpenGroupUpdateJob;
-import org.thoughtcrime.securesms.loki.protocol.PushNullMessageSendJob;
-import org.thoughtcrime.securesms.loki.protocol.PushSessionRequestMessageSendJob;
+import org.thoughtcrime.securesms.loki.protocol.NullMessageSendJob;
+import org.thoughtcrime.securesms.loki.protocol.SessionRequestMessageSendJob;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -51,7 +51,7 @@ public final class JobManagerFactories {
       put(PushMediaSendJob.KEY,                      new PushMediaSendJob.Factory());
       put(PushNotificationReceiveJob.KEY,            new PushNotificationReceiveJob.Factory());
       put(PushTextSendJob.KEY,                       new PushTextSendJob.Factory());
-      put(PushNullMessageSendJob.KEY,                new PushNullMessageSendJob.Factory());
+      put(NullMessageSendJob.KEY,                new NullMessageSendJob.Factory());
       put(RefreshAttributesJob.KEY,                  new RefreshAttributesJob.Factory());
       put(RefreshPreKeysJob.KEY,                     new RefreshPreKeysJob.Factory());
       put(RefreshUnidentifiedDeliveryAbilityJob.KEY, new RefreshUnidentifiedDeliveryAbilityJob.Factory());
@@ -72,7 +72,7 @@ public final class JobManagerFactories {
       put(TrimThreadJob.KEY,                         new TrimThreadJob.Factory());
       put(TypingSendJob.KEY,                         new TypingSendJob.Factory());
       put(UpdateApkJob.KEY,                          new UpdateApkJob.Factory());
-      put(PushSessionRequestMessageSendJob.KEY,      new PushSessionRequestMessageSendJob.Factory());
+      put(SessionRequestMessageSendJob.KEY,      new SessionRequestMessageSendJob.Factory());
       put(MultiDeviceOpenGroupUpdateJob.KEY,         new MultiDeviceOpenGroupUpdateJob.Factory());
     }};
   }
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/PushNullMessageSendJob.kt b/src/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
similarity index 89%
rename from src/org/thoughtcrime/securesms/loki/protocol/PushNullMessageSendJob.kt
rename to src/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
index 90b8ef0e00..821a281eb2 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/PushNullMessageSendJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
@@ -18,7 +18,7 @@ import java.security.SecureRandom
 import java.util.*
 import java.util.concurrent.TimeUnit
 
-class PushNullMessageSendJob private constructor(parameters: Parameters, private val publicKey: String) : BaseJob(parameters) {
+class NullMessageSendJob private constructor(parameters: Parameters, private val publicKey: String) : BaseJob(parameters) {
 
     companion object {
         const val KEY = "PushNullMessageSendJob"
@@ -70,12 +70,12 @@ class PushNullMessageSendJob private constructor(parameters: Parameters, private
 
     override fun onCanceled() { }
 
-    class Factory : Job.Factory<PushNullMessageSendJob> {
+    class Factory : Job.Factory<NullMessageSendJob> {
 
-      override fun create(parameters: Parameters, data: Data): PushNullMessageSendJob {
+      override fun create(parameters: Parameters, data: Data): NullMessageSendJob {
           try {
               val publicKey = data.getString("publicKey")
-              return PushNullMessageSendJob(parameters, publicKey)
+              return NullMessageSendJob(parameters, publicKey)
           } catch (e: IOException) {
               throw AssertionError(e)
           }
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
index 4bd08e275f..fe9e07344c 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
@@ -76,7 +76,7 @@ object SessionManagementProtocol {
         val preKeyBundle = preKeyBundleMessage.getPreKeyBundle(registrationID)
         lokiPreKeyBundleDatabase.setPreKeyBundle(publicKey, preKeyBundle)
         DatabaseFactory.getLokiAPIDatabase(context).setSessionRequestProcessedTimestamp(publicKey, Date().time)
-        val job = PushNullMessageSendJob(publicKey)
+        val job = NullMessageSendJob(publicKey)
         ApplicationContext.getInstance(context).jobManager.add(job)
     }
 
@@ -89,7 +89,7 @@ object SessionManagementProtocol {
         sessionStore.archiveAllSessions(content.sender)
         lokiThreadDB.setSessionResetStatus(content.sender, SessionResetStatus.REQUEST_RECEIVED)
         Log.d("Loki", "Sending an ephemeral message back to: ${content.sender}.")
-        val job = PushNullMessageSendJob(content.sender)
+        val job = NullMessageSendJob(content.sender)
         ApplicationContext.getInstance(context).jobManager.add(job)
         SecurityEvent.broadcastSecurityUpdateEvent(context)
     }
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/PushSessionRequestMessageSendJob.kt b/src/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
similarity index 92%
rename from src/org/thoughtcrime/securesms/loki/protocol/PushSessionRequestMessageSendJob.kt
rename to src/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
index 01b2668f71..155ca1e29b 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/PushSessionRequestMessageSendJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
@@ -19,7 +19,7 @@ import java.security.SecureRandom
 import java.util.*
 import java.util.concurrent.TimeUnit
 
-class PushSessionRequestMessageSendJob private constructor(parameters: Parameters, private val publicKey: String, private val timestamp: Long) : BaseJob(parameters) {
+class SessionRequestMessageSendJob private constructor(parameters: Parameters, private val publicKey: String, private val timestamp: Long) : BaseJob(parameters) {
 
     companion object {
         const val KEY = "PushSessionRequestMessageSendJob"
@@ -92,13 +92,13 @@ class PushSessionRequestMessageSendJob private constructor(parameters: Parameter
         }
     }
 
-    class Factory : Job.Factory<PushSessionRequestMessageSendJob> {
+    class Factory : Job.Factory<SessionRequestMessageSendJob> {
 
-        override fun create(parameters: Parameters, data: Data): PushSessionRequestMessageSendJob {
+        override fun create(parameters: Parameters, data: Data): SessionRequestMessageSendJob {
             try {
                 val publicKey = data.getString("publicKey")
                 val timestamp = data.getLong("timestamp")
-                return PushSessionRequestMessageSendJob(parameters, publicKey, timestamp)
+                return SessionRequestMessageSendJob(parameters, publicKey, timestamp)
             } catch (e: IOException) {
                 throw AssertionError(e)
             }
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt b/src/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
index 4c34d64b64..1c8a283125 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
@@ -19,7 +19,7 @@ class SessionResetImplementation(private val context: Context) : SessionResetPro
 
     override fun onNewSessionAdopted(publicKey: String, oldSessionResetStatus: SessionResetStatus) {
         if (oldSessionResetStatus == SessionResetStatus.IN_PROGRESS) {
-            val job = PushNullMessageSendJob(publicKey)
+            val job = NullMessageSendJob(publicKey)
             ApplicationContext.getInstance(context).jobManager.add(job)
         }
         // TODO: Show session reset succeed message