diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 677558575de..b244a752f40 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -37,22 +37,22 @@ public class ChooseLockGeneric extends Activity {
         
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
         
-        int mode = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
-        if (mode == -1) {
-            mode = lockPatternUtils.getPasswordMode();
+        int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
+        if (quality == -1) {
+            quality = lockPatternUtils.getPasswordMode();
         }
-        int minMode = mDPM.getPasswordMode(null);
-        if (mode < minMode) {
-            mode = minMode;
+        int minQuality = mDPM.getPasswordQuality(null);
+        if (quality < minQuality) {
+            quality = minQuality;
         }
-        if (mode >= DevicePolicyManager.PASSWORD_MODE_NUMERIC) {
+        if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
             int minLength = mDPM.getPasswordMinimumLength(null);
             if (minLength < 4) {
                 minLength = 4;
             }
-            final int maxLength = mDPM.getPasswordMaximumLength(mode);
+            final int maxLength = mDPM.getPasswordMaximumLength(quality);
             Intent intent = new Intent().setClass(this, ChooseLockPassword.class);
-            intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, mode);
+            intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality);
             intent.putExtra(ChooseLockPassword.PASSWORD_MIN_KEY, minLength);
             intent.putExtra(ChooseLockPassword.PASSWORD_MAX_KEY, maxLength);
             startActivity(intent);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 78100fb48ca..b8ea18cd90b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -224,7 +224,7 @@ public class SecuritySettings extends PreferenceActivity {
 
     protected void handleUpdateUnlockMethod(final String value) {
         if ("none".equals(value)) {
-            if (mDPM.getPasswordMode(null) == DevicePolicyManager.PASSWORD_MODE_UNSPECIFIED) {
+            if (mDPM.getPasswordQuality(null) == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                 mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST);
             }
         } else {
@@ -236,7 +236,7 @@ public class SecuritySettings extends PreferenceActivity {
             } else {
                 reqMode = LockPatternUtils.MODE_PATTERN;
             }
-            int minMode = mDPM.getPasswordMode(null);
+            int minMode = mDPM.getPasswordQuality(null);
             if (reqMode < minMode) {
                 reqMode = minMode;
             }