diff --git a/src/dev-app/theme.scss b/src/dev-app/theme.scss
index 6c03fa1f5336..debf1b259cce 100644
--- a/src/dev-app/theme.scss
+++ b/src/dev-app/theme.scss
@@ -1,8 +1,8 @@
 @import '../material/core/theming/all-theme';
+@import '../material-experimental/mdc-slider/slider-theme';
 @import '../material/core/focus-indicator/focus-indicator';
 @import '../material-experimental/column-resize/column-resize';
 @import '../material-experimental/mdc-helpers/mdc-helpers';
-@import '../material-experimental/mdc-slider/mdc-slider';
 @import '../material-experimental/mdc-theming/all-theme';
 @import '../material-experimental/mdc-typography/all-typography';
 @import '../material-experimental/popover-edit/popover-edit';
diff --git a/src/material-experimental/mdc-autocomplete/_mdc-autocomplete.scss b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-autocomplete/_mdc-autocomplete.scss
rename to src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss
diff --git a/src/material-experimental/mdc-button/_mdc-button.scss b/src/material-experimental/mdc-button/_button-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-button/_mdc-button.scss
rename to src/material-experimental/mdc-button/_button-theme.scss
diff --git a/src/material-experimental/mdc-card/_mdc-card.scss b/src/material-experimental/mdc-card/_card-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-card/_mdc-card.scss
rename to src/material-experimental/mdc-card/_card-theme.scss
diff --git a/src/material-experimental/mdc-checkbox/_mdc-checkbox.scss b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-checkbox/_mdc-checkbox.scss
rename to src/material-experimental/mdc-checkbox/_checkbox-theme.scss
diff --git a/src/material-experimental/mdc-chips/_mdc-chips.scss b/src/material-experimental/mdc-chips/_chips-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-chips/_mdc-chips.scss
rename to src/material-experimental/mdc-chips/_chips-theme.scss
diff --git a/src/material-experimental/mdc-form-field/BUILD.bazel b/src/material-experimental/mdc-form-field/BUILD.bazel
index 949657c3c5e9..796f5608222d 100644
--- a/src/material-experimental/mdc-form-field/BUILD.bazel
+++ b/src/material-experimental/mdc-form-field/BUILD.bazel
@@ -34,7 +34,7 @@ ng_module(
 sass_library(
     name = "mdc_form_field_scss_lib",
     srcs = [
-        "_mdc-form-field.scss",
+        "_form-field-theme.scss",
         "_mdc-text-field-theme-variable-refresh.scss",
     ],
     deps = [
diff --git a/src/material-experimental/mdc-form-field/_mdc-form-field.scss b/src/material-experimental/mdc-form-field/_form-field-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-form-field/_mdc-form-field.scss
rename to src/material-experimental/mdc-form-field/_form-field-theme.scss
diff --git a/src/material-experimental/mdc-input/_mdc-input.scss b/src/material-experimental/mdc-input/_input-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-input/_mdc-input.scss
rename to src/material-experimental/mdc-input/_input-theme.scss
diff --git a/src/material-experimental/mdc-list/_mdc-list.scss b/src/material-experimental/mdc-list/_list-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-list/_mdc-list.scss
rename to src/material-experimental/mdc-list/_list-theme.scss
diff --git a/src/material-experimental/mdc-menu/_mdc-menu.scss b/src/material-experimental/mdc-menu/_menu-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-menu/_mdc-menu.scss
rename to src/material-experimental/mdc-menu/_menu-theme.scss
diff --git a/src/material-experimental/mdc-progress-bar/_mdc-progress-bar.scss b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-progress-bar/_mdc-progress-bar.scss
rename to src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss
diff --git a/src/material-experimental/mdc-radio/_mdc-radio.scss b/src/material-experimental/mdc-radio/_radio-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-radio/_mdc-radio.scss
rename to src/material-experimental/mdc-radio/_radio-theme.scss
diff --git a/src/material-experimental/mdc-select/_mdc-select.scss b/src/material-experimental/mdc-select/_select-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-select/_mdc-select.scss
rename to src/material-experimental/mdc-select/_select-theme.scss
diff --git a/src/material-experimental/mdc-sidenav/_mdc-sidenav.scss b/src/material-experimental/mdc-sidenav/_sidenav-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-sidenav/_mdc-sidenav.scss
rename to src/material-experimental/mdc-sidenav/_sidenav-theme.scss
diff --git a/src/material-experimental/mdc-slide-toggle/_mdc-slide-toggle.scss b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-slide-toggle/_mdc-slide-toggle.scss
rename to src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss
diff --git a/src/material-experimental/mdc-slider/_mdc-slider.scss b/src/material-experimental/mdc-slider/_slider-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-slider/_mdc-slider.scss
rename to src/material-experimental/mdc-slider/_slider-theme.scss
diff --git a/src/material-experimental/mdc-snackbar/_mdc-snackbar.scss b/src/material-experimental/mdc-snackbar/_snackbar-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-snackbar/_mdc-snackbar.scss
rename to src/material-experimental/mdc-snackbar/_snackbar-theme.scss
diff --git a/src/material-experimental/mdc-table/_mdc-table.scss b/src/material-experimental/mdc-table/_table-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-table/_mdc-table.scss
rename to src/material-experimental/mdc-table/_table-theme.scss
diff --git a/src/material-experimental/mdc-tabs/_mdc-tabs.scss b/src/material-experimental/mdc-tabs/_tabs-theme.scss
similarity index 100%
rename from src/material-experimental/mdc-tabs/_mdc-tabs.scss
rename to src/material-experimental/mdc-tabs/_tabs-theme.scss
diff --git a/src/material-experimental/mdc-theming/_all-theme.scss b/src/material-experimental/mdc-theming/_all-theme.scss
index d1ad30ee87e9..642c2fa5e4c1 100644
--- a/src/material-experimental/mdc-theming/_all-theme.scss
+++ b/src/material-experimental/mdc-theming/_all-theme.scss
@@ -1,16 +1,17 @@
-@import '../mdc-button/mdc-button';
-@import '../mdc-card/mdc-card';
-@import '../mdc-checkbox/mdc-checkbox';
-@import '../mdc-chips/mdc-chips';
-@import '../mdc-list/mdc-list';
-@import '../mdc-menu/mdc-menu';
-@import '../mdc-radio/mdc-radio';
-@import '../mdc-slide-toggle/mdc-slide-toggle';
-@import '../mdc-tabs/mdc-tabs';
-@import '../mdc-table/mdc-table';
-@import '../mdc-progress-bar/mdc-progress-bar';
-@import '../mdc-input/mdc-input';
-@import '../mdc-form-field/mdc-form-field';
+@import '../mdc-button/button-theme';
+@import '../mdc-card/card-theme';
+@import '../mdc-checkbox/checkbox-theme';
+@import '../mdc-chips/chips-theme';
+@import '../mdc-list/list-theme';
+@import '../mdc-menu/menu-theme';
+@import '../mdc-radio/radio-theme';
+@import '../mdc-slide-toggle/slide-toggle-theme';
+@import '../mdc-tabs/tabs-theme';
+@import '../mdc-table/table-theme';
+@import '../mdc-progress-bar/progress-bar-theme';
+@import '../mdc-input/input-theme';
+@import '../mdc-form-field/form-field-theme';
+
 
 @mixin angular-material-theme-mdc($theme) {
   @include mat-button-theme-mdc($theme);
diff --git a/src/material-experimental/mdc-typography/_all-typography.scss b/src/material-experimental/mdc-typography/_all-typography.scss
index 8edfe99ccb10..bd667c1f1b64 100644
--- a/src/material-experimental/mdc-typography/_all-typography.scss
+++ b/src/material-experimental/mdc-typography/_all-typography.scss
@@ -1,17 +1,17 @@
-@import '../mdc-button/mdc-button';
-@import '../mdc-card/mdc-card';
-@import '../mdc-checkbox/mdc-checkbox';
-@import '../mdc-chips/mdc-chips';
-@import '../mdc-list/mdc-list';
-@import '../mdc-menu/mdc-menu';
-@import '../mdc-radio/mdc-radio';
-@import '../mdc-slide-toggle/mdc-slide-toggle';
-@import '../mdc-slider/mdc-slider';
-@import '../mdc-tabs/mdc-tabs';
-@import '../mdc-table/mdc-table';
-@import '../mdc-progress-bar/mdc-progress-bar';
-@import '../mdc-input/mdc-input';
-@import '../mdc-form-field/mdc-form-field';
+@import '../mdc-button/button-theme';
+@import '../mdc-card/card-theme';
+@import '../mdc-checkbox/checkbox-theme';
+@import '../mdc-chips/chips-theme';
+@import '../mdc-list/list-theme';
+@import '../mdc-menu/menu-theme';
+@import '../mdc-radio/radio-theme';
+@import '../mdc-slide-toggle/slide-toggle-theme';
+@import '../mdc-slider/slider-theme';
+@import '../mdc-tabs/tabs-theme';
+@import '../mdc-table/table-theme';
+@import '../mdc-progress-bar/progress-bar-theme';
+@import '../mdc-input/input-theme';
+@import '../mdc-form-field/form-field-theme';
 
 @mixin angular-material-typography-mdc($config: null) {
   @if $config == null {
diff --git a/src/universal-app/theme.scss b/src/universal-app/theme.scss
index 1dcd85b797f5..4d19e4fd4a3e 100644
--- a/src/universal-app/theme.scss
+++ b/src/universal-app/theme.scss
@@ -1,5 +1,5 @@
 @import '../material/core/theming/all-theme';
-@import '../material-experimental/mdc-slider/mdc-slider';
+@import '../material-experimental/mdc-slider/slider-theme';
 @import '../material-experimental/mdc-theming/all-theme';
 @import '../material-experimental/mdc-typography/all-typography';