diff --git a/packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators-bottom.png b/packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicator-bottom.png
similarity index 100%
rename from packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators-bottom.png
rename to packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicator-bottom.png
diff --git a/packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators-top.png b/packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicator-top.png
similarity index 100%
rename from packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators-top.png
rename to packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicator-top.png
diff --git a/packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators-both.png b/packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators.png
similarity index 100%
rename from packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators-both.png
rename to packages/scroller/test/visual/base/screenshots/scroller/baseline/theme-overflow-indicators.png
diff --git a/packages/scroller/test/visual/base/scroller.test.js b/packages/scroller/test/visual/base/scroller.test.js
index 0168bc1b1e7..19bf8de93e8 100644
--- a/packages/scroller/test/visual/base/scroller.test.js
+++ b/packages/scroller/test/visual/base/scroller.test.js
@@ -29,20 +29,20 @@ describe('scroller', () => {
     await visualDiff(div, 'focus-ring');
   });
 
-  it('theme-overflow-indicators-bottom', async () => {
+  it('theme-overflow-indicator-bottom', async () => {
     element.setAttribute('theme', 'overflow-indicator-bottom');
-    await visualDiff(div, 'theme-overflow-indicators-bottom');
+    await visualDiff(div, 'theme-overflow-indicator-bottom');
   });
 
-  it('theme-overflow-indicators-both', async () => {
+  it('theme-overflow-indicators', async () => {
     element.setAttribute('theme', 'overflow-indicators');
     element.scrollTop = 36;
-    await visualDiff(div, 'theme-overflow-indicators-both');
+    await visualDiff(div, 'theme-overflow-indicators');
   });
 
-  it('theme-overflow-indicators-top', async () => {
+  it('theme-overflow-indicator-top', async () => {
     element.setAttribute('theme', 'overflow-indicator-top');
     element.scrollTop = element.scrollHeight - element.clientHeight;
-    await visualDiff(div, 'theme-overflow-indicators-top');
+    await visualDiff(div, 'theme-overflow-indicator-top');
   });
 });
diff --git a/packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators-bottom.png b/packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicator-bottom.png
similarity index 100%
rename from packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators-bottom.png
rename to packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicator-bottom.png
diff --git a/packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators-top.png b/packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicator-top.png
similarity index 100%
rename from packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators-top.png
rename to packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicator-top.png
diff --git a/packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators-both.png b/packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators.png
similarity index 100%
rename from packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators-both.png
rename to packages/scroller/test/visual/lumo/screenshots/scroller/baseline/theme-overflow-indicators.png
diff --git a/packages/scroller/test/visual/lumo/scroller.test.js b/packages/scroller/test/visual/lumo/scroller.test.js
index 6abf2685f2d..5faaca97d2c 100644
--- a/packages/scroller/test/visual/lumo/scroller.test.js
+++ b/packages/scroller/test/visual/lumo/scroller.test.js
@@ -32,20 +32,20 @@ describe('scroller', () => {
     await visualDiff(div, 'focus-ring');
   });
 
-  it('theme-overflow-indicators-bottom', async () => {
+  it('theme-overflow-indicator-bottom', async () => {
     element.setAttribute('theme', 'overflow-indicator-bottom');
-    await visualDiff(div, 'theme-overflow-indicators-bottom');
+    await visualDiff(div, 'theme-overflow-indicator-bottom');
   });
 
-  it('theme-overflow-indicators-both', async () => {
+  it('theme-overflow-indicators', async () => {
     element.setAttribute('theme', 'overflow-indicators');
     element.scrollTop = 36;
-    await visualDiff(div, 'theme-overflow-indicators-both');
+    await visualDiff(div, 'theme-overflow-indicators');
   });
 
-  it('theme-overflow-indicators-top', async () => {
+  it('theme-overflow-indicator-top', async () => {
     element.setAttribute('theme', 'overflow-indicator-top');
     element.scrollTop = element.scrollHeight - element.clientHeight;
-    await visualDiff(div, 'theme-overflow-indicators-top');
+    await visualDiff(div, 'theme-overflow-indicator-top');
   });
 });
diff --git a/packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators-bottom.png b/packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicator-bottom.png
similarity index 100%
rename from packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators-bottom.png
rename to packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicator-bottom.png
diff --git a/packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators-top.png b/packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicator-top.png
similarity index 100%
rename from packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators-top.png
rename to packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicator-top.png
diff --git a/packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators-both.png b/packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators.png
similarity index 100%
rename from packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators-both.png
rename to packages/virtual-list/test/visual/base/screenshots/virtual-list/baseline/theme-overflow-indicators.png
diff --git a/packages/virtual-list/test/visual/base/virtual-list.test.js b/packages/virtual-list/test/visual/base/virtual-list.test.js
index b347b776cc9..1d02d170c61 100644
--- a/packages/virtual-list/test/visual/base/virtual-list.test.js
+++ b/packages/virtual-list/test/visual/base/virtual-list.test.js
@@ -27,20 +27,20 @@ describe('virtual-list', () => {
     await visualDiff(div, 'basic');
   });
 
-  it('theme-overflow-indicators-bottom', async () => {
+  it('theme-overflow-indicator-bottom', async () => {
     element.setAttribute('theme', 'overflow-indicator-bottom');
-    await visualDiff(div, 'theme-overflow-indicators-bottom');
+    await visualDiff(div, 'theme-overflow-indicator-bottom');
   });
 
-  it('theme-overflow-indicators-both', async () => {
+  it('theme-overflow-indicators', async () => {
     element.setAttribute('theme', 'overflow-indicators');
     element.scrollTop = 100;
-    await visualDiff(div, 'theme-overflow-indicators-both');
+    await visualDiff(div, 'theme-overflow-indicators');
   });
 
-  it('theme-overflow-indicators-top', async () => {
+  it('theme-overflow-indicator-top', async () => {
     element.setAttribute('theme', 'overflow-indicator-top');
     element.scrollTop = element.scrollHeight - element.clientHeight;
-    await visualDiff(div, 'theme-overflow-indicators-top');
+    await visualDiff(div, 'theme-overflow-indicator-top');
   });
 });