diff --git a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewModel.swift b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewModel.swift
index 28a438734..41fc87276 100644
--- a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewModel.swift
+++ b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewModel.swift
@@ -29,12 +29,12 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
     
     // MARK: Public
 
-    var userId: String
-    var userDisplayName: String?
-    var avatarUrl: String?
-    var deviceId: String
+    let userId: String
+    let userDisplayName: String?
+    let avatarUrl: String?
+    let deviceId: String
 
-    var mediaManager: MXMediaManager
+    let mediaManager: MXMediaManager
 
     weak var viewDelegate: DeviceVerificationIncomingViewModelViewDelegate?
     weak var coordinatorDelegate: DeviceVerificationIncomingViewModelCoordinatorDelegate?
diff --git a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
index 4e5fe5925..e4d210a00 100644
--- a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
+++ b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
@@ -30,11 +30,11 @@ final class DeviceVerificationStartViewController: UIViewController {
 
     @IBOutlet private weak var titleLabel: UILabel!
     @IBOutlet private weak var informationLabel: UILabel!
-    @IBOutlet weak var waitingPartnerLabel: UILabel!
-    @IBOutlet weak var useLegacyVerificationLabel: UILabel!
-    @IBOutlet weak var verifyButtonBackgroundView: UIView!
+    @IBOutlet private weak var waitingPartnerLabel: UILabel!
+    @IBOutlet private weak var useLegacyVerificationLabel: UILabel!
+    @IBOutlet private weak var verifyButtonBackgroundView: UIView!
     @IBOutlet private weak var verifyButton: UIButton!
-    @IBOutlet weak var useLegacyVerificationButton: UIButton!
+    @IBOutlet private weak var useLegacyVerificationButton: UIButton!
 
     // MARK: Private
 
diff --git a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
index 91466d0bc..a5b2a9292 100644
--- a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
+++ b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
@@ -30,10 +30,10 @@ final class DeviceVerificationVerifyViewController: UIViewController {
 
     @IBOutlet private weak var titleLabel: UILabel!
     @IBOutlet private weak var informationLabel: UILabel!
-    @IBOutlet weak var decimalLabel: UILabel!
-    @IBOutlet weak var emojisCollectionView: UICollectionView!
-    @IBOutlet weak var waitingPartnerLabel: UILabel!
-    @IBOutlet weak var continueButtonBackgroundView: UIView!
+    @IBOutlet private weak var decimalLabel: UILabel!
+    @IBOutlet private weak var emojisCollectionView: UICollectionView!
+    @IBOutlet private weak var waitingPartnerLabel: UILabel!
+    @IBOutlet private weak var continueButtonBackgroundView: UIView!
     @IBOutlet private weak var continueButton: UIButton!
 
     // MARK: Private