diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/clang/default.nix
rename to pkgs/development/compilers/llvm/4/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/4.0/clang/purity.patch b/pkgs/development/compilers/llvm/4/clang/purity.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/clang/purity.patch
rename to pkgs/development/compilers/llvm/4/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4/default.nix
similarity index 96%
rename from pkgs/development/compilers/llvm/4.0/default.nix
rename to pkgs/development/compilers/llvm/4/default.nix
index 349545a2959..cbb3852057d 100644
--- a/pkgs/development/compilers/llvm/4.0/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -8,7 +8,7 @@ let
 
   fetch = name: sha256: fetchurl {
     url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz";
-    # Once 4.0 is released, use this instead:
+    # Once 4 is released, use this instead:
     # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/libc++/default.nix
rename to pkgs/development/compilers/llvm/4/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh
rename to pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/libc++abi.nix
rename to pkgs/development/compilers/llvm/4/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/lld.nix
rename to pkgs/development/compilers/llvm/4/lld.nix
diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/lldb.nix
rename to pkgs/development/compilers/llvm/4/lldb.nix
diff --git a/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch b/pkgs/development/compilers/llvm/4/llvm-outputs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/llvm-outputs.patch
rename to pkgs/development/compilers/llvm/4/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/llvm.nix
rename to pkgs/development/compilers/llvm/4/llvm.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f1968ebf40..75fef2685a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4759,7 +4759,7 @@ with pkgs;
 
   clang = llvmPackages.clang;
 
-  clang_40 = lowPrio llvmPackages_40.clang;
+  clang_4 = lowPrio llvmPackages_4.clang;
   clang_39 = llvmPackages_39.clang;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
@@ -5314,13 +5314,13 @@ with pkgs;
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
-  lld = lowPrio llvmPackages_40.lld;
+  lld = lowPrio llvmPackages_4.lld;
 
   lldb = llvmPackages.lldb;
 
   llvm = llvmPackages.llvm;
 
-  llvm_40 = lowPrio llvmPackages_40.llvm;
+  llvm_4 = lowPrio llvmPackages_4.llvm;
   llvm_39 = llvmPackages_39.llvm;
   llvm_38 = llvmPackages_38.llvm;
   llvm_37 = llvmPackages_37.llvm;
@@ -5358,7 +5358,7 @@ with pkgs;
     inherit (stdenvAdapters) overrideCC;
   };
 
-  llvmPackages_40 = callPackage ../development/compilers/llvm/4.0 {
+  llvmPackages_4 = callPackage ../development/compilers/llvm/4 {
     inherit (stdenvAdapters) overrideCC;
   };