From c3641146ab4276bccda306e93e1f6f0c29d92e76 Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Tue, 25 Feb 2020 14:24:03 -0800
Subject: [PATCH] fix(material-experimental/mdc-*): rename sass mixins to
 mat-mdc-*

---
 src/dev-app/theme.scss                        | 10 +++---
 src/e2e-app/theme.scss                        |  4 +--
 src/material-experimental/README.md           |  4 +--
 .../mdc-autocomplete/_autocomplete-theme.scss |  4 +--
 .../mdc-button/_button-theme.scss             | 12 +++----
 .../mdc-card/_card-theme.scss                 |  4 +--
 .../mdc-checkbox/README.md                    |  4 +--
 .../mdc-checkbox/_checkbox-theme.scss         |  4 +--
 .../mdc-chips/_chips-theme.scss               |  4 +--
 .../mdc-form-field/README.md                  |  2 +-
 .../mdc-form-field/_form-field-theme.scss     |  4 +--
 src/material-experimental/mdc-input/README.md |  2 +-
 .../mdc-input/_input-theme.scss               |  4 +--
 .../mdc-list/_list-theme.scss                 |  4 +--
 src/material-experimental/mdc-menu/README.md  |  4 +--
 .../mdc-menu/_menu-theme.scss                 |  4 +--
 .../mdc-progress-bar/README.md                |  4 +--
 .../mdc-progress-bar/_progress-bar-theme.scss |  4 +--
 .../mdc-radio/_radio-theme.scss               |  4 +--
 .../mdc-select/_select-theme.scss             |  4 +--
 .../mdc-sidenav/_sidenav-theme.scss           |  4 +--
 .../mdc-slide-toggle/README.md                |  4 +--
 .../mdc-slide-toggle/_slide-toggle-theme.scss |  4 +--
 .../mdc-slider/_slider-theme.scss             |  4 +--
 .../mdc-snackbar/_snackbar-theme.scss         |  4 +--
 .../mdc-table/_table-theme.scss               |  4 +--
 src/material-experimental/mdc-tabs/README.md  |  4 +--
 .../mdc-tabs/_tabs-theme.scss                 |  4 +--
 .../mdc-theming/_all-theme.scss               | 34 +++++++++----------
 .../mdc-theming/prebuilt/indigo-pink.scss     |  4 +--
 .../mdc-typography/_all-typography.scss       | 34 +++++++++----------
 src/universal-app/theme.scss                  |  6 ++--
 32 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/dev-app/theme.scss b/src/dev-app/theme.scss
index debf1b259cce..ec5e1af585d4 100644
--- a/src/dev-app/theme.scss
+++ b/src/dev-app/theme.scss
@@ -13,7 +13,7 @@
 // have to load a single css file for Angular Material in your app.
 // **Be sure that you only ever include this mixin once!**
 @include mat-core();
-@include angular-material-typography-mdc();
+@include angular-material-mdc-typography();
 @include mat-edit-typography(mat-typography-config());
 
 // Include base styles for strong focus indicators.
@@ -29,9 +29,9 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
 
 // Include the default theme styles.
 @include angular-material-theme($candy-app-theme);
-@include angular-material-theme-mdc($candy-app-theme);
+@include angular-material-mdc-theme($candy-app-theme);
 @include mat-column-resize-theme($candy-app-theme);
-@include mat-slider-theme-mdc($candy-app-theme);
+@include mat-mdc-slider-theme($candy-app-theme);
 @include mat-popover-edit-theme($candy-app-theme);
 
 // Define an alternate dark theme.
@@ -52,9 +52,9 @@ $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
 // default theme.
 .demo-unicorn-dark-theme {
   @include angular-material-theme($dark-theme);
-  @include angular-material-theme-mdc($dark-theme);
+  @include angular-material-mdc-theme($dark-theme);
   @include mat-column-resize-theme($dark-theme);
-  @include mat-slider-theme-mdc($dark-theme);
+  @include mat-mdc-slider-theme($dark-theme);
   @include mat-popover-edit-theme($dark-theme);
 }
 
