diff --git a/all.ts b/all.ts
index b7f5817f8d..9f4dfc41d9 100644
--- a/all.ts
+++ b/all.ts
@@ -30,7 +30,7 @@ import './fab/branded-fab.js';
 import './fab/fab.js';
 import './field/filled-field.js';
 import './field/outlined-field.js';
-import './focus/focus-ring.js';
+import './focus/md-focus-ring.js';
 import './icon/icon.js';
 import './iconbutton/filled-icon-button.js';
 import './iconbutton/filled-tonal-icon-button.js';
@@ -78,7 +78,7 @@ export * from './fab/branded-fab.js';
 export * from './fab/fab.js';
 export * from './field/filled-field.js';
 export * from './field/outlined-field.js';
-export * from './focus/focus-ring.js';
+export * from './focus/md-focus-ring.js';
 export * from './icon/icon.js';
 export * from './iconbutton/filled-icon-button.js';
 export * from './iconbutton/filled-tonal-icon-button.js';
diff --git a/button/internal/button.ts b/button/internal/button.ts
index 8ea6f9f60a..8a46f05ce5 100644
--- a/button/internal/button.ts
+++ b/button/internal/button.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, isServer, LitElement, nothing, TemplateResult} from 'lit';
diff --git a/catalog/src/components/theme-changer.ts b/catalog/src/components/theme-changer.ts
index fdb2923ea9..3d327b647a 100644
--- a/catalog/src/components/theme-changer.ts
+++ b/catalog/src/components/theme-changer.ts
@@ -9,7 +9,7 @@ import '@material/web/labs/segmentedbutton/outlined-segmented-button.js';
 import '@material/web/icon/icon.js';
 import './hct-slider.js';
 import './copy-code-button.js';
-import '@material/web/focus/focus-ring.js';
+import '@material/web/focus/md-focus-ring.js';
 
 import type {MdOutlinedSegmentedButton} from '@material/web/labs/segmentedbutton/outlined-segmented-button.js';
 import {css, html, LitElement} from 'lit';
diff --git a/catalog/src/components/top-app-bar.ts b/catalog/src/components/top-app-bar.ts
index 82ac6b1a68..28df604c1e 100644
--- a/catalog/src/components/top-app-bar.ts
+++ b/catalog/src/components/top-app-bar.ts
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '@material/web/focus/focus-ring.js';
+import '@material/web/focus/md-focus-ring.js';
 import '@material/web/iconbutton/standard-icon-button.js';
 import '@material/web/icon/icon.js';
-import '@material/web/focus/focus-ring.js';
 
 import type {MdStandardIconButton} from '@material/web/iconbutton/standard-icon-button.js';
 import {css, html, LitElement} from 'lit';
diff --git a/checkbox/internal/checkbox.ts b/checkbox/internal/checkbox.ts
index 849b56213f..06e3778397 100644
--- a/checkbox/internal/checkbox.ts
+++ b/checkbox/internal/checkbox.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, isServer, LitElement, nothing, PropertyValues} from 'lit';
diff --git a/chips/internal/chip.ts b/chips/internal/chip.ts
index ea228ad345..6ffe0ddbad 100644
--- a/chips/internal/chip.ts
+++ b/chips/internal/chip.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, LitElement, nothing, TemplateResult} from 'lit';
diff --git a/chips/internal/trailing-icons.ts b/chips/internal/trailing-icons.ts
index a159d971d0..fb04bc7321 100644
--- a/chips/internal/trailing-icons.ts
+++ b/chips/internal/trailing-icons.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, nothing} from 'lit';
diff --git a/fab/internal/shared.ts b/fab/internal/shared.ts
index 801f5b4608..02382b38c6 100644
--- a/fab/internal/shared.ts
+++ b/fab/internal/shared.ts
@@ -5,7 +5,7 @@
  */
 
 import '../../elevation/elevation.js';
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, LitElement, nothing} from 'lit';
diff --git a/focus/demo/stories.ts b/focus/demo/stories.ts
index ba83d54496..073cbf81d3 100644
--- a/focus/demo/stories.ts
+++ b/focus/demo/stories.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '@material/web/focus/focus-ring.js';
+import '@material/web/focus/md-focus-ring.js';
 
 import {MaterialStoryInit} from './material-collection.js';
 import {css, html} from 'lit';
