diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 00922ed96e2c..5b25f37bc2c0 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -192,12 +192,12 @@ let
 
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
-    libcxx = callPackage ./libc++ ({ inherit llvm_meta; } //
+    libcxx = callPackage ./libcxx ({ inherit llvm_meta; } //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
-    libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } //
+    libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
diff --git a/pkgs/development/compilers/llvm/12/libc++/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/12/libc++/default.nix
rename to pkgs/development/compilers/llvm/12/libcxx/default.nix
index d85d890879ec..7b3b26b959e4 100644
--- a/pkgs/development/compilers/llvm/12/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
diff --git a/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/12/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/12/libcxxabi/default.nix
index 22ec211a3b05..dab6c583e889 100644
--- a/pkgs/development/compilers/llvm/12/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
diff --git a/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch
rename to pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch