diff --git a/src/com/android/settings/display/AutoBrightnessScreen.kt b/src/com/android/settings/display/AutoBrightnessScreen.kt
index ed9e078ffb6..48ef210e360 100644
--- a/src/com/android/settings/display/AutoBrightnessScreen.kt
+++ b/src/com/android/settings/display/AutoBrightnessScreen.kt
@@ -29,8 +29,7 @@ import com.android.settingslib.datastore.KeyValueStore
 import com.android.settingslib.datastore.KeyedObservableDelegate
 import com.android.settingslib.datastore.SettingsStore
 import com.android.settingslib.datastore.SettingsSystemStore
-import com.android.settingslib.metadata.BooleanValue
-import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.BooleanPreference
 import com.android.settingslib.metadata.PreferenceAvailabilityProvider
 import com.android.settingslib.metadata.PreferenceMetadata
 import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -46,8 +45,7 @@ class AutoBrightnessScreen :
     PreferenceScreenBinding,
     PreferenceAvailabilityProvider,
     PreferenceRestrictionMixin,
-    PersistentPreference<Boolean>,
-    BooleanValue {
+    BooleanPreference {
     override val key: String
         get() = KEY
 
diff --git a/src/com/android/settings/display/darkmode/DarkModeScreen.kt b/src/com/android/settings/display/darkmode/DarkModeScreen.kt
index 963a641c4d3..f1a95f59874 100644
--- a/src/com/android/settings/display/darkmode/DarkModeScreen.kt
+++ b/src/com/android/settings/display/darkmode/DarkModeScreen.kt
@@ -25,8 +25,7 @@ import com.android.settings.flags.Flags
 import com.android.settingslib.PrimarySwitchPreference
 import com.android.settingslib.datastore.KeyValueStore
 import com.android.settingslib.datastore.Permissions
-import com.android.settingslib.metadata.BooleanValue
-import com.android.settingslib.metadata.PersistentPreference
+import com.android.settingslib.metadata.BooleanPreference
 import com.android.settingslib.metadata.PreferenceMetadata
 import com.android.settingslib.metadata.PreferenceSummaryProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -41,8 +40,7 @@ import com.android.settingslib.preference.PreferenceScreenCreator
 class DarkModeScreen(context: Context) :
     PreferenceScreenCreator,
     PreferenceScreenBinding,
-    PersistentPreference<Boolean>,
-    BooleanValue,
+    BooleanPreference,
     PreferenceSummaryProvider {
 
     private val darkModeStorage = DarkModeStorage(context)