diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
index 9a146608fb4..cd27dbbe3d5 100644
--- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -46,7 +46,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
 
     @Override
     protected boolean hasEnrolledBiometrics() {
-        return mFaceManager.hasEnrolledFaces(mUserId);
+        return mFaceManager.hasEnrolledTemplates(mUserId);
     }
 
     @Override
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 6edacda5522..ed2c05e4a81 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -813,7 +813,7 @@ public class ChooseLockGeneric extends SettingsActivity {
         // TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness
         private void removeAllFaceForUserAndFinish(final int userId, RemovalTracker tracker) {
             if (mFaceManager != null && mFaceManager.isHardwareDetected()) {
-                if (mFaceManager.hasEnrolledFaces(userId)) {
+                if (mFaceManager.hasEnrolledTemplates(userId)) {
                     mFaceManager.setActiveUser(userId);
                     Face face = new Face(null, 0, 0);
                     mFaceManager.remove(face, userId,
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index f3bcedc5744..d5641cdfafa 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -115,7 +115,7 @@ final class SetNewPasswordController {
         if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)
                 && mFaceManager != null
                 && mFaceManager.isHardwareDetected()
-                && !mFaceManager.hasEnrolledFaces(mTargetUserId)
+                && !mFaceManager.hasEnrolledTemplates(mTargetUserId)
                 && !isFaceDisabledByAdmin()) {
             extras = getFaceChooseLockExtras();
         } else if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
index d2230997473..9907da08db8 100644
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
@@ -121,7 +121,7 @@ public class FaceStatusPreferenceControllerTest {
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
         when(mFaceManager.getEnrolledFaces(anyInt()))
                 .thenReturn(Collections.singletonList(mock(Face.class)));
-        when(mFaceManager.hasEnrolledFaces(anyInt()))
+        when(mFaceManager.hasEnrolledTemplates(anyInt()))
                 .thenReturn(true);
 
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index fa1c0f7ed91..af77ad83a14 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -113,7 +113,7 @@ public final class SetNewPasswordControllerTest {
         // GIVEN the device supports face.
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
         // GIVEN there are no enrolled face.
-        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);
+        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);
         // GIVEN DPC does not disallow face for keyguard usage.
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
                 .thenReturn(0);
@@ -180,7 +180,7 @@ public final class SetNewPasswordControllerTest {
         // GIVEN the device does NOT support face.
         when(mFaceManager.isHardwareDetected()).thenReturn(false);
         // GIVEN there are no enrolled face.
-        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);
+        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);
         // GIVEN DPC does not disallow face for keyguard usage.
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
                 .thenReturn(0);
@@ -218,7 +218,7 @@ public final class SetNewPasswordControllerTest {
         // GIVEN the device supports face.
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
         // GIVEN there are no enrolled face.
-        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);
+        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);
         // GIVEN DPC does not disallow face for keyguard usage.
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
                 .thenReturn(0);
@@ -256,7 +256,7 @@ public final class SetNewPasswordControllerTest {
         // GIVEN the device supports face.
         when(mFaceManager.isHardwareDetected()).thenReturn(true);
         // GIVEN there is an enrolled face.
-        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);
+        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);
         // GIVEN DPC disallows face for keyguard usage.
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
                 .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);