diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt
index 6f291f8fde471ed58502b0342fd573a271e341b6..3bc57c2a8ec3868d56e40c2f3f2ba6dda01a2538 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt
@@ -64,7 +64,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
     companion object {
         private val LOG = getLogger(MainActivity::class.java)
 
-        const val BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED = "LIFECYCLE_BEYOND_NOT_STARTED"
+        const val BUNDLE_LIFECYCLE_HAS_STARTED = "LIFECYCLE_HAS_STARTED"
     }
 
     private val viewModel: MailboxViewModel by viewModels()
@@ -84,8 +84,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
         // Check if the app has been restored with a UI from an old lifecycle while the app has been
         // restarted with a new process and lifecycle. In that case, go back to the init fragment.
         if (savedInstanceState != null) {
-            val hadBeenStartedOnSave =
-                savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED)
+            val hadBeenStartedOnSave = savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_HAS_STARTED)
             if (viewModel.lifecycleState.value == NOT_STARTED && hadBeenStartedOnSave) {
                 nav.navigate(actionGlobalInitFragment())
             }
@@ -144,9 +143,8 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
             // in the background and gets restored from the recent app list after wiping and
             // stopping has already completed. In this case onSaveInstanceState() has written
             // true to the bundle.
-            val savedBeyondNotStarted =
-                savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED)
-            if (!hasDb && savedBeyondNotStarted) {
+            val hadBeenStartedOnSave = savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_HAS_STARTED)
+            if (!hasDb && hadBeenStartedOnSave) {
                 finish()
                 startActivity(Intent(this, WipeCompleteActivity::class.java))
                 return
@@ -170,7 +168,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putBoolean(
-            BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED,
+            BUNDLE_LIFECYCLE_HAS_STARTED,
             viewModel.lifecycleState.value != NOT_STARTED
         )
     }