diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
index 5c73d08778..8e49eda151 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
@@ -44,9 +44,9 @@ class DefaultFtueServiceTest {
             givenVerifiedStatus(SessionVerifiedStatus.Unknown)
         }
         val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())
-        val state = createState(coroutineScope, sessionVerificationService)
+        val service = createDefaultFtueService(coroutineScope, sessionVerificationService)
 
-        state.state.test {
+        service.state.test {
             // Verification state is unknown, we don't display the flow yet
             assertThat(awaitItem()).isEqualTo(FtueState.Unknown)
 
@@ -67,7 +67,7 @@ class DefaultFtueServiceTest {
         val lockScreenService = FakeLockScreenService()
         val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())
 
-        val state = createState(
+        val service = createDefaultFtueService(
             coroutineScope = coroutineScope,
             sessionVerificationService = sessionVerificationService,
             analyticsService = analyticsService,
@@ -79,9 +79,9 @@ class DefaultFtueServiceTest {
         analyticsService.setDidAskUserConsent()
         permissionStateProvider.setPermissionGranted()
         lockScreenService.setIsPinSetup(true)
-        state.updateState()
+        service.updateState()
 
-        assertThat(state.state.value).isEqualTo(FtueState.Complete)
+        assertThat(service.state.value).isEqualTo(FtueState.Complete)
 
         // Cleanup
         coroutineScope.cancel()
@@ -97,7 +97,7 @@ class DefaultFtueServiceTest {
         val lockScreenService = FakeLockScreenService()
         val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())
 
-        val state = createState(
+        val service = createDefaultFtueService(
             coroutineScope = coroutineScope,
             sessionVerificationService = sessionVerificationService,
             analyticsService = analyticsService,
@@ -107,23 +107,23 @@ class DefaultFtueServiceTest {
         val steps = mutableListOf<FtueStep?>()
 
         // Session verification
-        steps.add(state.getNextStep(steps.lastOrNull()))
+        steps.add(service.getNextStep(steps.lastOrNull()))
         sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.NotVerified)
 
         // Notifications opt in
-        steps.add(state.getNextStep(steps.lastOrNull()))
+        steps.add(service.getNextStep(steps.lastOrNull()))
         permissionStateProvider.setPermissionGranted()
 
         // Entering PIN code
-        steps.add(state.getNextStep(steps.lastOrNull()))
+        steps.add(service.getNextStep(steps.lastOrNull()))
         lockScreenService.setIsPinSetup(true)
 
         // Analytics opt in
-        steps.add(state.getNextStep(steps.lastOrNull()))
+        steps.add(service.getNextStep(steps.lastOrNull()))
         analyticsService.setDidAskUserConsent()
 
         // Final step (null)
-        steps.add(state.getNextStep(steps.lastOrNull()))
+        steps.add(service.getNextStep(steps.lastOrNull()))
 
         assertThat(steps).containsExactly(
             FtueStep.SessionVerification,
@@ -145,7 +145,7 @@ class DefaultFtueServiceTest {
         val analyticsService = FakeAnalyticsService()
         val permissionStateProvider = FakePermissionStateProvider(permissionGranted = false)
         val lockScreenService = FakeLockScreenService()
-        val state = createState(
+        val service = createDefaultFtueService(
             coroutineScope = coroutineScope,
             sessionVerificationService = sessionVerificationService,
             analyticsService = analyticsService,
@@ -158,10 +158,10 @@ class DefaultFtueServiceTest {
         permissionStateProvider.setPermissionGranted()
         lockScreenService.setIsPinSetup(true)
 
-        assertThat(state.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)
+        assertThat(service.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)
 
         analyticsService.setDidAskUserConsent()
-        assertThat(state.getNextStep(null)).isNull()
+        assertThat(service.getNextStep(null)).isNull()
 
         // Cleanup
         coroutineScope.cancel()
@@ -174,7 +174,7 @@ class DefaultFtueServiceTest {
         val analyticsService = FakeAnalyticsService()
         val lockScreenService = FakeLockScreenService()
 
-        val state = createState(
+        val service = createDefaultFtueService(
             sdkIntVersion = Build.VERSION_CODES.M,
             sessionVerificationService = sessionVerificationService,
             coroutineScope = coroutineScope,
@@ -185,16 +185,16 @@ class DefaultFtueServiceTest {
         sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.Verified)
         lockScreenService.setIsPinSetup(true)
 
-        assertThat(state.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)
+        assertThat(service.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)
 
         analyticsService.setDidAskUserConsent()
-        assertThat(state.getNextStep(null)).isNull()
+        assertThat(service.getNextStep(null)).isNull()
 
         // Cleanup
         coroutineScope.cancel()
     }
 
-    private fun createState(
+    private fun createDefaultFtueService(
         coroutineScope: CoroutineScope,
         sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
         analyticsService: AnalyticsService = FakeAnalyticsService(),