diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index 039ed94da33..63e04519845 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -23,7 +23,7 @@ import android.util.FeatureFlagUtils;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.spa.SpaActivity;
-import com.android.settings.spa.app.appsettings.AppSettingsProvider;
+import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider;
 
 public class InstalledAppDetailsTop extends SettingsActivity {
 
@@ -35,7 +35,7 @@ public class InstalledAppDetailsTop extends SettingsActivity {
         }
         String packageName = super.getIntent().getData().getSchemeSpecificPart();
         SpaActivity.startSpaActivity(
-                this, AppSettingsProvider.INSTANCE.getRoute(packageName, getUserId()));
+                this, AppInfoSettingsProvider.INSTANCE.getRoute(packageName, getUserId()));
         finish();
     }
 
diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index ad903c61cad..a1e698b89cc 100644
--- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -18,7 +18,7 @@ package com.android.settings.spa
 
 import com.android.settings.spa.app.AllAppListPageProvider
 import com.android.settings.spa.app.AppsMainPageProvider
-import com.android.settings.spa.app.appsettings.AppSettingsProvider
+import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
 import com.android.settings.spa.app.specialaccess.AlarmsAndRemindersAppListProvider
 import com.android.settings.spa.app.specialaccess.AllFilesAccessAppListProvider
 import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListProvider
@@ -54,7 +54,7 @@ object SettingsSpaEnvironment : SpaEnvironment() {
                 HomePageProvider,
                 AppsMainPageProvider,
                 AllAppListPageProvider,
-                AppSettingsProvider,
+                AppInfoSettingsProvider,
                 SpecialAppAccessPageProvider,
                 NotificationMainPageProvider,
                 AppListNotificationsPageProvider,
diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt
index cac9e5a486c..3331a699a4f 100644
--- a/src/com/android/settings/spa/app/AllAppList.kt
+++ b/src/com/android/settings/spa/app/AllAppList.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import com.android.settings.R
-import com.android.settings.spa.app.appsettings.AppSettingsProvider
+import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
 import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
 import com.android.settingslib.spa.framework.common.SettingsPage
 import com.android.settingslib.spa.framework.common.SettingsPageProvider
@@ -65,7 +65,7 @@ private fun AllAppListPage() {
     ) { itemModel ->
         AppListItem(
             itemModel = itemModel,
-            onClick = AppSettingsProvider.navigator(app = itemModel.record.app),
+            onClick = AppInfoSettingsProvider.navigator(app = itemModel.record.app),
         )
     }
 }
diff --git a/src/com/android/settings/spa/app/appsettings/AppButtonRepository.kt b/src/com/android/settings/spa/app/appinfo/AppButtonRepository.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppButtonRepository.kt
rename to src/com/android/settings/spa/app/appinfo/AppButtonRepository.kt
index 37801989b1e..3890e32affd 100644
--- a/src/com/android/settings/spa/app/appsettings/AppButtonRepository.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppButtonRepository.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.app.ActivityManager
 import android.content.ComponentName
diff --git a/src/com/android/settings/spa/app/appsettings/AppButtons.kt b/src/com/android/settings/spa/app/appinfo/AppButtons.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppButtons.kt
rename to src/com/android/settings/spa/app/appinfo/AppButtons.kt
index 30fcdb77515..5bdaf68220f 100644
--- a/src/com/android/settings/spa/app/appsettings/AppButtons.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppButtons.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.pm.PackageInfo
 import androidx.compose.runtime.Composable
diff --git a/src/com/android/settings/spa/app/appsettings/AppClearButton.kt b/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppClearButton.kt
rename to src/com/android/settings/spa/app/appinfo/AppClearButton.kt
index e16e09168d3..c441071910d 100644
--- a/src/com/android/settings/spa/app/appsettings/AppClearButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.pm.PackageInfo
 import androidx.compose.material.icons.Icons
diff --git a/src/com/android/settings/spa/app/appsettings/AppDisableButton.kt b/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
similarity index 99%
rename from src/com/android/settings/spa/app/appsettings/AppDisableButton.kt
rename to src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
index 0d48728bfd1..79fb3866692 100644
--- a/src/com/android/settings/spa/app/appsettings/AppDisableButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
diff --git a/src/com/android/settings/spa/app/appsettings/AppForceStopButton.kt b/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppForceStopButton.kt
rename to src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
index c34eff027d5..52ce3dfb5f6 100644
--- a/src/com/android/settings/spa/app/appsettings/AppForceStopButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.app.settings.SettingsEnums
 import android.content.pm.ApplicationInfo
diff --git a/src/com/android/settings/spa/app/appsettings/AppSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
similarity index 91%
rename from src/com/android/settings/spa/app/appsettings/AppSettings.kt
rename to src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
index c8c585449e0..6acfac4145c 100644
--- a/src/com/android/settings/spa/app/appsettings/AppSettings.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.pm.ApplicationInfo
 import android.os.Bundle
@@ -42,8 +42,8 @@ import com.android.settingslib.spaprivileged.template.app.AppInfoProvider
 private const val PACKAGE_NAME = "packageName"
 private const val USER_ID = "userId"
 
