diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/11.nix
rename to pkgs/development/compilers/openjdk/openjfx/11/default.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/15.nix
rename to pkgs/development/compilers/openjdk/openjfx/15/default.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/17.nix
rename to pkgs/development/compilers/openjdk/openjfx/17/default.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/19.nix
rename to pkgs/development/compilers/openjdk/openjfx/19/default.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/20.nix
rename to pkgs/development/compilers/openjdk/openjfx/20/default.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/21.nix
rename to pkgs/development/compilers/openjdk/openjfx/21/default.nix
diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjfx/22.nix
rename to pkgs/development/compilers/openjdk/openjfx/22/default.nix
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index c80d6c28f840..fcea99ac50f9 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -3,13 +3,13 @@
 with pkgs;
 
 let
-  openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
-  openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { };
-  openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { };
-  openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { };
-  openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { };
-  openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21.nix { };
-  openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22.nix { };
+  openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { };
+  openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15 { };
+  openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { };
+  openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19 { };
+  openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20 { };
+  openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21 { };
+  openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { };
 
 in {
   inherit openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;