diff --git a/app/src/main/java/chat/revolt/MainActivity.kt b/app/src/main/java/chat/revolt/MainActivity.kt
index 175421b9..1e98f3c6 100644
--- a/app/src/main/java/chat/revolt/MainActivity.kt
+++ b/app/src/main/java/chat/revolt/MainActivity.kt
@@ -44,7 +44,7 @@ fun AppEntrypoint() {
 
     AnimatedNavHost(
         navController = navController,
-        startDestination = "setup/greeting",
+        startDestination = "login/greeting",
         enterTransition = {
             slideIntoContainer(
                 AnimatedContentScope.SlideDirection.Left,
@@ -70,9 +70,9 @@ fun AppEntrypoint() {
             ) + fadeOut(animationSpec = tween(400))
         }
     ) {
-        composable("setup/greeting") { GreeterScreen(navController) }
-        composable("setup/login") { LoginScreen(navController) }
-        composable("setup/mfa/{mfaTicket}/{allowedAuthTypes}") { backStackEntry ->
+        composable("login/greeting") { GreeterScreen(navController) }
+        composable("login/login") { LoginScreen(navController) }
+        composable("login/mfa/{mfaTicket}/{allowedAuthTypes}") { backStackEntry ->
             val mfaTicket = backStackEntry.arguments?.getString("mfaTicket") ?: ""
             val allowedAuthTypes =
                 backStackEntry.arguments?.getString("allowedAuthTypes") ?: ""
diff --git a/app/src/main/java/chat/revolt/screens/chat/HomeScreen.kt b/app/src/main/java/chat/revolt/screens/chat/HomeScreen.kt
index 31f5c77a..20f39a30 100644
--- a/app/src/main/java/chat/revolt/screens/chat/HomeScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/HomeScreen.kt
@@ -62,7 +62,7 @@ fun HomeScreen(navController: NavController) {
         Button(
             onClick = {
                 RevoltAPI.logout()
-                navController.navigate("setup/greeting") {
+                navController.navigate("login/greeting") {
                     popUpTo("chat/home") {
                         inclusive = true
                     }
diff --git a/app/src/main/java/chat/revolt/screens/login/GreeterScreen.kt b/app/src/main/java/chat/revolt/screens/login/GreeterScreen.kt
index 657b8290..841fcccb 100644
--- a/app/src/main/java/chat/revolt/screens/login/GreeterScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/login/GreeterScreen.kt
@@ -61,7 +61,7 @@ class GreeterViewModel() : ViewModel() {
 fun GreeterScreen(navController: NavController, viewModel: GreeterViewModel = viewModel()) {
     if (viewModel.skipLogin) {
         navController.navigate("chat/home") {
-            popUpTo("setup/greeting") {
+            popUpTo("login/greeting") {
                 inclusive = true
             }
         }
@@ -131,7 +131,7 @@ fun GreeterScreen(navController: NavController, viewModel: GreeterViewModel = vi
             }
 
             Button(
-                onClick = { navController.navigate("setup/login") },
+                onClick = { navController.navigate("login/login") },
                 modifier = Modifier.fillMaxWidth()
             ) {
                 Text(text = stringResource(R.string.login))
diff --git a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
index c2de63b2..7898dfcc 100644
--- a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
@@ -95,7 +95,7 @@ fun LoginScreen(
 ) {
     if (viewModel.navigateTo == "mfa") {
         navController.navigate(
-            "setup/mfa/${viewModel.mfaResponse!!.mfaSpec!!.ticket}/${
+            "login/mfa/${viewModel.mfaResponse!!.mfaSpec!!.ticket}/${
                 viewModel.mfaResponse!!.mfaSpec!!.allowedMethods.joinToString(
                     ","
                 )
@@ -104,7 +104,7 @@ fun LoginScreen(
         viewModel.navigationComplete()
     } else if (viewModel.navigateTo == "home") {
         navController.navigate("chat/home") {
-            popUpTo("setup/greeting") { inclusive = true }
+            popUpTo("login/greeting") { inclusive = true }
         }
         viewModel.navigationComplete()
     }
diff --git a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt b/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt
index 68bfcf4c..fbd710e0 100644
--- a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt
@@ -110,7 +110,7 @@ fun MfaScreen(
 
     if (viewModel.navigateToHome) {
         navController.navigate("chat/home") {
-            popUpTo("setup/greeting") { inclusive = true }
+            popUpTo("login/greeting") { inclusive = true }
         }
         viewModel.navigationComplete()
     }