diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-linux.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-linux.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-linux.txt
rename to flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-linux.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
rename to flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-linux.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-linux.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-linux.txt
rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-linux.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202-mac.txt
rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0.txt
diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0.txt
similarity index 100%
rename from flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0_202.txt
rename to flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0.txt
diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
index 008a99d1..460df2f9 100644
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
@@ -199,6 +199,8 @@ public class UIDefaultsDump
 				? "-linux"
 				: "");
 		String javaVersion = System.getProperty( "java.version" );
+		if( javaVersion.startsWith( "1.8.0_" ) && lookAndFeel instanceof FlatLaf )
+			javaVersion = "1.8.0";
 		File file = new File( dir, name + nameSuffix + "_"
 			+ javaVersion + osSuffix + ".txt" );