diff --git a/src/material/legacy-autocomplete/autocomplete.spec.ts b/src/material/legacy-autocomplete/autocomplete.spec.ts
index a0aa1ab6227b..06abf2f19ddd 100644
--- a/src/material/legacy-autocomplete/autocomplete.spec.ts
+++ b/src/material/legacy-autocomplete/autocomplete.spec.ts
@@ -36,7 +36,7 @@ import {
   tick,
 } from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatLegacyOption, MatOptionSelectionChange} from '@angular/material/legacy-core';
+import {MatLegacyOption, MatLegacyOptionSelectionChange} from '@angular/material/legacy-core';
 import {MatLegacyFormField, MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -2352,7 +2352,7 @@ describe('MatAutocomplete', () => {
       fixture.detectChanges();
       zone.simulateZoneExit();
 
-      expect(spy).toHaveBeenCalledWith(jasmine.any(MatOptionSelectionChange));
+      expect(spy).toHaveBeenCalledWith(jasmine.any(MatLegacyOptionSelectionChange));
       subscription!.unsubscribe();
     }));
 
@@ -2483,7 +2483,7 @@ describe('MatAutocomplete', () => {
 
       expect(closingActionSpy).not.toHaveBeenCalled();
       option.click();
-      expect(closingActionSpy).toHaveBeenCalledWith(jasmine.any(MatOptionSelectionChange));
+      expect(closingActionSpy).toHaveBeenCalledWith(jasmine.any(MatLegacyOptionSelectionChange));
     });
 
     it('should close the panel when pressing escape', () => {
diff --git a/src/material/legacy-autocomplete/autocomplete.ts b/src/material/legacy-autocomplete/autocomplete.ts
index 40a58388a337..742b38dcc9ac 100644
--- a/src/material/legacy-autocomplete/autocomplete.ts
+++ b/src/material/legacy-autocomplete/autocomplete.ts
@@ -14,10 +14,8 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {
-  MAT_OPTGROUP,
-  MAT_OPTION_PARENT_COMPONENT,
-  _MatOptgroupBase,
-  _MatOptionBase,
+  MAT_LEGACY_OPTGROUP,
+  MAT_LEGACY_OPTION_PARENT_COMPONENT,
   MatLegacyOption,
   MatLegacyOptgroup,
 } from '@angular/material/legacy-core';
@@ -38,11 +36,12 @@ import {_MatAutocompleteBase} from '@angular/material/autocomplete';
   host: {
     'class': 'mat-autocomplete',
   },
-  providers: [{provide: MAT_OPTION_PARENT_COMPONENT, useExisting: MatLegacyAutocomplete}],
+  providers: [{provide: MAT_LEGACY_OPTION_PARENT_COMPONENT, useExisting: MatLegacyAutocomplete}],
 })
 export class MatLegacyAutocomplete extends _MatAutocompleteBase {
   /** Reference to all option groups within the autocomplete. */
-  @ContentChildren(MAT_OPTGROUP, {descendants: true}) optionGroups: QueryList<MatLegacyOptgroup>;
+  @ContentChildren(MAT_LEGACY_OPTGROUP, {descendants: true})
+  optionGroups: QueryList<MatLegacyOptgroup>;
   /** Reference to all options within the autocomplete. */
   @ContentChildren(MatLegacyOption, {descendants: true}) options: QueryList<MatLegacyOption>;
   protected _visibleClass = 'mat-autocomplete-visible';
diff --git a/src/material/legacy-autocomplete/testing/autocomplete-harness.ts b/src/material/legacy-autocomplete/testing/autocomplete-harness.ts
index f84724faacee..c9cb3939fe8f 100644
--- a/src/material/legacy-autocomplete/testing/autocomplete-harness.ts
+++ b/src/material/legacy-autocomplete/testing/autocomplete-harness.ts
@@ -10,8 +10,8 @@ import {HarnessPredicate} from '@angular/cdk/testing';
 import {
   MatLegacyOptgroupHarness,
   MatLegacyOptionHarness,
-  OptgroupHarnessFilters,
-  OptionHarnessFilters,
+  LegacyOptgroupHarnessFilters,
+  LegacyOptionHarnessFilters,
 } from '@angular/material/legacy-core/testing';
 import {_MatAutocompleteHarnessBase} from '@angular/material/autocomplete/testing';
 import {LegacyAutocompleteHarnessFilters} from './autocomplete-harness-filters';
@@ -24,10 +24,10 @@ import {LegacyAutocompleteHarnessFilters} from './autocomplete-harness-filters';
 export class MatLegacyAutocompleteHarness extends _MatAutocompleteHarnessBase<
   typeof MatLegacyOptionHarness,
   MatLegacyOptionHarness,
-  OptionHarnessFilters,
+  LegacyOptionHarnessFilters,
   typeof MatLegacyOptgroupHarness,
   MatLegacyOptgroupHarness,
-  OptgroupHarnessFilters
+  LegacyOptgroupHarnessFilters
 > {
   protected _prefix = 'mat';
   protected _optionClass = MatLegacyOptionHarness;
diff --git a/src/material/legacy-core/option/index.ts b/src/material/legacy-core/option/index.ts
index 89cc09cea6a9..409045b0f886 100644
--- a/src/material/legacy-core/option/index.ts
+++ b/src/material/legacy-core/option/index.ts
@@ -31,47 +31,47 @@ export {
    * @deprecated Use `MAT_OPTGROUP` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_OPTGROUP,
+  MAT_OPTGROUP as MAT_LEGACY_OPTGROUP,
 
   /**
    * @deprecated Use `MatOptionSelectionChange` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MatOptionSelectionChange,
+  MatOptionSelectionChange as MatLegacyOptionSelectionChange,
 
   /**
    * @deprecated Use `MatOptionParentComponent` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MatOptionParentComponent,
+  MatOptionParentComponent as MatLegacyOptionParentComponent,
 
   /**
    * @deprecated Use `MAT_OPTION_PARENT_COMPONENT` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_OPTION_PARENT_COMPONENT,
+  MAT_OPTION_PARENT_COMPONENT as MAT_LEGACY_OPTION_PARENT_COMPONENT,
 
   /**
    * @deprecated Use `_countGroupLabelsBeforeOption` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  _countGroupLabelsBeforeOption,
+  _countGroupLabelsBeforeOption as _countGroupLabelsBeforeLegacyOption,
 
   /**
    * @deprecated Use `_getOptionScrollPosition` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  _getOptionScrollPosition,
+  _getOptionScrollPosition as _getLegacyOptionScrollPosition,
 
   /**
    * @deprecated Use `_MatOptionBase` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  _MatOptionBase,
+  _MatOptionBase as _MatLegacyOptionBase,
 
   /**
    * @deprecated Use `_MatOptgroupBase` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  _MatOptgroupBase,
+  _MatOptgroupBase as _MatLegacyOptgroupBase,
 } from '@angular/material/core';
diff --git a/src/material/legacy-core/option/option.spec.ts b/src/material/legacy-core/option/option.spec.ts
index 51b64ea20c7e..373971fd5801 100644
--- a/src/material/legacy-core/option/option.spec.ts
+++ b/src/material/legacy-core/option/option.spec.ts
@@ -8,7 +8,7 @@ import {
   dispatchEvent,
 } from '../../../cdk/testing/private';
 import {SPACE, ENTER} from '@angular/cdk/keycodes';
-import {MatLegacyOption, MatLegacyOptionModule, MAT_OPTION_PARENT_COMPONENT} from './index';
+import {MatLegacyOption, MatLegacyOptionModule, MAT_LEGACY_OPTION_PARENT_COMPONENT} from './index';
 
 describe('MatLegacyOption component', () => {
   beforeEach(waitForAsync(() => {
@@ -217,7 +217,7 @@ describe('MatLegacyOption component', () => {
         declarations: [InsideGroup],
         providers: [
           {
-            provide: MAT_OPTION_PARENT_COMPONENT,
+            provide: MAT_LEGACY_OPTION_PARENT_COMPONENT,
             useValue: {inertGroups: true},
           },
         ],
diff --git a/src/material/legacy-core/public-api.ts b/src/material/legacy-core/public-api.ts
index 1b9517e1bb0a..17407c344fe5 100644
--- a/src/material/legacy-core/public-api.ts
+++ b/src/material/legacy-core/public-api.ts
@@ -13,19 +13,19 @@ export {
    * @deprecated Use `VERSION` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  VERSION,
+  VERSION as LEGACY_VERSION,
 
   /**
    * @deprecated Use `AnimationCurves` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  AnimationCurves,
+  AnimationCurves as LegacyAnimationCurves,
 
   /**
    * @deprecated Use `AnimationDurations` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  AnimationDurations,
+  AnimationDurations as LegacyAnimationDurations,
 
   /**
    * @deprecated Use `MatCommonModule` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
@@ -37,115 +37,115 @@ export {
    * @deprecated Use `MATERIAL_SANITY_CHECKS` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MATERIAL_SANITY_CHECKS,
+  MATERIAL_SANITY_CHECKS as MATERIAL_LEGACY_SANITY_CHECKS,
 
   /**
    * @deprecated Use `SanityChecks` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  SanityChecks,
+  SanityChecks as LegacySanityChecks,
 
   /**
    * @deprecated Use `GranularSanityChecks` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  GranularSanityChecks,
+  GranularSanityChecks as LegacyGranularSanityChecks,
 
   /**
    * @deprecated Use `CanDisable` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  CanDisable,
+  CanDisable as LegacyCanDisable,
 
   /**
    * @deprecated Use `mixinDisabled` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  mixinDisabled,
+  mixinDisabled as legacyMixinDisabled,
 
   /**
    * @deprecated Use `CanColor` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  CanColor,
+  CanColor as LegacyCanColor,
 
   /**
    * @deprecated Use `mixinColor` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  mixinColor,
+  mixinColor as legacyMixinColor,
 
   /**
    * @deprecated Use `ThemePalette` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  ThemePalette,
+  ThemePalette as LegacyThemePalette,
 
   /**
    * @deprecated Use `CanDisableRipple` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  CanDisableRipple,
+  CanDisableRipple as LegacyCanDisableRipple,
 
   /**
    * @deprecated Use `mixinDisableRipple` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  mixinDisableRipple,
+  mixinDisableRipple as legacyMixinDisableRipple,
 
   /**
    * @deprecated Use `HasTabIndex` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  HasTabIndex,
+  HasTabIndex as LegacyHasTabIndex,
 
   /**
    * @deprecated Use `mixinTabIndex` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  mixinTabIndex,
+  mixinTabIndex as legacyMixinTabIndex,
 
   /**
    * @deprecated Use `CanUpdateErrorState` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  CanUpdateErrorState,
+  CanUpdateErrorState as LegacyCanUpdateErrorState,
 
   /**
    * @deprecated Use `mixinErrorState` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  mixinErrorState,
+  mixinErrorState as legacyMixinErrorState,
 
   /**
    * @deprecated Use `HasInitialized` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  HasInitialized,
+  HasInitialized as LegacyHasInitialized,
 
   /**
    * @deprecated Use `mixinInitialized` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  mixinInitialized,
+  mixinInitialized as legacyMixinInitialized,
 
   /**
    * @deprecated Use `MAT_DATE_LOCALE` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_DATE_LOCALE,
+  MAT_DATE_LOCALE as MAT_LEGACY_DATE_LOCALE,
 
   /**
    * @deprecated Use `MAT_DATE_LOCALE_FACTORY` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_DATE_LOCALE_FACTORY,
+  MAT_DATE_LOCALE_FACTORY as MAT_LEGACY_DATE_LOCALE_FACTORY,
 
   /**
    * @deprecated Use `DateAdapter` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  DateAdapter,
+  DateAdapter as LegacyDateAdapter,
 
   /**
    * @deprecated Use `MatDateFormats` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
@@ -157,25 +157,25 @@ export {
    * @deprecated Use `MAT_DATE_FORMATS` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_DATE_FORMATS,
+  MAT_DATE_FORMATS as MAT_LEGACY_DATE_FORMATS,
 
   /**
    * @deprecated Use `NativeDateAdapter` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  NativeDateAdapter,
+  NativeDateAdapter as LegacyNativeDateAdapter,
 
   /**
    * @deprecated Use `MAT_NATIVE_DATE_FORMATS` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_NATIVE_DATE_FORMATS,
+  MAT_NATIVE_DATE_FORMATS as MAT_LEGACY_NATIVE_DATE_FORMATS,
 
   /**
    * @deprecated Use `NativeDateModule` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  NativeDateModule,
+  NativeDateModule as LegacyNativeDateModule,
 
   /**
    * @deprecated Use `MatNativeDateModule` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
@@ -187,25 +187,25 @@ export {
    * @deprecated Use `ShowOnDirtyErrorStateMatcher` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  ShowOnDirtyErrorStateMatcher,
+  ShowOnDirtyErrorStateMatcher as LegacyShowOnDirtyErrorStateMatcher,
 
   /**
    * @deprecated Use `ErrorStateMatcher` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  ErrorStateMatcher,
+  ErrorStateMatcher as LegacyErrorStateMatcher,
 
   /**
    * @deprecated Use `MatLine` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MatLine,
+  MatLine as MatLegacyLine,
 
   /**
    * @deprecated Use `setLines` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  setLines,
+  setLines as legacySetLines,
 
   /**
    * @deprecated Use `MatLineModule` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
@@ -217,13 +217,13 @@ export {
    * @deprecated Use `RippleGlobalOptions` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleGlobalOptions,
+  RippleGlobalOptions as LegacyRippleGlobalOptions,
 
   /**
    * @deprecated Use `MAT_RIPPLE_GLOBAL_OPTIONS` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  MAT_RIPPLE_GLOBAL_OPTIONS,
+  MAT_RIPPLE_GLOBAL_OPTIONS as MAT_LEGACY_RIPPLE_GLOBAL_OPTIONS,
 
   /**
    * @deprecated Use `MatRipple` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
@@ -235,43 +235,43 @@ export {
    * @deprecated Use `RippleState` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleState,
+  RippleState as LegacyRippleState,
 
   /**
    * @deprecated Use `RippleConfig` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleConfig,
+  RippleConfig as LegacyRippleConfig,
 
   /**
    * @deprecated Use `RippleAnimationConfig` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleAnimationConfig,
+  RippleAnimationConfig as LegacyRippleAnimationConfig,
 
   /**
    * @deprecated Use `RippleRef` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleRef,
+  RippleRef as LegacyRippleRef,
 
   /**
    * @deprecated Use `RippleTarget` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleTarget,
+  RippleTarget as LegacyRippleTarget,
 
   /**
    * @deprecated Use `defaultRippleAnimationConfig` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  defaultRippleAnimationConfig,
+  defaultRippleAnimationConfig as legacyDefaultRippleAnimationConfig,
 
   /**
    * @deprecated Use `RippleRenderer` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
    * @breaking-change 17.0.0
    */
-  RippleRenderer,
+  RippleRenderer as LegacyRippleRenderer,
 
   /**
    * @deprecated Use `MatRippleModule` from `@angular/material/core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
diff --git a/src/material/legacy-core/testing/optgroup-harness-filters.ts b/src/material/legacy-core/testing/optgroup-harness-filters.ts
index 538a6254b84b..7dfd8ab1cf75 100644
--- a/src/material/legacy-core/testing/optgroup-harness-filters.ts
+++ b/src/material/legacy-core/testing/optgroup-harness-filters.ts
@@ -12,6 +12,6 @@ import {BaseHarnessFilters} from '@angular/cdk/testing';
  * @deprecated Use `OptgroupHarnessFilters` from `@angular/material/core/testing` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
  * @breaking-change 17.0.0
  */
-export interface OptgroupHarnessFilters extends BaseHarnessFilters {
+export interface LegacyOptgroupHarnessFilters extends BaseHarnessFilters {
   labelText?: string | RegExp;
 }
diff --git a/src/material/legacy-core/testing/optgroup-harness.ts b/src/material/legacy-core/testing/optgroup-harness.ts
index 92f1ed66a7da..da4e60a7a59c 100644
--- a/src/material/legacy-core/testing/optgroup-harness.ts
+++ b/src/material/legacy-core/testing/optgroup-harness.ts
@@ -7,9 +7,9 @@
  */
 
 import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
-import {OptgroupHarnessFilters} from './optgroup-harness-filters';
+import {LegacyOptgroupHarnessFilters} from './optgroup-harness-filters';
 import {MatLegacyOptionHarness} from './option-harness';
-import {OptionHarnessFilters} from './option-harness-filters';
+import {LegacyOptionHarnessFilters} from './option-harness-filters';
 
 /**
  * Harness for interacting with a `mat-optgroup` in tests.
@@ -27,7 +27,7 @@ export class MatLegacyOptgroupHarness extends ComponentHarness {
    * @param options Options for filtering which option instances are considered a match.
    * @return a `HarnessPredicate` configured with the given options.
    */
-  static with(options: OptgroupHarnessFilters = {}) {
+  static with(options: LegacyOptgroupHarnessFilters = {}) {
     return new HarnessPredicate(MatLegacyOptgroupHarness, options).addOption(
       'labelText',
       options.labelText,
@@ -49,7 +49,7 @@ export class MatLegacyOptgroupHarness extends ComponentHarness {
    * Gets the options that are inside the group.
    * @param filter Optionally filters which options are included.
    */
-  async getOptions(filter: OptionHarnessFilters = {}): Promise<MatLegacyOptionHarness[]> {
+  async getOptions(filter: LegacyOptionHarnessFilters = {}): Promise<MatLegacyOptionHarness[]> {
     return this.locatorForAll(MatLegacyOptionHarness.with(filter))();
   }
 }
diff --git a/src/material/legacy-core/testing/option-harness-filters.ts b/src/material/legacy-core/testing/option-harness-filters.ts
index 251d201f1686..10bb1905e21e 100644
--- a/src/material/legacy-core/testing/option-harness-filters.ts
+++ b/src/material/legacy-core/testing/option-harness-filters.ts
@@ -12,7 +12,7 @@ import {BaseHarnessFilters} from '@angular/cdk/testing';
  * @deprecated Use `OptionHarnessFilters` from `@angular/material/core/testing` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
  * @breaking-change 17.0.0
  */
-export interface OptionHarnessFilters extends BaseHarnessFilters {
+export interface LegacyOptionHarnessFilters extends BaseHarnessFilters {
   text?: string | RegExp;
   isSelected?: boolean;
 }
diff --git a/src/material/legacy-core/testing/option-harness.ts b/src/material/legacy-core/testing/option-harness.ts
index fbcb6ed80abc..4c6e3e706000 100644
--- a/src/material/legacy-core/testing/option-harness.ts
+++ b/src/material/legacy-core/testing/option-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
-import {OptionHarnessFilters} from './option-harness-filters';
+import {LegacyOptionHarnessFilters} from './option-harness-filters';
 
 /**
  * Harness for interacting with a `mat-option` in tests.
@@ -27,7 +27,7 @@ export class MatLegacyOptionHarness extends ComponentHarness {
    * @param options Options for filtering which option instances are considered a match.
    * @return a `HarnessPredicate` configured with the given options.
    */
-  static with(options: OptionHarnessFilters = {}) {
+  static with(options: LegacyOptionHarnessFilters = {}) {
     return new HarnessPredicate(MatLegacyOptionHarness, options)
       .addOption('text', options.text, async (harness, title) =>
         HarnessPredicate.stringMatches(await harness.getText(), title),
diff --git a/src/material/legacy-select/select.spec.ts b/src/material/legacy-select/select.spec.ts
index 5d6e7b2bb950..79235a112ab0 100644
--- a/src/material/legacy-select/select.spec.ts
+++ b/src/material/legacy-select/select.spec.ts
@@ -52,7 +52,7 @@ import {
   FormBuilder,
 } from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material/core';
-import {MatLegacyOption, MatOptionSelectionChange} from '@angular/material/legacy-core';
+import {MatLegacyOption, MatLegacyOptionSelectionChange} from '@angular/material/legacy-core';
 import {
   LegacyFloatLabelType,
   MatLegacyFormFieldModule,
@@ -1865,7 +1865,7 @@ describe('MatSelect', () => {
         fixture.detectChanges();
         flush();
 
-        expect(spy).toHaveBeenCalledWith(jasmine.any(MatOptionSelectionChange));
+        expect(spy).toHaveBeenCalledWith(jasmine.any(MatLegacyOptionSelectionChange));
 
         subscription.unsubscribe();
       }));
@@ -1894,7 +1894,7 @@ describe('MatSelect', () => {
         fixture.detectChanges();
         flush();
 
-        expect(spy).toHaveBeenCalledWith(jasmine.any(MatOptionSelectionChange));
+        expect(spy).toHaveBeenCalledWith(jasmine.any(MatLegacyOptionSelectionChange));
 
         subscription!.unsubscribe();
       }));
@@ -1929,9 +1929,9 @@ describe('MatSelect', () => {
       }));
 
       it('should not indicate programmatic value changes as user interactions', () => {
-        const events: MatOptionSelectionChange[] = [];
+        const events: MatLegacyOptionSelectionChange[] = [];
         const subscription = fixture.componentInstance.select.optionSelectionChanges.subscribe(
-          (event: MatOptionSelectionChange) => events.push(event),
+          (event: MatLegacyOptionSelectionChange) => events.push(event),
         );
 
         fixture.componentInstance.control.setValue('eggs-5');
diff --git a/src/material/legacy-select/select.ts b/src/material/legacy-select/select.ts
index 4904a4b9e218..cc91736b615b 100644
--- a/src/material/legacy-select/select.ts
+++ b/src/material/legacy-select/select.ts
@@ -18,11 +18,10 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {
-  _countGroupLabelsBeforeOption,
-  _getOptionScrollPosition,
-  MAT_OPTGROUP,
-  MAT_OPTION_PARENT_COMPONENT,
-  _MatOptionBase,
+  _countGroupLabelsBeforeLegacyOption,
+  _getLegacyOptionScrollPosition,
+  MAT_LEGACY_OPTGROUP,
+  MAT_LEGACY_OPTION_PARENT_COMPONENT,
   MatLegacyOption,
   MatLegacyOptgroup,
 } from '@angular/material/legacy-core';
@@ -157,7 +156,7 @@ export class MatLegacySelectTrigger {}
   ],
   providers: [
     {provide: MatLegacyFormFieldControl, useExisting: MatLegacySelect},
-    {provide: MAT_OPTION_PARENT_COMPONENT, useExisting: MatLegacySelect},
+    {provide: MAT_LEGACY_OPTION_PARENT_COMPONENT, useExisting: MatLegacySelect},
   ],
 })
 export class MatLegacySelect extends _MatSelectBase<MatLegacySelectChange> implements OnInit {
@@ -182,7 +181,8 @@ export class MatLegacySelect extends _MatSelectBase<MatLegacySelectChange> imple
 
   @ContentChildren(MatLegacyOption, {descendants: true}) options: QueryList<MatLegacyOption>;
 
-  @ContentChildren(MAT_OPTGROUP, {descendants: true}) optionGroups: QueryList<MatLegacyOptgroup>;
+  @ContentChildren(MAT_LEGACY_OPTGROUP, {descendants: true})
+  optionGroups: QueryList<MatLegacyOptgroup>;
 
   @ContentChild(MAT_SELECT_TRIGGER) customTrigger: MatLegacySelectTrigger;
 
@@ -260,7 +260,7 @@ export class MatLegacySelect extends _MatSelectBase<MatLegacySelectChange> imple
 
   /** Scrolls the active option into view. */
   protected _scrollOptionIntoView(index: number): void {
-    const labelCount = _countGroupLabelsBeforeOption(index, this.options, this.optionGroups);
+    const labelCount = _countGroupLabelsBeforeLegacyOption(index, this.options, this.optionGroups);
     const itemHeight = this._getItemHeight();
 
     if (index === 0 && labelCount === 1) {
@@ -269,7 +269,7 @@ export class MatLegacySelect extends _MatSelectBase<MatLegacySelectChange> imple
       // top of the option, because it allows the user to read the top group's label.
       this.panel.nativeElement.scrollTop = 0;
     } else {
-      this.panel.nativeElement.scrollTop = _getOptionScrollPosition(
+      this.panel.nativeElement.scrollTop = _getLegacyOptionScrollPosition(
         (index + labelCount) * itemHeight,
         itemHeight,
         this.panel.nativeElement.scrollTop,
@@ -493,7 +493,7 @@ export class MatLegacySelect extends _MatSelectBase<MatLegacySelectChange> imple
       );
     }
 
-    selectedOptionOffset += _countGroupLabelsBeforeOption(
+    selectedOptionOffset += _countGroupLabelsBeforeLegacyOption(
       selectedOptionOffset,
       this.options,
       this.optionGroups,
diff --git a/src/material/legacy-select/testing/select-harness.ts b/src/material/legacy-select/testing/select-harness.ts
index af4f36d7e726..f296a65c8ae3 100644
--- a/src/material/legacy-select/testing/select-harness.ts
+++ b/src/material/legacy-select/testing/select-harness.ts
@@ -11,8 +11,8 @@ import {_MatSelectHarnessBase} from '@angular/material/select/testing';
 import {
   MatLegacyOptionHarness,
   MatLegacyOptgroupHarness,
-  OptionHarnessFilters,
-  OptgroupHarnessFilters,
+  LegacyOptionHarnessFilters,
+  LegacyOptgroupHarnessFilters,
 } from '@angular/material/legacy-core/testing';
 import {LegacySelectHarnessFilters} from './select-harness-filters';
 
@@ -24,10 +24,10 @@ import {LegacySelectHarnessFilters} from './select-harness-filters';
 export class MatLegacySelectHarness extends _MatSelectHarnessBase<
   typeof MatLegacyOptionHarness,
   MatLegacyOptionHarness,
-  OptionHarnessFilters,
+  LegacyOptionHarnessFilters,
   typeof MatLegacyOptgroupHarness,
   MatLegacyOptgroupHarness,
-  OptgroupHarnessFilters
+  LegacyOptgroupHarnessFilters
 > {
   static hostSelector = '.mat-select';
   protected _prefix = 'mat';
diff --git a/tools/public_api_guard/material/legacy-autocomplete-testing.md b/tools/public_api_guard/material/legacy-autocomplete-testing.md
index 9107bb1cc982..d3ea0049729e 100644
--- a/tools/public_api_guard/material/legacy-autocomplete-testing.md
+++ b/tools/public_api_guard/material/legacy-autocomplete-testing.md
@@ -6,11 +6,11 @@
 
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
+import { LegacyOptgroupHarnessFilters } from '@angular/material/legacy-core/testing';
+import { LegacyOptionHarnessFilters } from '@angular/material/legacy-core/testing';
 import { _MatAutocompleteHarnessBase } from '@angular/material/autocomplete/testing';
 import { MatLegacyOptgroupHarness } from '@angular/material/legacy-core/testing';
 import { MatLegacyOptionHarness } from '@angular/material/legacy-core/testing';
-import { OptgroupHarnessFilters } from '@angular/material/legacy-core/testing';
-import { OptionHarnessFilters } from '@angular/material/legacy-core/testing';
 
 // @public @deprecated
 export interface LegacyAutocompleteHarnessFilters extends BaseHarnessFilters {
@@ -18,7 +18,7 @@ export interface LegacyAutocompleteHarnessFilters extends BaseHarnessFilters {
 }
 
 // @public @deprecated
-export class MatLegacyAutocompleteHarness extends _MatAutocompleteHarnessBase<typeof MatLegacyOptionHarness, MatLegacyOptionHarness, OptionHarnessFilters, typeof MatLegacyOptgroupHarness, MatLegacyOptgroupHarness, OptgroupHarnessFilters> {
+export class MatLegacyAutocompleteHarness extends _MatAutocompleteHarnessBase<typeof MatLegacyOptionHarness, MatLegacyOptionHarness, LegacyOptionHarnessFilters, typeof MatLegacyOptgroupHarness, MatLegacyOptgroupHarness, LegacyOptgroupHarnessFilters> {
     static hostSelector: string;
     // (undocumented)
     protected _optionClass: typeof MatLegacyOptionHarness;
diff --git a/tools/public_api_guard/material/legacy-core-testing.md b/tools/public_api_guard/material/legacy-core-testing.md
index 85907b3765d7..a91d59b44f9d 100644
--- a/tools/public_api_guard/material/legacy-core-testing.md
+++ b/tools/public_api_guard/material/legacy-core-testing.md
@@ -8,13 +8,27 @@ import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
 
+// @public @deprecated (undocumented)
+export interface LegacyOptgroupHarnessFilters extends BaseHarnessFilters {
+    // (undocumented)
+    labelText?: string | RegExp;
+}
+
+// @public @deprecated (undocumented)
+export interface LegacyOptionHarnessFilters extends BaseHarnessFilters {
+    // (undocumented)
+    isSelected?: boolean;
+    // (undocumented)
+    text?: string | RegExp;
+}
+
 // @public @deprecated
 export class MatLegacyOptgroupHarness extends ComponentHarness {
     getLabelText(): Promise<string>;
-    getOptions(filter?: OptionHarnessFilters): Promise<MatLegacyOptionHarness[]>;
+    getOptions(filter?: LegacyOptionHarnessFilters): Promise<MatLegacyOptionHarness[]>;
     static hostSelector: string;
     isDisabled(): Promise<boolean>;
-    static with(options?: OptgroupHarnessFilters): HarnessPredicate<MatLegacyOptgroupHarness>;
+    static with(options?: LegacyOptgroupHarnessFilters): HarnessPredicate<MatLegacyOptgroupHarness>;
 }
 
 // @public @deprecated
@@ -26,21 +40,7 @@ export class MatLegacyOptionHarness extends ComponentHarness {
     isDisabled(): Promise<boolean>;
     isMultiple(): Promise<boolean>;
     isSelected(): Promise<boolean>;
-    static with(options?: OptionHarnessFilters): HarnessPredicate<MatLegacyOptionHarness>;
-}
-
-// @public @deprecated (undocumented)
-export interface OptgroupHarnessFilters extends BaseHarnessFilters {
-    // (undocumented)
-    labelText?: string | RegExp;
-}
-
-// @public @deprecated (undocumented)
-export interface OptionHarnessFilters extends BaseHarnessFilters {
-    // (undocumented)
-    isSelected?: boolean;
-    // (undocumented)
-    text?: string | RegExp;
+    static with(options?: LegacyOptionHarnessFilters): HarnessPredicate<MatLegacyOptionHarness>;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/tools/public_api_guard/material/legacy-core.md b/tools/public_api_guard/material/legacy-core.md
index a757a65dba38..1771741deb44 100644
--- a/tools/public_api_guard/material/legacy-core.md
+++ b/tools/public_api_guard/material/legacy-core.md
@@ -4,137 +4,183 @@
 
 ```ts
 
-import { AnimationCurves } from '@angular/material/core';
-import { AnimationDurations } from '@angular/material/core';
-import { CanColor } from '@angular/material/core';
-import { CanDisable } from '@angular/material/core';
-import { CanDisableRipple } from '@angular/material/core';
-import { CanUpdateErrorState } from '@angular/material/core';
 import { ChangeDetectorRef } from '@angular/core';
-import { _countGroupLabelsBeforeOption } from '@angular/material/core';
-import { DateAdapter } from '@angular/material/core';
-import { defaultRippleAnimationConfig } from '@angular/material/core';
+import { _countGroupLabelsBeforeOption as _countGroupLabelsBeforeLegacyOption } from '@angular/material/core';
 import { ElementRef } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
-import { _getOptionScrollPosition } from '@angular/material/core';
-import { GranularSanityChecks } from '@angular/material/core';
-import { HasInitialized } from '@angular/material/core';
-import { HasTabIndex } from '@angular/material/core';
+import { _getOptionScrollPosition as _getLegacyOptionScrollPosition } from '@angular/material/core';
 import * as i0 from '@angular/core';
 import * as i3 from '@angular/material/core';
 import * as i4 from '@angular/common';
-import { MAT_DATE_FORMATS } from '@angular/material/core';
-import { MAT_DATE_LOCALE } from '@angular/material/core';
-import { MAT_DATE_LOCALE_FACTORY } from '@angular/material/core';
-import { MAT_NATIVE_DATE_FORMATS } from '@angular/material/core';
-import { MAT_OPTGROUP } from '@angular/material/core';
-import { MAT_OPTION_PARENT_COMPONENT } from '@angular/material/core';
-import { MAT_RIPPLE_GLOBAL_OPTIONS } from '@angular/material/core';
-import { MATERIAL_SANITY_CHECKS } from '@angular/material/core';
+import { VERSION as LEGACY_VERSION } from '@angular/material/core';
+import { AnimationCurves as LegacyAnimationCurves } from '@angular/material/core';
+import { AnimationDurations as LegacyAnimationDurations } from '@angular/material/core';
+import { CanColor as LegacyCanColor } from '@angular/material/core';
+import { CanDisable as LegacyCanDisable } from '@angular/material/core';
+import { CanDisableRipple as LegacyCanDisableRipple } from '@angular/material/core';
+import { CanUpdateErrorState as LegacyCanUpdateErrorState } from '@angular/material/core';
+import { DateAdapter as LegacyDateAdapter } from '@angular/material/core';
+import { defaultRippleAnimationConfig as legacyDefaultRippleAnimationConfig } from '@angular/material/core';
+import { ErrorStateMatcher as LegacyErrorStateMatcher } from '@angular/material/core';
+import { GranularSanityChecks as LegacyGranularSanityChecks } from '@angular/material/core';
+import { HasInitialized as LegacyHasInitialized } from '@angular/material/core';
+import { HasTabIndex as LegacyHasTabIndex } from '@angular/material/core';
+import { mixinColor as legacyMixinColor } from '@angular/material/core';
+import { mixinDisabled as legacyMixinDisabled } from '@angular/material/core';
+import { mixinDisableRipple as legacyMixinDisableRipple } from '@angular/material/core';
+import { mixinErrorState as legacyMixinErrorState } from '@angular/material/core';
+import { mixinInitialized as legacyMixinInitialized } from '@angular/material/core';
+import { mixinTabIndex as legacyMixinTabIndex } from '@angular/material/core';
+import { NativeDateAdapter as LegacyNativeDateAdapter } from '@angular/material/core';
+import { NativeDateModule as LegacyNativeDateModule } from '@angular/material/core';
+import { RippleAnimationConfig as LegacyRippleAnimationConfig } from '@angular/material/core';
+import { RippleConfig as LegacyRippleConfig } from '@angular/material/core';
+import { RippleGlobalOptions as LegacyRippleGlobalOptions } from '@angular/material/core';
+import { RippleRef as LegacyRippleRef } from '@angular/material/core';
+import { RippleRenderer as LegacyRippleRenderer } from '@angular/material/core';
+import { RippleState as LegacyRippleState } from '@angular/material/core';
+import { RippleTarget as LegacyRippleTarget } from '@angular/material/core';
+import { SanityChecks as LegacySanityChecks } from '@angular/material/core';
+import { setLines as legacySetLines } from '@angular/material/core';
+import { ShowOnDirtyErrorStateMatcher as LegacyShowOnDirtyErrorStateMatcher } from '@angular/material/core';
+import { ThemePalette as LegacyThemePalette } from '@angular/material/core';
+import { MAT_DATE_FORMATS as MAT_LEGACY_DATE_FORMATS } from '@angular/material/core';
+import { MAT_DATE_LOCALE as MAT_LEGACY_DATE_LOCALE } from '@angular/material/core';
+import { MAT_DATE_LOCALE_FACTORY as MAT_LEGACY_DATE_LOCALE_FACTORY } from '@angular/material/core';
+import { MAT_NATIVE_DATE_FORMATS as MAT_LEGACY_NATIVE_DATE_FORMATS } from '@angular/material/core';
+import { MAT_OPTGROUP as MAT_LEGACY_OPTGROUP } from '@angular/material/core';
+import { MAT_OPTION_PARENT_COMPONENT as MAT_LEGACY_OPTION_PARENT_COMPONENT } from '@angular/material/core';
+import { MAT_RIPPLE_GLOBAL_OPTIONS as MAT_LEGACY_RIPPLE_GLOBAL_OPTIONS } from '@angular/material/core';
+import { MATERIAL_SANITY_CHECKS as MATERIAL_LEGACY_SANITY_CHECKS } from '@angular/material/core';
 import { MatCommonModule as MatLegacyCommonModule } from '@angular/material/core';
 import { MatDateFormats as MatLegacyDateFormats } from '@angular/material/core';
+import { MatLine as MatLegacyLine } from '@angular/material/core';
 import { MatLineModule as MatLegacyLineModule } from '@angular/material/core';
 import { MatNativeDateModule as MatLegacyNativeDateModule } from '@angular/material/core';
+import { _MatOptgroupBase as _MatLegacyOptgroupBase } from '@angular/material/core';
+import { _MatOptionBase as _MatLegacyOptionBase } from '@angular/material/core';
+import { MatOptionParentComponent as MatLegacyOptionParentComponent } from '@angular/material/core';
+import { MatOptionSelectionChange as MatLegacyOptionSelectionChange } from '@angular/material/core';
 import { MatPseudoCheckbox as MatLegacyPseudoCheckbox } from '@angular/material/core';
 import { MatPseudoCheckboxModule as MatLegacyPseudoCheckboxModule } from '@angular/material/core';
 import { MatPseudoCheckboxState as MatLegacyPseudoCheckboxState } from '@angular/material/core';
 import { MatRipple as MatLegacyRipple } from '@angular/material/core';
 import { MatRippleModule as MatLegacyRippleModule } from '@angular/material/core';
-import { MatLine } from '@angular/material/core';
-import { _MatOptgroupBase } from '@angular/material/core';
-import { _MatOptionBase } from '@angular/material/core';
-import { MatOptionParentComponent } from '@angular/material/core';
-import { MatOptionSelectionChange } from '@angular/material/core';
-import { mixinColor } from '@angular/material/core';
-import { mixinDisabled } from '@angular/material/core';
-import { mixinDisableRipple } from '@angular/material/core';
-import { mixinErrorState } from '@angular/material/core';
-import { mixinInitialized } from '@angular/material/core';
-import { mixinTabIndex } from '@angular/material/core';
-import { NativeDateAdapter } from '@angular/material/core';
-import { NativeDateModule } from '@angular/material/core';
-import { RippleAnimationConfig } from '@angular/material/core';
-import { RippleConfig } from '@angular/material/core';
-import { RippleGlobalOptions } from '@angular/material/core';
-import { RippleRef } from '@angular/material/core';
-import { RippleRenderer } from '@angular/material/core';
-import { RippleState } from '@angular/material/core';
-import { RippleTarget } from '@angular/material/core';
-import { SanityChecks } from '@angular/material/core';
-import { setLines } from '@angular/material/core';
-import { ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
-import { ThemePalette } from '@angular/material/core';
-import { VERSION } from '@angular/material/core';
 
-export { AnimationCurves }
+export { _countGroupLabelsBeforeLegacyOption }
 
-export { AnimationDurations }
+export { _getLegacyOptionScrollPosition }
 
-export { CanColor }
+export { LEGACY_VERSION }
 
-export { CanDisable }
+export { LegacyAnimationCurves }
 
-export { CanDisableRipple }
+export { LegacyAnimationDurations }
 
-export { CanUpdateErrorState }
+export { LegacyCanColor }
 
-export { _countGroupLabelsBeforeOption }
+export { LegacyCanDisable }
 
-export { DateAdapter }
+export { LegacyCanDisableRipple }
 
-export { defaultRippleAnimationConfig }
+export { LegacyCanUpdateErrorState }
 
-export { ErrorStateMatcher }
+export { LegacyDateAdapter }
 
-export { _getOptionScrollPosition }
+export { legacyDefaultRippleAnimationConfig }
 
-export { GranularSanityChecks }
+export { LegacyErrorStateMatcher }
 
-export { HasInitialized }
+export { LegacyGranularSanityChecks }
 
-export { HasTabIndex }
+export { LegacyHasInitialized }
 
-export { MAT_DATE_FORMATS }
+export { LegacyHasTabIndex }
 
-export { MAT_DATE_LOCALE }
+export { legacyMixinColor }
 
-export { MAT_DATE_LOCALE_FACTORY }
+export { legacyMixinDisabled }
 
-export { MAT_NATIVE_DATE_FORMATS }
+export { legacyMixinDisableRipple }
 
-export { MAT_OPTGROUP }
+export { legacyMixinErrorState }
 
-export { MAT_OPTION_PARENT_COMPONENT }
+export { legacyMixinInitialized }
 
-export { MAT_RIPPLE_GLOBAL_OPTIONS }
+export { legacyMixinTabIndex }
 
-export { MATERIAL_SANITY_CHECKS }
+export { LegacyNativeDateAdapter }
+
+export { LegacyNativeDateModule }
+
+export { LegacyRippleAnimationConfig }
+
+export { LegacyRippleConfig }
+
+export { LegacyRippleGlobalOptions }
+
+export { LegacyRippleRef }
+
+export { LegacyRippleRenderer }
+
+export { LegacyRippleState }
+
+export { LegacyRippleTarget }
+
+export { LegacySanityChecks }
+
+export { legacySetLines }
+
+export { LegacyShowOnDirtyErrorStateMatcher }
+
+export { LegacyThemePalette }
+
+export { MAT_LEGACY_DATE_FORMATS }
+
+export { MAT_LEGACY_DATE_LOCALE }
+
+export { MAT_LEGACY_DATE_LOCALE_FACTORY }
+
+export { MAT_LEGACY_NATIVE_DATE_FORMATS }
+
+export { MAT_LEGACY_OPTGROUP }
+
+export { MAT_LEGACY_OPTION_PARENT_COMPONENT }
+
+export { MAT_LEGACY_RIPPLE_GLOBAL_OPTIONS }
+
+export { MATERIAL_LEGACY_SANITY_CHECKS }
 
 export { MatLegacyCommonModule }
 
 export { MatLegacyDateFormats }
 
+export { MatLegacyLine }
+
 export { MatLegacyLineModule }
 
 export { MatLegacyNativeDateModule }
 
 // @public @deprecated
-export class MatLegacyOptgroup extends _MatOptgroupBase {
+export class MatLegacyOptgroup extends _MatLegacyOptgroupBase {
     // (undocumented)
     static ɵcmp: i0.ɵɵComponentDeclaration<MatLegacyOptgroup, "mat-optgroup", ["matOptgroup"], { "disabled": "disabled"; }, {}, never, ["*", "mat-option, ng-container"], false, never>;
     // (undocumented)
     static ɵfac: i0.ɵɵFactoryDeclaration<MatLegacyOptgroup, never>;
 }
 
+export { _MatLegacyOptgroupBase }
+
 // @public @deprecated
-export class MatLegacyOption<T = any> extends _MatOptionBase<T> {
-    constructor(element: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef, parent: MatOptionParentComponent, group: MatLegacyOptgroup);
+export class MatLegacyOption<T = any> extends _MatLegacyOptionBase<T> {
+    constructor(element: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef, parent: MatLegacyOptionParentComponent, group: MatLegacyOptgroup);
     // (undocumented)
     static ɵcmp: i0.ɵɵComponentDeclaration<MatLegacyOption<any>, "mat-option", ["matOption"], {}, {}, never, ["*"], false, never>;
     // (undocumented)
     static ɵfac: i0.ɵɵFactoryDeclaration<MatLegacyOption<any>, [null, null, { optional: true; }, { optional: true; }]>;
 }
 
+export { _MatLegacyOptionBase }
+
 // @public @deprecated (undocumented)
 export class MatLegacyOptionModule {
     // (undocumented)
@@ -145,6 +191,10 @@ export class MatLegacyOptionModule {
     static ɵmod: i0.ɵɵNgModuleDeclaration<MatLegacyOptionModule, [typeof i1.MatLegacyOption, typeof i2.MatLegacyOptgroup], [typeof i3.MatRippleModule, typeof i4.CommonModule, typeof i3.MatCommonModule, typeof i3.MatPseudoCheckboxModule], [typeof i1.MatLegacyOption, typeof i2.MatLegacyOptgroup]>;
 }
 
+export { MatLegacyOptionParentComponent }
+
+export { MatLegacyOptionSelectionChange }
+
 export { MatLegacyPseudoCheckbox }
 
 export { MatLegacyPseudoCheckboxModule }
@@ -155,56 +205,6 @@ export { MatLegacyRipple }
 
 export { MatLegacyRippleModule }
 
-export { MatLine }
-
-export { _MatOptgroupBase }
-
-export { _MatOptionBase }
-
-export { MatOptionParentComponent }
-
-export { MatOptionSelectionChange }
-
-export { mixinColor }
-
-export { mixinDisabled }
-
-export { mixinDisableRipple }
-
-export { mixinErrorState }
-
-export { mixinInitialized }
-
-export { mixinTabIndex }
-
-export { NativeDateAdapter }
-
-export { NativeDateModule }
-
-export { RippleAnimationConfig }
-
-export { RippleConfig }
-
-export { RippleGlobalOptions }
-
-export { RippleRef }
-
-export { RippleRenderer }
-
-export { RippleState }
-
-export { RippleTarget }
-
-export { SanityChecks }
-
-export { setLines }
-
-export { ShowOnDirtyErrorStateMatcher }
-
-export { ThemePalette }
-
-export { VERSION }
-
 // (No @packageDocumentation comment for this package)
 
 ```
diff --git a/tools/public_api_guard/material/legacy-select-testing.md b/tools/public_api_guard/material/legacy-select-testing.md
index d6cf3a62b547..669c04ae6a0d 100644
--- a/tools/public_api_guard/material/legacy-select-testing.md
+++ b/tools/public_api_guard/material/legacy-select-testing.md
@@ -6,18 +6,18 @@
 
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
+import { LegacyOptgroupHarnessFilters } from '@angular/material/legacy-core/testing';
+import { LegacyOptionHarnessFilters } from '@angular/material/legacy-core/testing';
 import { MatLegacyOptgroupHarness } from '@angular/material/legacy-core/testing';
 import { MatLegacyOptionHarness } from '@angular/material/legacy-core/testing';
 import { _MatSelectHarnessBase } from '@angular/material/select/testing';
-import { OptgroupHarnessFilters } from '@angular/material/legacy-core/testing';
-import { OptionHarnessFilters } from '@angular/material/legacy-core/testing';
 
 // @public @deprecated
 export interface LegacySelectHarnessFilters extends BaseHarnessFilters {
 }
 
 // @public @deprecated
-export class MatLegacySelectHarness extends _MatSelectHarnessBase<typeof MatLegacyOptionHarness, MatLegacyOptionHarness, OptionHarnessFilters, typeof MatLegacyOptgroupHarness, MatLegacyOptgroupHarness, OptgroupHarnessFilters> {
+export class MatLegacySelectHarness extends _MatSelectHarnessBase<typeof MatLegacyOptionHarness, MatLegacyOptionHarness, LegacyOptionHarnessFilters, typeof MatLegacyOptgroupHarness, MatLegacyOptgroupHarness, LegacyOptgroupHarnessFilters> {
     // (undocumented)
     static hostSelector: string;
     // (undocumented)