diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index e004f28..d8af009 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -85,7 +85,7 @@
 
     <Preference
         android:key="battery"
-        android:title="@string/app_battery_usage_title"
+        android:title="@string/battery_details_title"
         android:summary="@string/summary_placeholder" />
 
     <Preference
diff --git a/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt b/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
index 4587bb2..0b4e7d5 100644
--- a/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
@@ -54,7 +54,7 @@
     if (!presenter.isAvailable()) return
 
     Preference(object : PreferenceModel {
-        override val title = stringResource(R.string.app_battery_usage_title)
+        override val title = stringResource(R.string.battery_details_title)
         override val summary = presenter.summary
         override val enabled = presenter.enabled
         override val onClick = presenter::startActivity
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
index 8f1a9a2..a7a54e6 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
@@ -101,7 +101,7 @@
 
         setContent(notInstalledApp)
 
-        composeTestRule.onNode(hasTextExactly(context.getString(R.string.app_battery_usage_title)))
+        composeTestRule.onNode(hasTextExactly(context.getString(R.string.battery_details_title)))
             .assertIsDisplayed()
             .assertIsNotEnabled()
     }
@@ -114,7 +114,7 @@
 
         composeTestRule.onNode(
             hasTextExactly(
-                context.getString(R.string.app_battery_usage_title),
+                context.getString(R.string.battery_details_title),
                 context.getString(R.string.no_battery_summary),
             ),
         ).assertIsDisplayed().assertIsEnabled()
