diff --git a/src/com/android/settings/gestures/PanicGesturePreferenceController.java b/src/com/android/settings/gestures/PanicGesturePreferenceController.java
index 42d3e412e07..124c8f9c1fe 100644
--- a/src/com/android/settings/gestures/PanicGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PanicGesturePreferenceController.java
@@ -50,7 +50,7 @@ public class PanicGesturePreferenceController extends GesturePreferenceControlle
 
     private static final String PREF_KEY_VIDEO = "panic_button_screen_video";
 
-    private static final String SECURE_KEY = Settings.Secure.PANIC_GESTURE_ENABLED;
+    private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
 
     public PanicGesturePreferenceController(Context context, String key) {
         super(context, key);
diff --git a/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java b/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java
index 332636a047c..532b9fc874e 100644
--- a/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java
+++ b/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java
@@ -34,7 +34,7 @@ public class PanicGestureSoundPreferenceController extends TogglePreferenceContr
     @VisibleForTesting
     static final int OFF = 0;
 
-    private static final String SECURE_KEY = Settings.Secure.PANIC_SOUND_ENABLED;
+    private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED;
 
     public PanicGestureSoundPreferenceController(Context context, String key) {
         super(context, key);
diff --git a/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java
index f451276c8e4..3be5635784d 100644
--- a/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java
@@ -113,7 +113,7 @@ public class PanicGesturePreferenceControllerTest {
     @Test
     public void isChecked_configIsNotSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, ON);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, ON);
         mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
 
         assertThat(mController.isChecked()).isTrue();
@@ -122,7 +122,7 @@ public class PanicGesturePreferenceControllerTest {
     @Test
     public void isChecked_configIsSet_shouldReturnFalse() {
         // Set the setting to be disabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, OFF);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, OFF);
         mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
 
         assertThat(mController.isChecked()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java
index 4967d7c2e9c..55a2e85d993 100644
--- a/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java
@@ -78,7 +78,8 @@ public class PanicGestureSoundPreferenceControllerTest {
     @Test
     public void isChecked_configIsSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, ON);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
+                ON);
 
         assertThat(mController.isChecked()).isTrue();
     }
@@ -86,7 +87,8 @@ public class PanicGestureSoundPreferenceControllerTest {
     @Test
     public void isChecked_configIsSetToFalse_shouldReturnFalse() {
         // Set the setting to be disabled.
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, OFF);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
+                OFF);
 
         assertThat(mController.isChecked()).isFalse();
     }