diff --git a/lib/build-support.nix b/lib/build-support.nix
index d322520..ed7df6a 100644
--- a/lib/build-support.nix
+++ b/lib/build-support.nix
@@ -37,6 +37,7 @@
   mkWrappedPackage = {
     package,
     executableName ? package.meta.mainProgram or package.pname,
+    arg0 ? executableName,
     extraPackages ? [ ],
     isBinary ? true,
 
@@ -48,7 +49,7 @@
     pkgs.symlinkJoin (
       (builtins.removeAttrs args [ "package" "executableName" "extraPackages" "isBinary" ])
       // {
-        name = "wrapper-manager-wrapped-package-${package.pname}";
+        name = "wrapper-manager-wrapped-packages";
         paths = [ package ] ++ extraPackages;
 
         inherit makeWrapperArgs;
@@ -59,7 +60,7 @@
         };
         postBuild = ''
           ${postBuild}
-          wrapProgram "$out/bin/${executableName}" ''${makeWrapperArgs[@]}
+          makeWrapper "$out/bin/${arg0}" "$out/bin/${executableName}" ''${makeWrapperArgs[@]}
         '';
       });
 }
diff --git a/modules/wrapper-manager/build.nix b/modules/wrapper-manager/build.nix
index 7924d75..68676a1 100644
--- a/modules/wrapper-manager/build.nix
+++ b/modules/wrapper-manager/build.nix
@@ -82,7 +82,7 @@
             })
           else
             wrapperManagerLib.mkWrappedPackage (config.build.extraArgs // {
-              inherit (config) package executableName;
+              inherit (config) arg0 package executableName;
               inherit (config.build) isBinary makeWrapperArgs;
             });
     };