Deprecate unused field types NAME_LAST_PREFIX and NAME_LAST_CORE

Deprecated and removed the field types NAME_LAST_PREFIX and
NAME_LAST_CORE from the client codebase. These field types are no longer
used and have no associated client-side logic. This change aligns with
the decision made during the feature sync.

OBSOLETE_HISTOGRAM=Removed as the considered field types are deprecated.

Bug: 507312647
Change-Id: Id640fdf1fc3971f5fe2ea29b5f759efab5f14b59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7817334
Reviewed-by: Norge Vizcay <vizcay@google.com>
Reviewed-by: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Gianmarco Picarella <picarella@google.com>
Reviewed-by: Jihad Hanna <jihadghanna@google.com>
Cr-Commit-Position: refs/heads/main@{#1626776}
diff --git a/chrome/common/extensions/api/autofill_private.idl b/chrome/common/extensions/api/autofill_private.idl
index 05d2f82..c122902 100644
--- a/chrome/common/extensions/api/autofill_private.idl
+++ b/chrome/common/extensions/api/autofill_private.idl
@@ -89,8 +89,6 @@
     ADDRESS_HOME_HOUSE_NUMBER,
     ADDRESS_HOME_SUBPREMISE,
     ADDRESS_HOME_OTHER_SUBUNIT,
-    NAME_LAST_PREFIX,
-    NAME_LAST_CORE,
     NAME_LAST_FIRST,
     NAME_LAST_CONJUNCTION,
     NAME_LAST_SECOND,
diff --git a/components/autofill/content/browser/integrators/actor/autofill_annotations_provider_impl.cc b/components/autofill/content/browser/integrators/actor/autofill_annotations_provider_impl.cc
index 03652e4..7ddf8e5 100644
--- a/components/autofill/content/browser/integrators/actor/autofill_annotations_provider_impl.cc
+++ b/components/autofill/content/browser/integrators/actor/autofill_annotations_provider_impl.cc
@@ -141,8 +141,6 @@
     case autofill::ALTERNATIVE_FULL_NAME:
     case autofill::ALTERNATIVE_GIVEN_NAME:
     case autofill::ALTERNATIVE_FAMILY_NAME:
-    case autofill::NAME_LAST_PREFIX:
-    case autofill::NAME_LAST_CORE:
       return AutofillFieldRedactionReason::kNoRedactionNeeded;
 
     // Email address is not redacted.
diff --git a/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.cc b/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.cc
index 03ef65a..36d5e0a 100644
--- a/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.cc
+++ b/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.cc
@@ -191,8 +191,6 @@
     case NAME_MIDDLE_INITIAL:
     case NAME_FULL:
     case NAME_SUFFIX:
-    case NAME_LAST_CORE:
-    case NAME_LAST_PREFIX:
     case NAME_LAST_FIRST:
     case NAME_LAST_CONJUNCTION:
     case NAME_LAST_SECOND:
diff --git a/components/autofill/core/browser/data_model/addresses/autofill_profile.cc b/components/autofill/core/browser/data_model/addresses/autofill_profile.cc
index 4807b6a..4b93f1f4 100644
--- a/components/autofill/core/browser/data_model/addresses/autofill_profile.cc
+++ b/components/autofill/core/browser/data_model/addresses/autofill_profile.cc
@@ -479,8 +479,6 @@
                                 NAME_FIRST,
                                 NAME_MIDDLE,
                                 NAME_LAST,
-                                NAME_LAST_PREFIX,
-                                NAME_LAST_CORE,
                                 NAME_LAST_FIRST,
                                 NAME_LAST_SECOND,
                                 NAME_LAST_CONJUNCTION,
diff --git a/components/autofill/core/browser/data_model/addresses/contact_info.h b/components/autofill/core/browser/data_model/addresses/contact_info.h
index 45b4f40..ee24b92 100644
--- a/components/autofill/core/browser/data_model/addresses/contact_info.h
+++ b/components/autofill/core/browser/data_model/addresses/contact_info.h
@@ -27,8 +27,6 @@
                                                      NAME_LAST_FIRST,
                                                      NAME_LAST_CONJUNCTION,
                                                      NAME_LAST_SECOND,
-                                                     NAME_LAST_PREFIX,
-                                                     NAME_LAST_CORE,
                                                      NAME_LAST,
                                                      NAME_FULL,
                                                      ALTERNATIVE_FULL_NAME,
diff --git a/components/autofill/core/browser/data_model/autofill_ai/entity_type_unittest.cc b/components/autofill/core/browser/data_model/autofill_ai/entity_type_unittest.cc
index 2c59261..a05c0a95 100644
--- a/components/autofill/core/browser/data_model/autofill_ai/entity_type_unittest.cc
+++ b/components/autofill/core/browser/data_model/autofill_ai/entity_type_unittest.cc
@@ -76,13 +76,13 @@
 TEST(AutofillAttributeTypeTest, Relationships_PassportName) {
   AttributeType a = AttributeType(AttributeTypeName::kPassportName);
   EXPECT_EQ(a.entity_type(), EntityType(EntityTypeName::kPassport));
-  EXPECT_THAT(a.field_subtypes(),
-              UnorderedElementsAre(
-                  NAME_HONORIFIC_PREFIX, NAME_FIRST, NAME_MIDDLE, NAME_LAST,
-                  NAME_LAST_PREFIX, NAME_LAST_CORE, NAME_LAST_FIRST,
-                  NAME_LAST_SECOND, NAME_LAST_CONJUNCTION, NAME_MIDDLE_INITIAL,
-                  NAME_FULL, NAME_SUFFIX, ALTERNATIVE_FAMILY_NAME,
-                  ALTERNATIVE_GIVEN_NAME, ALTERNATIVE_FULL_NAME));
+  EXPECT_THAT(
+      a.field_subtypes(),
+      UnorderedElementsAre(NAME_HONORIFIC_PREFIX, NAME_FIRST, NAME_MIDDLE,
+                           NAME_LAST, NAME_LAST_FIRST, NAME_LAST_SECOND,
+                           NAME_LAST_CONJUNCTION, NAME_MIDDLE_INITIAL,
+                           NAME_FULL, NAME_SUFFIX, ALTERNATIVE_FAMILY_NAME,
+                           ALTERNATIVE_GIVEN_NAME, ALTERNATIVE_FULL_NAME));
 }
 
 TEST(AutofillAttributeTypeTest, IsObfuscated) {
diff --git a/components/autofill/core/browser/field_type_utils.cc b/components/autofill/core/browser/field_type_utils.cc
index 1571e59c..ab43e41 100644
--- a/components/autofill/core/browser/field_type_utils.cc
+++ b/components/autofill/core/browser/field_type_utils.cc
@@ -158,8 +158,6 @@
     case ALTERNATIVE_FULL_NAME:
     case ALTERNATIVE_GIVEN_NAME:
     case ALTERNATIVE_FAMILY_NAME:
-    case NAME_LAST_PREFIX:
-    case NAME_LAST_CORE:
     case PASSPORT_NUMBER:
     case PASSPORT_ISSUING_COUNTRY:
     case LOYALTY_MEMBERSHIP_PROGRAM:
@@ -300,8 +298,6 @@
     case ALTERNATIVE_FULL_NAME:
     case ALTERNATIVE_GIVEN_NAME:
     case ALTERNATIVE_FAMILY_NAME:
-    case NAME_LAST_PREFIX:
-    case NAME_LAST_CORE:
     case PASSPORT_ISSUING_COUNTRY:
     case PASSPORT_EXPIRATION_DATE:
     case PASSPORT_ISSUE_DATE:
diff --git a/components/autofill/core/browser/field_types.cc b/components/autofill/core/browser/field_types.cc
index d643055..48cade88 100644
--- a/components/autofill/core/browser/field_types.cc
+++ b/components/autofill/core/browser/field_types.cc
@@ -111,8 +111,6 @@
          {"ADDRESS_HOME_HOUSE_NUMBER", ADDRESS_HOME_HOUSE_NUMBER},
          {"ADDRESS_HOME_SUBPREMISE", ADDRESS_HOME_SUBPREMISE},
          {"ADDRESS_HOME_OTHER_SUBUNIT", ADDRESS_HOME_OTHER_SUBUNIT},
-         {"NAME_LAST_PREFIX", NAME_LAST_PREFIX},
-         {"NAME_LAST_CORE", NAME_LAST_CORE},
          {"NAME_LAST_FIRST", NAME_LAST_FIRST},
          {"NAME_LAST_CONJUNCTION", NAME_LAST_CONJUNCTION},
          {"NAME_LAST_SECOND", NAME_LAST_SECOND},
@@ -195,8 +193,6 @@
     case NAME_FIRST:
     case NAME_MIDDLE:
     case NAME_LAST:
-    case NAME_LAST_CORE:
-    case NAME_LAST_PREFIX:
     case NAME_LAST_FIRST:
     case NAME_LAST_CONJUNCTION:
     case NAME_LAST_SECOND:
@@ -473,10 +469,6 @@
       return "Middle name";
     case NAME_LAST:
       return "Last name";
-    case NAME_LAST_PREFIX:
-      return "Last name prefix";
-    case NAME_LAST_CORE:
-      return "Last name core";
     case NAME_LAST_FIRST:
       return "First last name";
     case NAME_LAST_CONJUNCTION:
diff --git a/components/autofill/core/browser/field_types.h b/components/autofill/core/browser/field_types.h
index ca236a2b..f6820b0 100644
--- a/components/autofill/core/browser/field_types.h
+++ b/components/autofill/core/browser/field_types.h
@@ -462,14 +462,14 @@
 
   // Prefix of the last name, e.g. "van" in the Netherlands.
   // This is the first child of NAME_LAST.
-  NAME_LAST_PREFIX = 166,
+  // NAME_LAST_PREFIX = 166 is deprecated
 
   // Type to represent the core part of the last name.
   // More technically it contains the last name without the prefix.
   // NAME_LAST_CORE: NAME_LAST_FIRST + NAME_LAST_CONJUNCTION + NAME_LAST_SECOND.
   // Don't use this type unless there is NAME_LAST_PREFIX present in the form.
   // E.g. "Gogh" in "Vincent van Gogh".
-  NAME_LAST_CORE = 167,
+  // NAME_LAST_CORE = 167 is deprecated
 
   // Types corresponding to the "Passport" entity from
   // components/autofill/core/browser/data_model/autofill_ai/entity_schema.json.
@@ -719,7 +719,8 @@
            (130 <= t && t <= 132) || t == 134 || (137 <= t && t <= 139) ||
            (147 <= t && t <= 149) || t == 155 || t == 159 || t == 161 ||
            // Deprecated Autofill AI types.
-           t == 162 || t == 168 || t == 175 || t == 180 ||
+           t == 162 || t == 166 || t == 167 || t == 168 || t == 175 ||
+           t == 180 ||
            // Types for the country for driver's license and vehicle are not
            // used yet, but will likely be added in the future.
            (187 <= t && t <= 188) ||
@@ -760,8 +761,6 @@
     case NAME_FIRST:
     case NAME_MIDDLE:
     case NAME_LAST:
-    case NAME_LAST_PREFIX:
-    case NAME_LAST_CORE:
     case NAME_LAST_FIRST:
     case NAME_LAST_SECOND:
     case NAME_LAST_CONJUNCTION:
diff --git a/components/autofill/core/browser/field_types_unittest.cc b/components/autofill/core/browser/field_types_unittest.cc
index 9de6004e..90a715b87 100644
--- a/components/autofill/core/browser/field_types_unittest.cc
+++ b/components/autofill/core/browser/field_types_unittest.cc
@@ -99,8 +99,6 @@
       ADDRESS_HOME_HOUSE_NUMBER_AND_APT,
       ADDRESS_HOME_SUBPREMISE,
       ADDRESS_HOME_OTHER_SUBUNIT,
-      NAME_LAST_PREFIX,
-      NAME_LAST_CORE,
       NAME_LAST_FIRST,
       NAME_LAST_CONJUNCTION,
       NAME_LAST_SECOND,
diff --git a/components/autofill/core/browser/form_parsing/address_field_parser_ng.cc b/components/autofill/core/browser/form_parsing/address_field_parser_ng.cc
index ba13413d..83506229 100644
--- a/components/autofill/core/browser/form_parsing/address_field_parser_ng.cc
+++ b/components/autofill/core/browser/form_parsing/address_field_parser_ng.cc
@@ -606,8 +606,6 @@
     case NAME_MIDDLE_INITIAL:
     case NAME_FULL:
     case NAME_SUFFIX:
-    case NAME_LAST_PREFIX:
-    case NAME_LAST_CORE:
     case ALTERNATIVE_FULL_NAME:
     case ALTERNATIVE_GIVEN_NAME:
     case ALTERNATIVE_FAMILY_NAME:
diff --git a/components/autofill/core/browser/form_structure_rationalization_engine.cc b/components/autofill/core/browser/form_structure_rationalization_engine.cc
index d7492b0..38e0e88 100644
--- a/components/autofill/core/browser/form_structure_rationalization_engine.cc
+++ b/components/autofill/core/browser/form_structure_rationalization_engine.cc
@@ -637,17 +637,17 @@
                     .SetCountryList({GeoIpCountryCode("JP")})
                     .SetFeature(&features::kAutofillSupportPhoneticNameForJP)
                     .Build())
-            .SetTriggerField(FieldCondition{
-                .possible_overall_types =
-                    FieldTypeSet{NAME_LAST, NAME_LAST_CORE, NAME_LAST_SECOND}})
+            .SetTriggerField(
+                FieldCondition{.possible_overall_types =
+                                   FieldTypeSet{NAME_LAST, NAME_LAST_SECOND}})
             .SetFieldsWithConditionsDoNotExist(
                 {FieldCondition{.location = FieldLocation::kAnywhere,
                                 .possible_overall_types =
                                     FieldTypeSet{ALTERNATIVE_FAMILY_NAME}}})
-            .SetOtherFieldConditions({FieldCondition{
-                .location = FieldLocation::kPredecessor,
-                .possible_overall_types =
-                    FieldTypeSet{NAME_LAST, NAME_LAST_CORE, NAME_LAST_SECOND}}})
+            .SetOtherFieldConditions(
+                {FieldCondition{.location = FieldLocation::kPredecessor,
+                                .possible_overall_types =
+                                    FieldTypeSet{NAME_LAST, NAME_LAST_SECOND}}})
             .SetActions({
                 SetTypeAction{
                     .target = FieldLocation::kTriggerField,
diff --git a/components/autofill/core/browser/metrics/prediction_quality_metrics.cc b/components/autofill/core/browser/metrics/prediction_quality_metrics.cc
index a889a128..544ed485c 100644
--- a/components/autofill/core/browser/metrics/prediction_quality_metrics.cc
+++ b/components/autofill/core/browser/metrics/prediction_quality_metrics.cc
@@ -407,8 +407,6 @@
         case SINGLE_USERNAME:
         case NOT_USERNAME:
         case ONE_TIME_CODE:
-        case NAME_LAST_PREFIX:
-        case NAME_LAST_CORE:
         case NAME_LAST_FIRST:
         case NAME_LAST_CONJUNCTION:
         case NAME_LAST_SECOND:
diff --git a/components/autofill/core/browser/test_utils/autofill_form_test_utils.cc b/components/autofill/core/browser/test_utils/autofill_form_test_utils.cc
index 38f25e5..1d4cb76 100644
--- a/components/autofill/core/browser/test_utils/autofill_form_test_utils.cc
+++ b/components/autofill/core/browser/test_utils/autofill_form_test_utils.cc
@@ -345,8 +345,6 @@
     case FieldType::CONFIRMATION_PASSWORD:
     case FieldType::AMBIGUOUS_TYPE:
     case FieldType::SINGLE_USERNAME_WITH_INTERMEDIATE_VALUES:
-    case FieldType::NAME_LAST_PREFIX:
-    case FieldType::NAME_LAST_CORE:
     case FieldType::ADDRESS_HOME_ZIP_PREFIX:
     case FieldType::ADDRESS_HOME_ZIP_SUFFIX:
     case FieldType::ADDRESS_HOME_ZIP_AND_CITY:
@@ -494,8 +492,6 @@
     case FieldType::CONFIRMATION_PASSWORD:
     case FieldType::AMBIGUOUS_TYPE:
     case FieldType::SINGLE_USERNAME_WITH_INTERMEDIATE_VALUES:
-    case FieldType::NAME_LAST_PREFIX:
-    case FieldType::NAME_LAST_CORE:
     case FieldType::ADDRESS_HOME_ZIP_PREFIX:
     case FieldType::ADDRESS_HOME_ZIP_SUFFIX:
     case FieldType::ADDRESS_HOME_ZIP_AND_CITY:
diff --git a/components/autofill/core/browser/ui/addresses/autofill_address_util.cc b/components/autofill/core/browser/ui/addresses/autofill_address_util.cc
index ab6acb56..0c06a84 100644
--- a/components/autofill/core/browser/ui/addresses/autofill_address_util.cc
+++ b/components/autofill/core/browser/ui/addresses/autofill_address_util.cc
@@ -385,8 +385,6 @@
     case NAME_LAST_SECOND:
     case NAME_MIDDLE_INITIAL:
     case NAME_SUFFIX:
-    case NAME_LAST_PREFIX:
-    case NAME_LAST_CORE:
     case ALTERNATIVE_GIVEN_NAME:
     case ALTERNATIVE_FAMILY_NAME:
     case USERNAME_AND_EMAIL_ADDRESS:
diff --git a/components/send_tab_to_self/proto_conversions.cc b/components/send_tab_to_self/proto_conversions.cc
index ad174c4..30ed2435 100644
--- a/components/send_tab_to_self/proto_conversions.cc
+++ b/components/send_tab_to_self/proto_conversions.cc
@@ -29,10 +29,6 @@
       return sync_pb::FormField_AutofillFieldType_NAME_MIDDLE;
     case autofill::NAME_LAST:
       return sync_pb::FormField_AutofillFieldType_NAME_LAST;
-    case autofill::NAME_LAST_CORE:
-      return sync_pb::FormField_AutofillFieldType_NAME_LAST_CORE;
-    case autofill::NAME_LAST_PREFIX:
-      return sync_pb::FormField_AutofillFieldType_NAME_LAST_PREFIX;
     case autofill::NAME_LAST_FIRST:
       return sync_pb::FormField_AutofillFieldType_NAME_LAST_FIRST;
     case autofill::NAME_LAST_CONJUNCTION:
diff --git a/components/sync/protocol/send_tab_to_self_specifics.proto b/components/sync/protocol/send_tab_to_self_specifics.proto
index a46e20d9..13a88a1 100644
--- a/components/sync/protocol/send_tab_to_self_specifics.proto
+++ b/components/sync/protocol/send_tab_to_self_specifics.proto
@@ -190,8 +190,8 @@
     ALTERNATIVE_FULL_NAME = 94;
     ALTERNATIVE_GIVEN_NAME = 95;
     ALTERNATIVE_FAMILY_NAME = 96;
-    NAME_LAST_PREFIX = 97;
-    NAME_LAST_CORE = 98;
+    DEPRECATED_NAME_LAST_PREFIX = 97;
+    DEPRECATED_NAME_LAST_CORE = 98;
     PASSPORT_NUMBER = 99;
     PASSPORT_ISSUING_COUNTRY = 100;
     PASSPORT_EXPIRATION_DATE = 101;
diff --git a/tools/metrics/histograms/metadata/autofill/enums.xml b/tools/metrics/histograms/metadata/autofill/enums.xml
index a72d20c..da31ba88 100644
--- a/tools/metrics/histograms/metadata/autofill/enums.xml
+++ b/tools/metrics/histograms/metadata/autofill/enums.xml
@@ -499,10 +499,6 @@
   <int value="657" label="ALTERNATIVE_GIVEN_NAME: Failure"/>
   <int value="660" label="ALTERNATIVE_FAMILY_NAME: Success"/>
   <int value="661" label="ALTERNATIVE_FAMILY_NAME: Failure"/>
-  <int value="664" label="NAME_LAST_PREFIX: Success"/>
-  <int value="665" label="NAME_LAST_PREFIX: Failure"/>
-  <int value="668" label="NAME_LAST_CORE: Success"/>
-  <int value="669" label="NAME_LAST_CORE: Failure"/>
   <int value="676" label="PASSPORT_NUMBER: Success"/>
   <int value="677" label="PASSPORT_NUMBER: Failure"/>
   <int value="680" label="PASSPORT_ISSUING_COUNTRY: Success"/>
@@ -1220,12 +1216,6 @@
              edited"/>
   <int value="10561"
       label="ALTERNATIVE_FAMILY_NAME: Autofilled value accepted"/>
-  <int value="10624"
-      label="NAME_LAST_PREFIX: Not autofilled or autofilled value edited"/>
-  <int value="10625" label="NAME_LAST_PREFIX: Autofilled value accepted"/>
-  <int value="10688"
-      label="NAME_LAST_CORE: Not autofilled or autofilled value edited"/>
-  <int value="10689" label="NAME_LAST_CORE: Autofilled value accepted"/>
   <int value="10752"
       label="PASSPORT_NAME_TAG: Not autofilled or autofilled value edited"/>
   <int value="10753" label="PASSPORT_NAME_TAG: Autofilled value accepted"/>
@@ -1605,10 +1595,6 @@
   <int value="2625" label="ALTERNATIVE_GIVEN_NAME: accepted"/>
   <int value="2640" label="ALTERNATIVE_FAMILY_NAME: edited"/>
   <int value="2641" label="ALTERNATIVE_FAMILY_NAME: accepted"/>
-  <int value="2656" label="NAME_LAST_PREFIX: edited"/>
-  <int value="2657" label="NAME_LAST_PREFIX: accepted"/>
-  <int value="2672" label="NAME_LAST_CORE: edited"/>
-  <int value="2673" label="NAME_LAST_CORE: accepted"/>
   <int value="2688" label="PASSPORT_NAME_TAG: edited"/>
   <int value="2689" label="PASSPORT_NAME_TAG: accepted"/>
   <int value="2704" label="PASSPORT_NUMBER: edited"/>
@@ -2539,8 +2525,6 @@
   <int value="163" label="ALTERNATIVE_FULL_NAME"/>
   <int value="164" label="ALTERNATIVE_GIVEN_NAME"/>
   <int value="165" label="ALTERNATIVE_FAMILY_NAME"/>
-  <int value="166" label="NAME_LAST_PREFIX"/>
-  <int value="167" label="NAME_LAST_CORE"/>
   <int value="168" label="PASSPORT_NAME_TAG"/>
   <int value="169" label="PASSPORT_NUMBER"/>
   <int value="170" label="PASSPORT_ISSUING_COUNTRY"/>
@@ -3601,16 +3585,6 @@
   <int value="2642" label="ALTERNATIVE_FAMILY_NAME: kHeuristics"/>
   <int value="2643" label="ALTERNATIVE_FAMILY_NAME: kAutocomplete"/>
   <int value="2644" label="ALTERNATIVE_FAMILY_NAME: kRationalization"/>
-  <int value="2656" label="NAME_LAST_PREFIX: kServerCrowdsourcing"/>
-  <int value="2657" label="NAME_LAST_PREFIX: kServerOverride"/>
-  <int value="2658" label="NAME_LAST_PREFIX: kHeuristics"/>
-  <int value="2659" label="NAME_LAST_PREFIX: kAutocomplete"/>
-  <int value="2660" label="NAME_LAST_PREFIX: kRationalization"/>
-  <int value="2672" label="NAME_LAST_CORE: kServerCrowdsourcing"/>
-  <int value="2673" label="NAME_LAST_CORE: kServerOverride"/>
-  <int value="2674" label="NAME_LAST_CORE: kHeuristics"/>
-  <int value="2675" label="NAME_LAST_CORE: kAutocomplete"/>
-  <int value="2676" label="NAME_LAST_CORE: kRationalization"/>
   <int value="2704" label="PASSPORT_NUMBER: kServerCrowdsourcing"/>
   <int value="2705" label="PASSPORT_NUMBER: kServerOverride"/>
   <int value="2706" label="PASSPORT_NUMBER: kHeuristics"/>
@@ -5019,10 +4993,6 @@
   <int value="657" label="ALTERNATIVE_GIVEN_NAME: Accepted"/>
   <int value="660" label="ALTERNATIVE_FAMILY_NAME: Ignored"/>
   <int value="661" label="ALTERNATIVE_FAMILY_NAME: Accepted"/>
-  <int value="664" label="NAME_LAST_PREFIX: Ignored"/>
-  <int value="665" label="NAME_LAST_PREFIX: Accepted"/>
-  <int value="668" label="NAME_LAST_CORE: Ignored"/>
-  <int value="669" label="NAME_LAST_CORE: Accepted"/>
   <int value="672" label="PASSPORT_NAME_TAG: Ignored"/>
   <int value="673" label="PASSPORT_NAME_TAG: Accepted"/>
   <int value="676" label="PASSPORT_NUMBER: Ignored"/>
diff --git a/tools/metrics/histograms/metadata/autofill/histograms.xml b/tools/metrics/histograms/metadata/autofill/histograms.xml
index 3f31741..a17371b 100644
--- a/tools/metrics/histograms/metadata/autofill/histograms.xml
+++ b/tools/metrics/histograms/metadata/autofill/histograms.xml
@@ -560,9 +560,7 @@
   <variant name="NAME_HONORIFIC_PREFIX"/>
   <variant name="NAME_LAST"/>
   <variant name="NAME_LAST_CONJUNCTION"/>
-  <variant name="NAME_LAST_CORE"/>
   <variant name="NAME_LAST_FIRST"/>
-  <variant name="NAME_LAST_PREFIX"/>
   <variant name="NAME_LAST_SECOND"/>
   <variant name="NAME_MIDDLE"/>
   <variant name="NAME_MIDDLE_INITIAL"/>
@@ -707,9 +705,7 @@
   <variant name="NAME_FULL"/>
   <variant name="NAME_LAST"/>
   <variant name="NAME_LAST_CONJUNCTION"/>
-  <variant name="NAME_LAST_CORE"/>
   <variant name="NAME_LAST_FIRST"/>
-  <variant name="NAME_LAST_PREFIX"/>
   <variant name="NAME_LAST_SECOND"/>
   <variant name="NAME_MIDDLE"/>
   <variant name="NAME_SUFFIX"/>
diff --git a/tools/typescript/definitions/autofill_private.d.ts b/tools/typescript/definitions/autofill_private.d.ts
index 84f5c2d0..3c09f619 100644
--- a/tools/typescript/definitions/autofill_private.d.ts
+++ b/tools/typescript/definitions/autofill_private.d.ts
@@ -88,8 +88,6 @@
         ADDRESS_HOME_HOUSE_NUMBER,
         ADDRESS_HOME_SUBPREMISE,
         ADDRESS_HOME_OTHER_SUBUNIT,
-        NAME_LAST_PREFIX,
-        NAME_LAST_CORE,
         NAME_LAST_FIRST,
         NAME_LAST_CONJUNCTION,
         NAME_LAST_SECOND,