diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt
index 03658786dc..83fdc46270 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt
@@ -19,10 +19,10 @@ package im.vector.riotx.features.crypto.verification
 import im.vector.riotx.core.platform.VectorViewModelAction
 
 sealed class VerificationAction : VectorViewModelAction {
-    data class RequestVerificationByDM(val userID: String, val roomId: String?) : VerificationAction()
-    data class StartSASVerification(val userID: String, val pendingRequestTransactionId: String) : VerificationAction()
-    data class RemoteQrCodeScanned(val userID: String, val transactionId: String, val scannedData: String) : VerificationAction()
-    data class SASMatchAction(val userID: String, val sasTransactionId: String) : VerificationAction()
-    data class SASDoNotMatchAction(val userID: String, val sasTransactionId: String) : VerificationAction()
+    data class RequestVerificationByDM(val otherUserId: String, val roomId: String?) : VerificationAction()
+    data class StartSASVerification(val otherUserId: String, val pendingRequestTransactionId: String) : VerificationAction()
+    data class RemoteQrCodeScanned(val otherUserId: String, val transactionId: String, val scannedData: String) : VerificationAction()
+    data class SASMatchAction(val otherUserId: String, val sasTransactionId: String) : VerificationAction()
+    data class SASDoNotMatchAction(val otherUserId: String, val sasTransactionId: String) : VerificationAction()
     object GotItConclusion : VerificationAction()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 6b9b658b82..5a680556ca 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -166,18 +166,18 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(@Assisted ini
             }
             is VerificationAction.RemoteQrCodeScanned     -> {
                 val existingTransaction = session.getVerificationService()
-                        .getExistingTransaction(action.userID, action.transactionId) as? QRVerificationTransaction
+                        .getExistingTransaction(action.otherUserId, action.transactionId) as? QRVerificationTransaction
                 existingTransaction
                         ?.userHasScannedRemoteQrCode(action.scannedData)
             }
             is VerificationAction.SASMatchAction          -> {
                 (session.getVerificationService()
-                        .getExistingTransaction(action.userID, action.sasTransactionId)
+                        .getExistingTransaction(action.otherUserId, action.sasTransactionId)
                         as? SasVerificationTransaction)?.userHasVerifiedShortCode()
             }
             is VerificationAction.SASDoNotMatchAction     -> {
                 (session.getVerificationService()
-                        .getExistingTransaction(action.userID, action.sasTransactionId)
+                        .getExistingTransaction(action.otherUserId, action.sasTransactionId)
                         as? SasVerificationTransaction)
                         ?.shortCodeDoesNotMatch()
             }
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index b9f543808c..e0b7f97383 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -69,10 +69,10 @@ class VerificationChooseMethodFragment @Inject constructor(
         controller.update(state)
     }
 
-    override fun doVerifyBySas() = withState(sharedViewModel) {
+    override fun doVerifyBySas() = withState(sharedViewModel) { state ->
         sharedViewModel.handle(VerificationAction.StartSASVerification(
-                it.otherUserMxItem?.id ?: "",
-                it.pendingRequest.invoke()?.transactionId ?: ""))
+                state.otherUserMxItem?.id ?: "",
+                state.pendingRequest.invoke()?.transactionId ?: ""))
     }
 
     override fun openCamera() {
@@ -112,10 +112,10 @@ class VerificationChooseMethodFragment @Inject constructor(
         }
     }
 
-    private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) {
+    private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) { state ->
         sharedViewModel.handle(VerificationAction.RemoteQrCodeScanned(
-                it.otherUserMxItem?.id ?: "",
-                it.pendingRequest.invoke()?.transactionId ?: "",
+                state.otherUserMxItem?.id ?: "",
+                state.pendingRequest.invoke()?.transactionId ?: "",
                 remoteQrCode
         ))
     }