diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt
index 703648bcad..778d10fe29 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt
@@ -42,8 +42,8 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
             Success(
               sessionId = networkResult.result.body.id,
               allowedToRequestCode = networkResult.result.body.allowedToRequestCode,
-              nextSms = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextSms),
-              nextCall = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextCall)
+              nextSmsTimestamp = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextSms),
+              nextCallTimestamp = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextCall)
             )
           }
         }
@@ -92,7 +92,7 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
     }
   }
 
-  class Success(val sessionId: String, val allowedToRequestCode: Boolean, val nextSms: Long, val nextCall: Long) : VerificationCodeRequestResult(null)
+  class Success(val sessionId: String, val allowedToRequestCode: Boolean, val nextSmsTimestamp: Long, val nextCallTimestamp: Long) : VerificationCodeRequestResult(null)
 
   class ChallengeRequired(val challenges: List<String>) : VerificationCodeRequestResult(null)
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt
index af9924725d..c7d4efc566 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt
@@ -262,8 +262,8 @@ class RegistrationV2ViewModel : ViewModel() {
         store.update {
           it.copy(
             sessionId = sessionResult.sessionId,
-            nextSms = sessionResult.nextSms,
-            nextCall = sessionResult.nextCall,
+            nextSms = sessionResult.nextSmsTimestamp,
+            nextCall = sessionResult.nextCallTimestamp,
             registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED
           )
         }