diff --git a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
index ea19db0dab7..65fd84644c4 100644
--- a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
@@ -33,7 +33,7 @@ import com.android.settings.overlay.FeatureFactory;
  */
 public class ControlsPrivacyPreferenceController extends TogglePreferenceController {
 
-    private static final String SETTING_KEY = "lockscreen_show_controls";
+    private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_CONTROLS;
 
     public ControlsPrivacyPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
diff --git a/src/com/android/settings/display/WalletPrivacyPreferenceController.java b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
index 9a342ceda35..2e78fe360cc 100644
--- a/src/com/android/settings/display/WalletPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
@@ -34,7 +34,7 @@ import com.android.settings.overlay.FeatureFactory;
  */
 public class WalletPrivacyPreferenceController extends TogglePreferenceController {
 
-    private static final String SETTING_KEY = "lockscreen_show_wallet";
+    private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_WALLET;
     private final QuickAccessWalletClient mClient;
 
     public WalletPrivacyPreferenceController(Context context, String preferenceKey) {
diff --git a/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
index 42ec3d5c2d1..447ed2b606b 100644
--- a/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
@@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowPackageManager;
 public class ControlsPrivacyPreferenceControllerTest {
 
     private static final String TEST_KEY = "test_key";
-    private static final String SETTING_KEY = "lockscreen_show_controls";
+    private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_CONTROLS;
 
     private Context mContext;
     private ContentResolver mContentResolver;
diff --git a/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
index 034d06118c7..73f4946f9af 100644
--- a/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
@@ -48,7 +48,7 @@ import org.robolectric.RuntimeEnvironment;
 public class WalletPrivacyPreferenceControllerTest {
 
     private static final String TEST_KEY = "test_key";
-    private static final String SETTING_KEY = "lockscreen_show_wallet";
+    private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_WALLET;
 
     private Context mContext;
     private ContentResolver mContentResolver;
@@ -110,7 +110,7 @@ public class WalletPrivacyPreferenceControllerTest {
     }
 
     @Test
-    public void setChecked_false_POWER_MENU_LOCKED_SHOW_CONTENTIs0() {
+    public void setChecked_false_SettingIs0() {
         mController.setChecked(false);
 
         assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);