diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMacOSFileChooserTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserMacTest.java
similarity index 98%
rename from flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMacOSFileChooserTest.java
rename to flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserMacTest.java
index 5d4efd5c..ae52327d 100644
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMacOSFileChooserTest.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserMacTest.java
@@ -37,7 +37,7 @@ import net.miginfocom.swing.*;
 /**
  * @author Karl Tauber
  */
-public class FlatMacOSFileChooserTest
+public class FlatSystemFileChooserMacTest
 	extends FlatTestPanel
 {
 	public static void main( String[] args ) {
@@ -58,13 +58,13 @@ public class FlatMacOSFileChooserTest
 				return;
 			}
 
-			FlatTestFrame frame = FlatTestFrame.create( args, "FlatMacOSFileChooserTest" );
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatSystemFileChooserMacTest" );
 			addListeners( frame );
-			frame.showFrame( FlatMacOSFileChooserTest::new );
+			frame.showFrame( FlatSystemFileChooserMacTest::new );
 		} );
 	}
 
-	FlatMacOSFileChooserTest() {
+	FlatSystemFileChooserMacTest() {
 		initComponents();
 	}
 
diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMacOSFileChooserTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserMacTest.jfd
similarity index 100%
rename from flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMacOSFileChooserTest.jfd
rename to flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserMacTest.jfd
diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatWindowsFileChooserTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserWindowsTest.java
similarity index 98%
rename from flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatWindowsFileChooserTest.java
rename to flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserWindowsTest.java
index c15f1e63..ab1f0865 100644
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatWindowsFileChooserTest.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserWindowsTest.java
@@ -36,7 +36,7 @@ import net.miginfocom.swing.*;
 /**
  * @author Karl Tauber
  */
-public class FlatWindowsFileChooserTest
+public class FlatSystemFileChooserWindowsTest
 	extends FlatTestPanel
 {
 	public static void main( String[] args ) {
@@ -46,13 +46,13 @@ public class FlatWindowsFileChooserTest
 				return;
 			}
 
-			FlatTestFrame frame = FlatTestFrame.create( args, "FlatWindowsFileChooserTest" );
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatSystemFileChooserWindowsTest" );
 			addListeners( frame );
-			frame.showFrame( FlatWindowsFileChooserTest::new );
+			frame.showFrame( FlatSystemFileChooserWindowsTest::new );
 		} );
 	}
 
-	FlatWindowsFileChooserTest() {
+	FlatSystemFileChooserWindowsTest() {
 		initComponents();
 
 		fileTypesField.setSelectedItem( null );
diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatWindowsFileChooserTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserWindowsTest.jfd
similarity index 100%
rename from flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatWindowsFileChooserTest.jfd
rename to flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSystemFileChooserWindowsTest.jfd