diff --git a/Riot/Modules/Onboarding/OnboardingCoordinator.swift b/Riot/Modules/Onboarding/OnboardingCoordinator.swift
index 2047e4834..7be3f4370 100644
--- a/Riot/Modules/Onboarding/OnboardingCoordinator.swift
+++ b/Riot/Modules/Onboarding/OnboardingCoordinator.swift
@@ -147,10 +147,10 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
     @available(iOS 14.0, *)
     /// Show the use case screen for new users.
     private func showUseCaseSelectionScreen() {
-        let coordinator = OnboardingUseCaseCoordinator()
+        let coordinator = OnboardingUseCaseSelectionCoordinator()
         coordinator.completion = { [weak self, weak coordinator] result in
             guard let self = self, let coordinator = coordinator else { return }
-            self.useCaseCoordinator(coordinator, didCompleteWith: result)
+            self.useCaseSelectionCoordinator(coordinator, didCompleteWith: result)
         }
         
         coordinator.start()
@@ -166,7 +166,7 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
     }
     
     /// Displays the next view in the flow after the use case screen.
-    private func useCaseCoordinator(_ coordinator: OnboardingUseCaseCoordinator, didCompleteWith result: OnboardingUseCaseViewModelResult) {
+    private func useCaseSelectionCoordinator(_ coordinator: OnboardingUseCaseSelectionCoordinator, didCompleteWith result: OnboardingUseCaseViewModelResult) {
         useCaseResult = result
         showAuthenticationScreen()
     }
diff --git a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
index e2d3d4816..242e4c088 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
@@ -20,7 +20,7 @@ import Foundation
 @available(iOS 14.0, *)
 enum MockAppScreens {
     static let appScreens: [MockScreenState.Type] = [
-        MockOnboardingUseCaseScreenState.self,
+        MockOnboardingUseCaseSelectionScreenState.self,
         MockOnboardingSplashScreenScreenState.self,
         MockLocationSharingScreenState.self,
         MockAnalyticsPromptScreenState.self,
diff --git a/RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseCoordinator.swift b/RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseSelectionCoordinator.swift
similarity index 82%
rename from RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseCoordinator.swift
rename to RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseSelectionCoordinator.swift
index f91c79861..0a2d7eae4 100644
--- a/RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseCoordinator.swift
+++ b/RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseSelectionCoordinator.swift
@@ -16,7 +16,7 @@
 
 import SwiftUI
 
-final class OnboardingUseCaseCoordinator: Coordinator, Presentable {
+final class OnboardingUseCaseSelectionCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
     
@@ -36,7 +36,7 @@ final class OnboardingUseCaseCoordinator: Coordinator, Presentable {
     @available(iOS 14.0, *)
     init() {
         let viewModel = OnboardingUseCaseViewModel()
-        let view = OnboardingUseCase(viewModel: viewModel.context)
+        let view = OnboardingUseCaseSelectionScreen(viewModel: viewModel.context)
         onboardingUseCaseViewModel = viewModel
         
         let hostingController = VectorHostingController(rootView: view)
@@ -47,9 +47,9 @@ final class OnboardingUseCaseCoordinator: Coordinator, Presentable {
     
     // MARK: - Public
     func start() {
-        MXLog.debug("[OnboardingUseCaseCoordinator] did start.")
+        MXLog.debug("[OnboardingUseCaseSelectionCoordinator] did start.")
         onboardingUseCaseViewModel.completion = { [weak self] result in
-            MXLog.debug("[OnboardingUseCaseCoordinator] OnboardingUseCaseViewModel did complete with result: \(result).")
+            MXLog.debug("[OnboardingUseCaseSelectionCoordinator] OnboardingUseCaseViewModel did complete with result: \(result).")
             guard let self = self else { return }
             self.completion?(result)
         }
diff --git a/RiotSwiftUI/Modules/Onboarding/UseCase/MockOnboardingUseCaseScreenState.swift b/RiotSwiftUI/Modules/Onboarding/UseCase/MockOnboardingUseCaseScreenState.swift
index 7cf850d9b..1cce35b23 100644
--- a/RiotSwiftUI/Modules/Onboarding/UseCase/MockOnboardingUseCaseScreenState.swift
+++ b/RiotSwiftUI/Modules/Onboarding/UseCase/MockOnboardingUseCaseScreenState.swift
@@ -20,7 +20,7 @@ import SwiftUI
 /// Using an enum for the screen allows you define the different state cases with
 /// the relevant associated data for each case.
 @available(iOS 14.0, *)
-enum MockOnboardingUseCaseScreenState: MockScreenState, CaseIterable {
+enum MockOnboardingUseCaseSelectionScreenState: MockScreenState, CaseIterable {
     // A case for each state you want to represent
     // with specific, minimal associated data that will allow you
     // mock that screen.
@@ -28,11 +28,11 @@ enum MockOnboardingUseCaseScreenState: MockScreenState, CaseIterable {
     
     /// The associated screen
     var screenType: Any.Type {
-        OnboardingUseCase.self
+        OnboardingUseCaseSelectionScreen.self
     }
     
     /// A list of screen state definitions
-    static var allCases: [MockOnboardingUseCaseScreenState] {
+    static var allCases: [MockOnboardingUseCaseSelectionScreenState] {
         // Each of the presence statuses
         [.default]
     }
@@ -45,7 +45,7 @@ enum MockOnboardingUseCaseScreenState: MockScreenState, CaseIterable {
         
         return (
             [self, viewModel],
-            AnyView(OnboardingUseCase(viewModel: viewModel.context)
+            AnyView(OnboardingUseCaseSelectionScreen(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
         )
     }
diff --git a/RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCase.swift b/RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCaseSelectionScreen.swift
similarity index 97%
rename from RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCase.swift
rename to RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCaseSelectionScreen.swift
index f0f0ad403..34c9363ed 100644
--- a/RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCase.swift
+++ b/RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCaseSelectionScreen.swift
@@ -18,7 +18,7 @@ import SwiftUI
 
 @available(iOS 14.0, *)
 /// The screen shown to a new user to select their use case for the app.
-struct OnboardingUseCase: View {
+struct OnboardingUseCaseSelectionScreen: View {
 
     // MARK: - Properties
     
@@ -119,7 +119,7 @@ struct OnboardingUseCase: View {
 
 @available(iOS 14.0, *)
 struct OnboardingUseCase_Previews: PreviewProvider {
-    static let stateRenderer = MockOnboardingUseCaseScreenState.stateRenderer
+    static let stateRenderer = MockOnboardingUseCaseSelectionScreenState.stateRenderer
     static var previews: some View {
         NavigationView {
             stateRenderer.screenGroup()