diff --git a/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
index a43f435e8ff..ad24d64d312 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 
 class PreviewPlural {
     void test() {
-        new Bar();
+        new PreviewPluralBar();
         new ArrayList<>();
     }
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPluralBar.java
similarity index 98%
rename from test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
rename to test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPluralBar.java
index a2d62055954..9e1f2e7acf9 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPluralBar.java
@@ -23,6 +23,6 @@
  * questions.
  */
 
-class Bar {
+class PreviewPluralBar {
     Runnable r = () -> {};
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
index 2bcb2dae3cd..279b51902e7 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
@@ -30,9 +30,9 @@
 
 import java.util.ArrayList;
 
-class PreviewPlural {
+class PreviewPluralAdditional {
     void test() {
-        new Bar();
+        new PreviewPluralAdditionalBar();
         new ArrayList<>();
     }
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
similarity index 97%
rename from test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
rename to test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
index 0b243569554..5825e9b30d8 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
@@ -25,7 +25,7 @@
 
 import java.util.ArrayList;
 
-class Bar {
+class PreviewPluralAdditionalBar {
     Runnable r = () -> {};
     void test() {
         new ArrayList<>();