-object AppSettingsProvider : SettingsPageProvider {
-    override val name = "AppSettings"
+object AppInfoSettingsProvider : SettingsPageProvider {
+    override val name = "AppInfoSettings"
 
     override val parameter = listOf(
         navArgument(PACKAGE_NAME) { type = NavType.StringType },
@@ -59,7 +59,7 @@ object AppSettingsProvider : SettingsPageProvider {
         val packageInfoPresenter = remember {
             PackageInfoPresenter(context, packageName, userId, coroutineScope)
         }
-        AppSettings(packageInfoPresenter)
+        AppInfoSettings(packageInfoPresenter)
         packageInfoPresenter.PackageRemoveDetector()
     }
 
@@ -67,7 +67,7 @@ object AppSettingsProvider : SettingsPageProvider {
     fun navigator(app: ApplicationInfo) = navigator(route = "$name/${app.toRoute()}")
 
     /**
-     * Gets the route to the App Settings page.
+     * Gets the route to the App Info Settings page.
      *
      * Expose route to enable enter from non-SPA pages.
      */
@@ -75,13 +75,13 @@ object AppSettingsProvider : SettingsPageProvider {
 }
 
 @Composable
-private fun AppSettings(packageInfoPresenter: PackageInfoPresenter) {
+private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
     val packageInfo = packageInfoPresenter.flow.collectAsState().value ?: return
     val app = packageInfo.applicationInfo
     RegularScaffold(
         title = stringResource(R.string.application_info_label),
         actions = {
-            AppSettingsMoreOptions(packageInfoPresenter, app)
+            AppInfoSettingsMoreOptions(packageInfoPresenter, app)
         }
     ) {
         val appInfoProvider = remember { AppInfoProvider(packageInfo) }
diff --git a/src/com/android/settings/spa/app/appsettings/AppSettingsMoreOptions.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
similarity index 96%
rename from src/com/android/settings/spa/app/appsettings/AppSettingsMoreOptions.kt
rename to src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
index 20415c3b028..eb3ca4834bc 100644
--- a/src/com/android/settings/spa/app/appsettings/AppSettingsMoreOptions.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
@@ -34,7 +34,7 @@ import com.android.settingslib.spaprivileged.model.app.isDisallowControl
 import com.android.settingslib.spaprivileged.model.app.userId
 
 @Composable
-fun AppSettingsMoreOptions(packageInfoPresenter: PackageInfoPresenter, app: ApplicationInfo) {
+fun AppInfoSettingsMoreOptions(packageInfoPresenter: PackageInfoPresenter, app: ApplicationInfo) {
     val context = LocalContext.current
     // We don't allow uninstalling update for DO/PO if it's a system app, because it will clear data
     // on all users. We also don't allow uninstalling for all users if it's DO/PO for any user.
diff --git a/src/com/android/settings/spa/app/appsettings/AppInstallButton.kt b/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
similarity index 97%
rename from src/com/android/settings/spa/app/appsettings/AppInstallButton.kt
rename to src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
index 94290e6a2ad..a3ddfabb8e0 100644
--- a/src/com/android/settings/spa/app/appsettings/AppInstallButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.Intent
 import android.content.pm.ApplicationInfo
diff --git a/src/com/android/settings/spa/app/appsettings/AppLaunchButton.kt b/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
similarity index 97%
rename from src/com/android/settings/spa/app/appsettings/AppLaunchButton.kt
rename to src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
index 9f81661b03b..8f398c7fabd 100644
--- a/src/com/android/settings/spa/app/appsettings/AppLaunchButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.Intent
 import android.content.pm.ApplicationInfo
diff --git a/src/com/android/settings/spa/app/appsettings/AppPermissionPreference.kt b/src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppPermissionPreference.kt
rename to src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt
index ec37f1126ae..c7d775eb6fe 100644
--- a/src/com/android/settings/spa/app/appsettings/AppPermissionPreference.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.ActivityNotFoundException
 import android.content.Context
diff --git a/src/com/android/settings/spa/app/appsettings/AppPermissionSummary.kt b/src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppPermissionSummary.kt
rename to src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt
index 31e0e0e7ad1..9c5f6737ef5 100644
--- a/src/com/android/settings/spa/app/appsettings/AppPermissionSummary.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
diff --git a/src/com/android/settings/spa/app/appsettings/AppUninstallButton.kt b/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
similarity index 98%
rename from src/com/android/settings/spa/app/appsettings/AppUninstallButton.kt
rename to src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
index e85adc8cad5..4b95f7bebde 100644
--- a/src/com/android/settings/spa/app/appsettings/AppUninstallButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.content.om.OverlayManager
 import android.content.pm.ApplicationInfo
diff --git a/src/com/android/settings/spa/app/appsettings/PackageInfoPresenter.kt b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
similarity index 99%
rename from src/com/android/settings/spa/app/appsettings/PackageInfoPresenter.kt
rename to src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
index 299c0a7dea1..2f5dda18290 100644
--- a/src/com/android/settings/spa/app/appsettings/PackageInfoPresenter.kt
+++ b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.spa.app.appsettings
+package com.android.settings.spa.app.appinfo
 
 import android.app.ActivityManager
 import android.app.settings.SettingsEnums
diff --git a/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt b/tests/robotests/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt
similarity index 99%
rename from tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt
rename to tests/robotests/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt
index 35cdc0326f8..ce1c1b74453 100644
--- a/tests/robotests/src/com/android/settings/spa/app/appsettings/AppPermissionSummaryTest.kt
+++ b/tests/robotests/src/com/android/settings/spa/app/appinfo/AppPermissionSummaryTest.kt
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.spa.app.appsettings
+
+package com.android.settings.spa.app.appinfo
 
 import android.content.Context
 import android.content.pm.ApplicationInfo