diff --git a/src/e2e-app/theme.scss b/src/e2e-app/theme.scss
index 7aebe18190f7..b4ef263e63e0 100644
--- a/src/e2e-app/theme.scss
+++ b/src/e2e-app/theme.scss
@@ -8,7 +8,7 @@
 // have to load a single css file for Angular Material in your app.
 // **Be sure that you only ever include this mixin once!**
 @include mat-core();
-@include angular-material-typography-mdc();
+@include angular-material-mdc-typography();
 
 // Define the default theme (same as the example above).
 $candy-app-primary: mat-palette($mat-indigo);
@@ -17,4 +17,4 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
 
 // Include the default theme styles.
 @include angular-material-theme($candy-app-theme);
-@include angular-material-theme-mdc($candy-app-theme);
+@include angular-material-mdc-theme($candy-app-theme);
diff --git a/src/material-experimental/README.md b/src/material-experimental/README.md
index b7a5715a0ccc..38d0df8b1c46 100644
--- a/src/material-experimental/README.md
+++ b/src/material-experimental/README.md
@@ -59,6 +59,6 @@ the experimental components. For example, using the checkbox:
   $my-accent:  mat-palette($mat-pink, A200, A100, A400);
   $my-theme:   mat-light-theme($my-primary, $my-accent);
   
-  @include mat-checkbox-theme-mdc($my-theme);
-  @include mat-checkbox-typography-mdc();
+  @include mat-mdc-checkbox-theme($my-theme);
+  @include mat-mdc-checkbox-typography();
 ```
diff --git a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss
index 67218ecb6a68..1270e5637f8e 100644
--- a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss
+++ b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss
@@ -1,12 +1,12 @@
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-autocomplete-theme-mdc($theme) {
+@mixin mat-mdc-autocomplete-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     // TODO: implement MDC-based autocomplete.
   }
 }
 
-@mixin mat-autocomplete-typography-mdc($config) {
+@mixin mat-mdc-autocomplete-typography($config) {
   @include mat-using-mdc-typography($config) {
     // TODO: implement MDC-based autocomplete.
   }
diff --git a/src/material-experimental/mdc-button/_button-theme.scss b/src/material-experimental/mdc-button/_button-theme.scss
index 59381946babf..0f8aa932a244 100644
--- a/src/material-experimental/mdc-button/_button-theme.scss
+++ b/src/material-experimental/mdc-button/_button-theme.scss
@@ -49,7 +49,7 @@ $mat-button-state-target: '.mdc-button__ripple';
 }
 
 
-@mixin mat-button-theme-mdc($theme) {
+@mixin mat-mdc-button-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     // Add state interactions for hover, focus, press, active. Colors are changed based on
     // the mixin mdc-states-base-color
@@ -164,13 +164,13 @@ $mat-button-state-target: '.mdc-button__ripple';
   }
 }
 
-@mixin mat-button-typography-mdc($config) {
+@mixin mat-mdc-button-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-button-without-ripple($query: $mat-typography-styles-query);
   }
 }
 
-@mixin mat-fab-theme-mdc($theme) {
+@mixin mat-mdc-fab-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     .mat-mdc-fab, .mat-mdc-mini-fab {
       @include mdc-states(
@@ -219,13 +219,13 @@ $mat-button-state-target: '.mdc-button__ripple';
   }
 }
 
-@mixin mat-fab-typography-mdc($config) {
+@mixin mat-mdc-fab-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-fab-without-ripple($query: $mat-typography-styles-query);
   }
 }
 
-@mixin mat-icon-button-theme-mdc($theme) {
+@mixin mat-mdc-icon-button-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     .mat-mdc-icon-button {
       @include mdc-states(
@@ -268,7 +268,7 @@ $mat-button-state-target: '.mdc-button__ripple';
   }
 }
 
-@mixin mat-icon-button-typography-mdc($config) {
+@mixin mat-mdc-icon-button-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-icon-button-without-ripple($query: $mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-card/_card-theme.scss b/src/material-experimental/mdc-card/_card-theme.scss
index 42cbe9e8e804..4b06295702cf 100644
--- a/src/material-experimental/mdc-card/_card-theme.scss
+++ b/src/material-experimental/mdc-card/_card-theme.scss
@@ -2,7 +2,7 @@
 @import '@material/typography/mixins.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-card-theme-mdc($theme) {
+@mixin mat-mdc-card-theme($theme) {
   $foreground: map-get($theme, foreground);
   $is-dark-theme: map-get($theme, is-dark);
 
@@ -17,7 +17,7 @@
   }
 }
 
-@mixin mat-card-typography-mdc($config) {
+@mixin mat-mdc-card-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-card-without-ripple($query: $mat-typography-styles-query);
 
diff --git a/src/material-experimental/mdc-checkbox/README.md b/src/material-experimental/mdc-checkbox/README.md
index 6cfd5e7a888d..cbd9aa684055 100644
--- a/src/material-experimental/mdc-checkbox/README.md
+++ b/src/material-experimental/mdc-checkbox/README.md
@@ -60,8 +60,8 @@ component by following these steps:
    $my-accent:  mat-palette($mat-pink, A200, A100, A400);
    $my-theme:   mat-light-theme($my-primary, $my-accent);
 
-   @include mat-checkbox-theme-mdc($my-theme);
-  @include mat-checkbox-typography-mdc();
+   @include mat-mdc-checkbox-theme($my-theme);
+  @include mat-mdc-checkbox-typography();
    ```
 
 ## API differences