diff --git a/focus/focus-ring.ts b/focus/md-focus-ring.ts
similarity index 100%
rename from focus/focus-ring.ts
rename to focus/md-focus-ring.ts
diff --git a/focus/focus-ring_test.ts b/focus/md-focus-ring_test.ts
similarity index 86%
rename from focus/focus-ring_test.ts
rename to focus/md-focus-ring_test.ts
index d2aee56fe0..0566b0de94 100644
--- a/focus/focus-ring_test.ts
+++ b/focus/md-focus-ring_test.ts
@@ -8,7 +8,7 @@
 
 import {createTokenTests} from '../testing/tokens.js';
 
-import {MdFocusRing} from './focus-ring.js';
+import {MdFocusRing} from './md-focus-ring.js';
 
 describe('<md-focus-ring>', () => {
   describe('.styles', () => {
diff --git a/iconbutton/internal/icon-button.ts b/iconbutton/internal/icon-button.ts
index 1a62291f92..44f9b66a5e 100644
--- a/iconbutton/internal/icon-button.ts
+++ b/iconbutton/internal/icon-button.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, LitElement, nothing} from 'lit';
diff --git a/labs/navigationtab/lib/navigation-tab.ts b/labs/navigationtab/lib/navigation-tab.ts
index 35ee319ce3..f3cd1094c9 100644
--- a/labs/navigationtab/lib/navigation-tab.ts
+++ b/labs/navigationtab/lib/navigation-tab.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../../focus/focus-ring.js';
+import '../../../focus/md-focus-ring.js';
 import '../../../ripple/ripple.js';
 import '../../badge/badge.js';
 
diff --git a/labs/segmentedbutton/lib/segmented-button.ts b/labs/segmentedbutton/lib/segmented-button.ts
index 31badb5f6f..19259b7b3e 100644
--- a/labs/segmentedbutton/lib/segmented-button.ts
+++ b/labs/segmentedbutton/lib/segmented-button.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../../focus/focus-ring.js';
+import '../../../focus/md-focus-ring.js';
 import '../../../ripple/ripple.js';
 
 import {html, LitElement, nothing, PropertyValues, TemplateResult} from 'lit';
diff --git a/list/internal/listitem/list-item.ts b/list/internal/listitem/list-item.ts
index 7c08435701..360692acb2 100644
--- a/list/internal/listitem/list-item.ts
+++ b/list/internal/listitem/list-item.ts
@@ -5,7 +5,7 @@
  */
 
 import '../../../ripple/ripple.js';
-import '../../../focus/focus-ring.js';
+import '../../../focus/md-focus-ring.js';
 
 import {html, LitElement, nothing, PropertyValues, TemplateResult} from 'lit';
 import {property, query} from 'lit/decorators.js';
diff --git a/menu/internal/menu.ts b/menu/internal/menu.ts
index a257b583d4..8c3e9828f5 100644
--- a/menu/internal/menu.ts
+++ b/menu/internal/menu.ts
@@ -5,7 +5,7 @@
  */
 
 import '../../list/list.js';
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../elevation/elevation.js';
 
 import {html, isServer, LitElement, nothing} from 'lit';
diff --git a/radio/lib/radio.ts b/radio/lib/radio.ts
index 56fdc6baa1..3876834e64 100644
--- a/radio/lib/radio.ts
+++ b/radio/lib/radio.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, isServer, LitElement, nothing} from 'lit';
diff --git a/slider/lib/slider.ts b/slider/lib/slider.ts
index 9b8642486f..a8b24e8ad6 100644
--- a/slider/lib/slider.ts
+++ b/slider/lib/slider.ts
@@ -5,7 +5,7 @@
  */
 
 import '../../elevation/elevation.js';
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, isServer, LitElement, nothing, PropertyValues} from 'lit';
diff --git a/switch/lib/switch.ts b/switch/lib/switch.ts
index 49178486ee..4587921600 100644
--- a/switch/lib/switch.ts
+++ b/switch/lib/switch.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, isServer, LitElement, nothing, PropertyValues, TemplateResult} from 'lit';
diff --git a/tabs/lib/tab.ts b/tabs/lib/tab.ts
index 7a9362eec9..6a67339f8f 100644
--- a/tabs/lib/tab.ts
+++ b/tabs/lib/tab.ts
@@ -5,7 +5,7 @@
  */
 
 import '../../elevation/elevation.js';
-import '../../focus/focus-ring.js';
+import '../../focus/md-focus-ring.js';
 import '../../ripple/ripple.js';
 
 import {html, isServer, LitElement, nothing, PropertyValues} from 'lit';