diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
similarity index 100%
rename from pkgs/development/compilers/jdk/dlj-bundle-builder.sh
rename to pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
diff --git a/pkgs/development/compilers/jdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
similarity index 100%
rename from pkgs/development/compilers/jdk/jdk-linux-base.nix
rename to pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
diff --git a/pkgs/development/compilers/jdk/jdk6-construct.sh b/pkgs/development/compilers/oraclejdk/jdk6-construct.sh
similarity index 100%
rename from pkgs/development/compilers/jdk/jdk6-construct.sh
rename to pkgs/development/compilers/oraclejdk/jdk6-construct.sh
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix
similarity index 100%
rename from pkgs/development/compilers/jdk/jdk6-linux.nix
rename to pkgs/development/compilers/oraclejdk/jdk6-linux.nix
diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
similarity index 100%
rename from pkgs/development/compilers/jdk/jdk7-linux.nix
rename to pkgs/development/compilers/oraclejdk/jdk7-linux.nix
diff --git a/pkgs/development/compilers/jdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
similarity index 100%
rename from pkgs/development/compilers/jdk/jdk8-linux.nix
rename to pkgs/development/compilers/oraclejdk/jdk8-linux.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d128e171bef..7a70b2e2850 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3067,17 +3067,17 @@ let
   jdkdistro = installjdk: pluginSupport:
     assert supportsJDK;
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/jdk/jdk6-linux.nix { });
+      (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { });
 
   oraclejdk7distro = installjdk: pluginSupport:
     assert supportsJDK;
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });
+      (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; });
 
   oraclejdk8distro = installjdk: pluginSupport:
     assert supportsJDK;
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/jdk/jdk8-linux.nix { inherit installjdk; });
+      (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; });
 
   jikes = callPackage ../development/compilers/jikes { };