diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/MainActivity.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/MainActivity.kt
index 12cb777f44..ad3d5f5485 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/MainActivity.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/MainActivity.kt
@@ -3,7 +3,6 @@ package com.example.llama.revamp
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
-import androidx.activity.OnBackPressedDispatcher
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.activity.compose.setContent
@@ -38,7 +37,7 @@ import com.example.llama.revamp.ui.screens.BenchmarkScreen
 import com.example.llama.revamp.ui.screens.ConversationScreen
 import com.example.llama.revamp.ui.screens.ModelSelectionScreen
 import com.example.llama.revamp.ui.screens.ModelsManagementScreen
-import com.example.llama.revamp.ui.screens.ModeSelectionScreen
+import com.example.llama.revamp.ui.screens.ModelLoadingScreen
 import com.example.llama.revamp.ui.screens.SettingsGeneralScreen
 import com.example.llama.revamp.ui.theme.LlamaTheme
 import com.example.llama.revamp.util.ViewModelFactoryProvider
@@ -113,7 +112,7 @@ fun AppContent() {
         derivedStateOf {
             currentRoute == AppDestinations.CONVERSATION_ROUTE ||
                 currentRoute == AppDestinations.BENCHMARK_ROUTE ||
-                currentRoute == AppDestinations.MODE_SELECTION_ROUTE
+                currentRoute == AppDestinations.MODEL_LOADING_ROUTE
         }
     }
 
@@ -192,7 +191,7 @@ fun AppContent() {
                 ModelSelectionScreen(
                     onModelSelected = { modelInfo ->
                         viewModel.selectModel(modelInfo)
-                        navigationActions.navigateToModeSelection()
+                        navigationActions.navigateToModelLoading()
                     },
                     onManageModelsClicked = {
                         navigationActions.navigateToModelsManagement()
@@ -204,8 +203,8 @@ fun AppContent() {
             }
 
             // Mode Selection Screen
-            composable(AppDestinations.MODE_SELECTION_ROUTE) {
-                ModeSelectionScreen(
+            composable(AppDestinations.MODEL_LOADING_ROUTE) {
+                ModelLoadingScreen(
                     engineState = engineState,
                     onBenchmarkSelected = {
                         viewModel.prepareForBenchmark()
diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/navigation/AppDestinations.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/navigation/AppDestinations.kt
index 7a53afa95f..e10b65f2a4 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/navigation/AppDestinations.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/navigation/AppDestinations.kt
@@ -8,7 +8,7 @@ import androidx.navigation.NavController
 object AppDestinations {
     // Primary navigation destinations
     const val MODEL_SELECTION_ROUTE = "model_selection"
-    const val MODE_SELECTION_ROUTE = "mode_selection"
+    const val MODEL_LOADING_ROUTE = "model_loading"
     const val CONVERSATION_ROUTE = "conversation"
     const val BENCHMARK_ROUTE = "benchmark"
 
@@ -29,8 +29,8 @@ class NavigationActions(private val navController: NavController) {
         }
     }
 
-    fun navigateToModeSelection() {
-        navController.navigate(AppDestinations.MODE_SELECTION_ROUTE)
+    fun navigateToModelLoading() {
+        navController.navigate(AppDestinations.MODEL_LOADING_ROUTE)
     }
 
     fun navigateToConversation() {
diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModeSelectionScreen.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModelLoadingScreen.kt
similarity index 99%
rename from examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModeSelectionScreen.kt
rename to examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModelLoadingScreen.kt
index 09704c50bf..9436f2135e 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModeSelectionScreen.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModelLoadingScreen.kt
@@ -63,7 +63,7 @@ enum class SystemPromptTab {
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
-fun ModeSelectionScreen(
+fun ModelLoadingScreen(
     engineState: InferenceEngine.State,
     onBenchmarkSelected: () -> Unit,
     onConversationSelected: (String?) -> Unit,