diff --git a/pkgs/by-name/cl/claude-code-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix
similarity index 51%
rename from pkgs/by-name/cl/claude-code-acp/package.nix
rename to pkgs/by-name/cl/claude-agent-acp/package.nix
index 92c4bec7ade0..d8633b21a70a 100644
--- a/pkgs/by-name/cl/claude-code-acp/package.nix
+++ b/pkgs/by-name/cl/claude-agent-acp/package.nix
@@ -5,23 +5,23 @@
 }:
 
 buildNpmPackage (finalAttrs: {
-  pname = "claude-code-acp";
-  version = "0.16.1";
+  pname = "claude-agent-acp";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
-    repo = "claude-code-acp";
+    repo = "claude-agent-acp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/HeAz0jdXhLhYGcwTgthrE7cGjKjro30GQUmAn4egXs=";
+    hash = "sha256-6c6bHuso3diW5ZfHiM2xcxGDTNG0LIL0TZd0MFVpW/E=";
   };
 
-  npmDepsHash = "sha256-poTtwIIPHcgQ2uyIUIWVOpHbdDIzVgympa7aHtuSMok=";
+  npmDepsHash = "sha256-UtiIcjgNCYMFrRpO5AlUbOyutJ3ipwIbcpMi2BqawEk=";
 
   meta = {
-    description = "ACP-compatible coding agent powered by the Claude Code SDK";
-    homepage = "https://github.com/zed-industries/claude-code-acp";
+    description = "ACP-compatible coding agent powered by the Claude Agent SDK";
+    homepage = "https://github.com/zed-industries/claude-agent-acp";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ storopoli ];
-    mainProgram = "claude-code-acp";
+    mainProgram = "claude-agent-acp";
   };
 })
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 2b787309e9eb..b38826fdc2b7 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -78,6 +78,7 @@ mapAliases {
   "@webassemblyjs/wast-refmt-1.11.1" = pkgs.wast-refmt; # Added 2025-11-06
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
   "@yaegassy/coc-nginx" = pkgs.coc-nginx; # Added 2025-11-08
+  "@zed-industries/claude-code-acp" = pkgs.claude-agent-acp; # Added 2026-03-12
   "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
   alex = throw "'alex' has been removed because it was unmaintainable in nixpkgs"; # Added 2026-02-12
   audiosprite = throw "'audiosprite' has been removed because it was abandoned upstream"; # Added 2025-11-14