diff --git a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss
index 2ff60b83c60f..202f6c5503cc 100644
--- a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss
+++ b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss
@@ -5,7 +5,7 @@
 @import '@material/theme/functions.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-checkbox-theme-mdc($theme) {
+@mixin mat-mdc-checkbox-theme($theme) {
   $primary: mat-color(map-get($theme, primary));
   $accent: mat-color(map-get($theme, accent));
   $warn: mat-color(map-get($theme, warn));
@@ -70,7 +70,7 @@
   $mdc-checkbox-disabled-color: $orig-mdc-checkbox-disabled-color !global;
 }
 
-@mixin mat-checkbox-typography-mdc($config) {
+@mixin mat-mdc-checkbox-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-checkbox-without-ripple($query: $mat-typography-styles-query);
     @include mdc-form-field-core-styles($query: $mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-chips/_chips-theme.scss b/src/material-experimental/mdc-chips/_chips-theme.scss
index bcaee6664d9e..d4c56fbc73ab 100644
--- a/src/material-experimental/mdc-chips/_chips-theme.scss
+++ b/src/material-experimental/mdc-chips/_chips-theme.scss
@@ -2,7 +2,7 @@
 @import '../mdc-helpers/mdc-helpers';
 @import '@material/theme/functions.import';
 
-@mixin mat-chips-theme-mdc($theme) {
+@mixin mat-mdc-chips-theme($theme) {
   @include mdc-chip-set-core-styles($query: $mat-theme-styles-query);
   @include mdc-chip-without-ripple($query: $mat-theme-styles-query);
 
@@ -36,7 +36,7 @@
   }
 }
 
-@mixin mat-chips-typography-mdc($config) {
+@mixin mat-mdc-chips-typography($config) {
   @include mdc-chip-set-core-styles($query: $mat-typography-styles-query);
   @include mat-using-mdc-typography($config) {
     @include mdc-chip-without-ripple($query: $mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-form-field/README.md b/src/material-experimental/mdc-form-field/README.md
index 47d026263684..a62cb97a6472 100644
--- a/src/material-experimental/mdc-form-field/README.md
+++ b/src/material-experimental/mdc-form-field/README.md
@@ -45,7 +45,7 @@ component by following these steps:
    form-field.
    
 5. Ensure color and typography styles for `@angular/material-experimental` are set up. Either
-   use a custom theme and use the `mat-form-field-theme-mdc` mixin, or use a prebuilt theme
+   use a custom theme and use the `mat-mdc-form-field-theme` mixin, or use a prebuilt theme
    from `@angular/material-experimental/mdc-theming/prebuilt`.
 
 ## API differences
diff --git a/src/material-experimental/mdc-form-field/_form-field-theme.scss b/src/material-experimental/mdc-form-field/_form-field-theme.scss
index b972860f3829..72f97214b801 100644
--- a/src/material-experimental/mdc-form-field/_form-field-theme.scss
+++ b/src/material-experimental/mdc-form-field/_form-field-theme.scss
@@ -31,7 +31,7 @@
   $mdc-text-field-focused-label-color: $_mdc-text-field-focused-label-color !global;
 }
 
-@mixin mat-form-field-theme-mdc($theme) {
+@mixin mat-mdc-form-field-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     @include _mdc-text-field-refresh-theme-variables() {
       @include mdc-text-field-without-ripple($query: $mat-theme-styles-query);
@@ -52,7 +52,7 @@
   }
 }
 
-@mixin mat-form-field-typography-mdc($config) {
+@mixin mat-mdc-form-field-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-text-field-without-ripple($query: $mat-typography-styles-query);
     @include mdc-floating-label-core-styles($query: $mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-input/README.md b/src/material-experimental/mdc-input/README.md
index b912aac13301..9f5f6cd2356c 100644
--- a/src/material-experimental/mdc-input/README.md
+++ b/src/material-experimental/mdc-input/README.md
@@ -54,7 +54,7 @@ component by following these steps:
    
 5. Ensure color and typography styles for `@angular/material-experimental` are set up. The input
    itself does not provide any styles. If an input is used inside of the MDC-based
-   `mat-form-field`, either use a custom theme with the `mat-form-field-theme-mdc` mixin, or use
+   `mat-mdc-form-field`, either use a custom theme with the `mat-form-field-theme` mixin, or use
    a prebuilt theme from `@angular/material-experimental/mdc-theming/prebuilt`.
 
 ## API differences
diff --git a/src/material-experimental/mdc-input/_input-theme.scss b/src/material-experimental/mdc-input/_input-theme.scss
index fc5826be566b..6f0ae55bb9c4 100644
--- a/src/material-experimental/mdc-input/_input-theme.scss
+++ b/src/material-experimental/mdc-input/_input-theme.scss
@@ -1,9 +1,9 @@
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-input-theme-mdc($theme) {
+@mixin mat-mdc-input-theme($theme) {
   @include mat-using-mdc-theme($theme) {}
 }
 
-@mixin mat-input-typography-mdc($config) {
+@mixin mat-mdc-input-typography($config) {
   @include mat-using-mdc-typography($config) {}
 }
diff --git a/src/material-experimental/mdc-list/_list-theme.scss b/src/material-experimental/mdc-list/_list-theme.scss
index 7758890a8511..e77332e317e2 100644
--- a/src/material-experimental/mdc-list/_list-theme.scss
+++ b/src/material-experimental/mdc-list/_list-theme.scss
@@ -1,13 +1,13 @@
 @import '@material/list/mixins.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-list-theme-mdc($theme) {
+@mixin mat-mdc-list-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     @include mdc-list-without-ripple($query: $mat-theme-styles-query);
   }
 }
 
-@mixin mat-list-typography-mdc($config) {
+@mixin mat-mdc-list-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-list-without-ripple($query: $mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-menu/README.md b/src/material-experimental/mdc-menu/README.md
index 02aac8490c01..ad1d9049f6be 100644
--- a/src/material-experimental/mdc-menu/README.md
+++ b/src/material-experimental/mdc-menu/README.md
@@ -64,8 +64,8 @@ component by following these steps:
    $my-accent:  mat-palette($mat-pink, A200, A100, A400);
    $my-theme:   mat-light-theme($my-primary, $my-accent);
 
-   @include mat-menu-theme-mdc($my-theme);
-   @include mat-menu-typography-mdc();
+   @include mat-mdc-menu-theme($my-theme);
+   @include mat-mdc-menu-typography();
    ```
 
 ## API differences
diff --git a/src/material-experimental/mdc-menu/_menu-theme.scss b/src/material-experimental/mdc-menu/_menu-theme.scss
index 121a9039e7ea..14f4156db913 100644
--- a/src/material-experimental/mdc-menu/_menu-theme.scss
+++ b/src/material-experimental/mdc-menu/_menu-theme.scss
@@ -5,7 +5,7 @@
 @import '@material/theme/functions.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-menu-theme-mdc($theme) {
+@mixin mat-mdc-menu-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     @include mdc-menu-surface-core-styles($mat-theme-styles-query);
     @include mdc-list-without-ripple($mat-theme-styles-query);
@@ -38,7 +38,7 @@
   }
 }
 
-@mixin mat-menu-typography-mdc($config) {
+@mixin mat-mdc-menu-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-menu-surface-core-styles($mat-typography-styles-query);
 
diff --git a/src/material-experimental/mdc-progress-bar/README.md b/src/material-experimental/mdc-progress-bar/README.md
index 62d8cc7ca394..93211dcb8579 100644
--- a/src/material-experimental/mdc-progress-bar/README.md
+++ b/src/material-experimental/mdc-progress-bar/README.md
@@ -61,8 +61,8 @@ component by following these steps:
    $my-accent:  mat-palette($mat-pink, A200, A100, A400);
    $my-theme:   mat-light-theme($my-primary, $my-accent);
 
-   @include mat-progress-bar-theme-mdc($my-theme);
-   @include mat-progress-bar-typography-mdc();
+   @include mat-mdc-progress-bar-theme($my-theme);
+   @include mat-mdc-progress-bar-typography();
    ```
 
 ## Replacing the standard progress bar in an existing app
diff --git a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss
index 94f1b8b1185e..5df4dfa1c449 100644
--- a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss
+++ b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss
@@ -12,7 +12,7 @@
   @include mdc-linear-progress-buffer-color($buffer-color, $query: $mat-theme-styles-query);
 }
 
-@mixin mat-progress-bar-theme-mdc($theme) {
+@mixin mat-mdc-progress-bar-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     .mat-mdc-progress-bar {
       @include _mat-mdc-progress-bar-color(primary);
@@ -28,6 +28,6 @@
   }
 }
 
-@mixin mat-progress-bar-typography-mdc($config) {
+@mixin mat-mdc-progress-bar-typography($config) {
   // No typography for this component.
 }
diff --git a/src/material-experimental/mdc-radio/_radio-theme.scss b/src/material-experimental/mdc-radio/_radio-theme.scss
index 2fc601e3e061..be7863eff314 100644
--- a/src/material-experimental/mdc-radio/_radio-theme.scss
+++ b/src/material-experimental/mdc-radio/_radio-theme.scss
@@ -2,7 +2,7 @@
 @import '@material/radio/mixins';
 @import '@material/radio/variables';
 
-@mixin mat-radio-theme-mdc($theme) {
+@mixin mat-mdc-radio-theme($theme) {
   // Save original values of MDC global variables. We need to save these so we can restore the
   // variables to their original values and prevent unintended side effects from using this mixin.
   $orig-mdc-radio-baseline-theme-color: $mdc-radio-baseline-theme-color;
@@ -31,7 +31,7 @@
   $mdc-radio-baseline-theme-color: $orig-mdc-radio-baseline-theme-color !global;
 }
 
-@mixin mat-radio-typography-mdc($config) {
+@mixin mat-mdc-radio-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-radio-without-ripple($query: $mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-select/_select-theme.scss b/src/material-experimental/mdc-select/_select-theme.scss
index 27059525b193..fa9a2c28900a 100644
--- a/src/material-experimental/mdc-select/_select-theme.scss
+++ b/src/material-experimental/mdc-select/_select-theme.scss
@@ -1,12 +1,12 @@
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-select-theme-mdc($theme) {
+@mixin mat-mdc-select-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     // TODO: implement MDC-based select.
   }
 }
 
-@mixin mat-select-typography-mdc($config) {
+@mixin mat-mdc-select-typography($config) {
   @include mat-using-mdc-typography($config) {
     // TODO: implement MDC-based select.
   }
diff --git a/src/material-experimental/mdc-sidenav/_sidenav-theme.scss b/src/material-experimental/mdc-sidenav/_sidenav-theme.scss
index 7d21c8fef14f..ef727cb3533a 100644
--- a/src/material-experimental/mdc-sidenav/_sidenav-theme.scss
+++ b/src/material-experimental/mdc-sidenav/_sidenav-theme.scss
@@ -1,12 +1,12 @@
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-sidenav-theme-mdc($theme) {
+@mixin mat-mdc-sidenav-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     // TODO: implement MDC-based sidenav.
   }
 }
 
-@mixin mat-sidenav-typography-mdc($config) {
+@mixin mat-mdc-sidenav-typography($config) {
   @include mat-using-mdc-typography($config) {
     // TODO: implement MDC-based sidenav.
   }
diff --git a/src/material-experimental/mdc-slide-toggle/README.md b/src/material-experimental/mdc-slide-toggle/README.md
index 325b4da02a8d..1ea078afbe35 100644
--- a/src/material-experimental/mdc-slide-toggle/README.md
+++ b/src/material-experimental/mdc-slide-toggle/README.md
@@ -60,8 +60,8 @@ component by following these steps:
    $my-accent:  mat-palette($mat-pink, A200, A100, A400);
    $my-theme:   mat-light-theme($my-primary, $my-accent);
 
-   @include mat-slide-toggle-theme-mdc($my-theme);
-   @include mat-slide-toggle-typography-mdc();
+   @include mat-mdc-slide-toggle-theme($my-theme);
+   @include mat-mdc-slide-toggle-typography();
    ```
 
 ## Replacing the standard slide toggle in an existing app
diff --git a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss
index c0d5731acb87..d266acb6f95c 100644
--- a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss
+++ b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss
@@ -5,7 +5,7 @@
 @import '@material/theme/functions.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-slide-toggle-theme-mdc($theme) {
+@mixin mat-mdc-slide-toggle-theme($theme) {
   $primary: mat-color(map-get($theme, primary));
   $accent: mat-color(map-get($theme, accent));
   $warn: mat-color(map-get($theme, warn));
@@ -65,7 +65,7 @@
   $mdc-switch-baseline-theme-color: $orig-mdc-switch-baseline-theme-color !global;
 }
 
-@mixin mat-slide-toggle-typography-mdc($config) {
+@mixin mat-mdc-slide-toggle-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-switch-without-ripple($query: $mat-typography-styles-query);
     @include mdc-form-field-core-styles($query: $mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-slider/_slider-theme.scss b/src/material-experimental/mdc-slider/_slider-theme.scss
index 4aac8cc9783d..eec82a6b95ee 100644
--- a/src/material-experimental/mdc-slider/_slider-theme.scss
+++ b/src/material-experimental/mdc-slider/_slider-theme.scss
@@ -1,7 +1,7 @@
 @import '../mdc-helpers/mdc-helpers';
 @import '@material/slider/mixins.import';
 
-@mixin mat-slider-theme-mdc($theme) {
+@mixin mat-mdc-slider-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     @include mdc-slider-core-styles($query: $mat-theme-styles-query);
 
@@ -17,7 +17,7 @@
   }
 }
 
-@mixin mat-slider-typography-mdc($config) {
+@mixin mat-mdc-slider-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-slider-core-styles($query: $mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-snackbar/_snackbar-theme.scss b/src/material-experimental/mdc-snackbar/_snackbar-theme.scss
index ad08b6197adb..503b43547eb0 100644
--- a/src/material-experimental/mdc-snackbar/_snackbar-theme.scss
+++ b/src/material-experimental/mdc-snackbar/_snackbar-theme.scss
@@ -1,5 +1,5 @@
-@mixin mat-snackbar-theme-mdc($theme) {
+@mixin mat-mdc-snackbar-theme($theme) {
 }
 
-@mixin mat-snackbar-typography-mdc($config) {
+@mixin mat-mdc-snackbar-typography($config) {
 }
diff --git a/src/material-experimental/mdc-table/_table-theme.scss b/src/material-experimental/mdc-table/_table-theme.scss
index 8039a3e6d69f..8028e8535f04 100644
--- a/src/material-experimental/mdc-table/_table-theme.scss
+++ b/src/material-experimental/mdc-table/_table-theme.scss
@@ -1,13 +1,13 @@
 @import '../mdc-helpers/mdc-helpers';
 @import '@material/data-table/mixins.import';
 
-@mixin mat-table-theme-mdc($theme) {
+@mixin mat-mdc-table-theme($theme) {
   @include mat-using-mdc-theme($theme) {
     @include mdc-data-table-core-styles($query: $mat-theme-styles-query);
   }
 }
 
-@mixin mat-table-typography-mdc($config) {
+@mixin mat-mdc-table-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-data-table-core-styles($query: $mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-tabs/README.md b/src/material-experimental/mdc-tabs/README.md
index db91ff7c5add..8c8198014513 100644
--- a/src/material-experimental/mdc-tabs/README.md
+++ b/src/material-experimental/mdc-tabs/README.md
@@ -64,8 +64,8 @@ component by following these steps:
    $my-accent:  mat-palette($mat-pink, A200, A100, A400);
    $my-theme:   mat-light-theme($my-primary, $my-accent);
 
-   @include mat-tabs-theme-mdc($my-theme);
-   @include mat-tabs-typography-mdc();
+   @include mat-mdc-tabs-theme($my-theme);
+   @include mat-mdc-tabs-typography();
    ```
 
 ## API differences
diff --git a/src/material-experimental/mdc-tabs/_tabs-theme.scss b/src/material-experimental/mdc-tabs/_tabs-theme.scss
index 3a658d6eb17d..5103ddce350f 100644
--- a/src/material-experimental/mdc-tabs/_tabs-theme.scss
+++ b/src/material-experimental/mdc-tabs/_tabs-theme.scss
@@ -4,7 +4,7 @@
 @import '@material/tab/variables.import';
 @import '../mdc-helpers/mdc-helpers';
 
-@mixin mat-tabs-theme-mdc($theme) {
+@mixin mat-mdc-tabs-theme($theme) {
   // Save original values of MDC global variables. We need to save these so we can restore the
   // variables to their original values and prevent unintended side effects from using this mixin.
   $orig-mdc-tab-text-label-color-active: $mdc-tab-text-label-color-active;
@@ -91,7 +91,7 @@
   }
 }
 
-@mixin mat-tabs-typography-mdc($config) {
+@mixin mat-mdc-tabs-typography($config) {
   @include mat-using-mdc-typography($config) {
     @include mdc-tab-without-ripple($query: $mat-typography-styles-query);
     @include mdc-tab-indicator-core-styles($query: $mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-theming/_all-theme.scss b/src/material-experimental/mdc-theming/_all-theme.scss
index 642c2fa5e4c1..3b1292e75f0c 100644
--- a/src/material-experimental/mdc-theming/_all-theme.scss
+++ b/src/material-experimental/mdc-theming/_all-theme.scss
@@ -13,22 +13,22 @@
 @import '../mdc-form-field/form-field-theme';
 
 
-@mixin angular-material-theme-mdc($theme) {
-  @include mat-button-theme-mdc($theme);
-  @include mat-fab-theme-mdc($theme);
-  @include mat-icon-button-theme-mdc($theme);
-  @include mat-card-theme-mdc($theme);
-  @include mat-checkbox-theme-mdc($theme);
-  @include mat-chips-theme-mdc($theme);
-  @include mat-list-theme-mdc($theme);
-  @include mat-menu-theme-mdc($theme);
-  @include mat-progress-bar-theme-mdc($theme);
-  @include mat-radio-theme-mdc($theme);
-  @include mat-slide-toggle-theme-mdc($theme);
-  @include mat-table-theme-mdc($theme);
-  @include mat-form-field-theme-mdc($theme);
-  @include mat-input-theme-mdc($theme);
+@mixin angular-material-mdc-theme($theme) {
+  @include mat-mdc-button-theme($theme);
+  @include mat-mdc-fab-theme($theme);
+  @include mat-mdc-icon-button-theme($theme);
+  @include mat-mdc-card-theme($theme);
+  @include mat-mdc-checkbox-theme($theme);
+  @include mat-mdc-chips-theme($theme);
+  @include mat-mdc-list-theme($theme);
+  @include mat-mdc-menu-theme($theme);
+  @include mat-mdc-progress-bar-theme($theme);
+  @include mat-mdc-radio-theme($theme);
+  @include mat-mdc-slide-toggle-theme($theme);
+  @include mat-mdc-table-theme($theme);
+  @include mat-mdc-form-field-theme($theme);
+  @include mat-mdc-input-theme($theme);
   // TODO(andrewjs): Add this back when MDC syncs their slider code into Google-internal code
-  // @include mat-slider-theme-mdc($theme);
-  @include mat-tabs-theme-mdc($theme);
+  // @include mat-mdc-slider-theme($theme);
+  @include mat-mdc-tabs-theme($theme);
 }
diff --git a/src/material-experimental/mdc-theming/prebuilt/indigo-pink.scss b/src/material-experimental/mdc-theming/prebuilt/indigo-pink.scss
index d87658dfa726..11d56a21ddd3 100644
--- a/src/material-experimental/mdc-theming/prebuilt/indigo-pink.scss
+++ b/src/material-experimental/mdc-theming/prebuilt/indigo-pink.scss
@@ -8,5 +8,5 @@ $accent:  mat-palette($mat-pink, A200, A100, A400);
 $theme: mat-light-theme($primary, $accent);
 
 // Include all theme styles for the components.
-@include angular-material-theme-mdc($theme);
-@include angular-material-typography-mdc();
+@include angular-material-mdc-theme($theme);
+@include angular-material-mdc-typography();
diff --git a/src/material-experimental/mdc-typography/_all-typography.scss b/src/material-experimental/mdc-typography/_all-typography.scss
index bd667c1f1b64..3c3e5f8567c2 100644
--- a/src/material-experimental/mdc-typography/_all-typography.scss
+++ b/src/material-experimental/mdc-typography/_all-typography.scss
@@ -13,25 +13,25 @@
 @import '../mdc-input/input-theme';
 @import '../mdc-form-field/form-field-theme';
 
-@mixin angular-material-typography-mdc($config: null) {
+@mixin angular-material-mdc-typography($config: null) {
   @if $config == null {
     $config: mat-typography-config();
   }
 
-  @include mat-button-typography-mdc($config);
-  @include mat-fab-typography-mdc($config);
-  @include mat-icon-button-typography-mdc($config);
-  @include mat-card-typography-mdc($config);
-  @include mat-checkbox-typography-mdc($config);
-  @include mat-chips-typography-mdc($config);
-  @include mat-list-typography-mdc($config);
-  @include mat-menu-typography-mdc($config);
-  @include mat-radio-typography-mdc($config);
-  @include mat-slide-toggle-typography-mdc($config);
-  @include mat-slider-typography-mdc($config);
-  @include mat-tabs-typography-mdc($config);
-  @include mat-table-typography-mdc($config);
-  @include mat-progress-bar-typography-mdc($config);
-  @include mat-input-typography-mdc($config);
-  @include mat-form-field-typography-mdc($config);
+  @include mat-mdc-button-typography($config);
+  @include mat-mdc-fab-typography($config);
+  @include mat-mdc-icon-button-typography($config);
+  @include mat-mdc-card-typography($config);
+  @include mat-mdc-checkbox-typography($config);
+  @include mat-mdc-chips-typography($config);
+  @include mat-mdc-list-typography($config);
+  @include mat-mdc-menu-typography($config);
+  @include mat-mdc-radio-typography($config);
+  @include mat-mdc-slide-toggle-typography($config);
+  @include mat-mdc-slider-typography($config);
+  @include mat-mdc-tabs-typography($config);
+  @include mat-mdc-table-typography($config);
+  @include mat-mdc-progress-bar-typography($config);
+  @include mat-mdc-input-typography($config);
+  @include mat-mdc-form-field-typography($config);
 }
diff --git a/src/universal-app/theme.scss b/src/universal-app/theme.scss
index 4d19e4fd4a3e..2207a82885d1 100644
--- a/src/universal-app/theme.scss
+++ b/src/universal-app/theme.scss
@@ -9,7 +9,7 @@
 // have to load a single css file for Angular Material in your app.
 // **Be sure that you only ever include this mixin once!**
 @include mat-core();
-@include angular-material-typography-mdc();
+@include angular-material-mdc-typography();
 
 // Define the default theme (same as the example above).
 $candy-app-primary: mat-palette($mat-indigo);
@@ -18,5 +18,5 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
 
 // Include the default theme styles.
 @include angular-material-theme($candy-app-theme);
-@include angular-material-theme-mdc($candy-app-theme);
-@include mat-slider-theme-mdc($candy-app-theme);
+@include angular-material-mdc-theme($candy-app-theme);
+@include mat-mdc-slider-theme($candy-app-theme);