diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
index ac39b2f70359..1ea493890bf9 100644
--- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix
+++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz";
     hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4=";
   };
 
diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix
index 39f6040f9d98..1f79cd296bf9 100644
--- a/pkgs/by-name/al/alp/package.nix
+++ b/pkgs/by-name/al/alp/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   buildPhase = ''
     runHook preBuild
 
-    go build -o $GOPATH/bin/${pname} main.go
+    go build -o $GOPATH/bin/alp main.go
 
     runHook postBuild
   '';
diff --git a/pkgs/by-name/al/alsa-oss/package.nix b/pkgs/by-name/al/alsa-oss/package.nix
index 71c53580c286..5010c1a3dac6 100644
--- a/pkgs/by-name/al/alsa-oss/package.nix
+++ b/pkgs/by-name/al/alsa-oss/package.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1.8";
 
   src = fetchurl {
-    url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2";
+    url = "mirror://alsa/oss-lib/alsa-oss-${version}.tar.bz2";
     sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4";
   };
 
diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix
index bba1944f109e..2d123e460a06 100644
--- a/pkgs/by-name/al/alsa-plugins/package.nix
+++ b/pkgs/by-name/al/alsa-plugins/package.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2.12";
 
   src = fetchurl {
-    url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
+    url = "mirror://alsa/plugins/alsa-plugins-${version}.tar.bz2";
     hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI=";
   };
 
diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix
index b2e2889ee21e..6224bafc6c54 100644
--- a/pkgs/by-name/al/alsa-ucm-conf/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2.11";
 
   src = fetchurl {
-    url = "mirror://alsa/lib/${pname}-${version}.tar.bz2";
+    url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2";
     hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE=";
   };
 
diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix
index 401c66beb703..cadf42149fbc 100644
--- a/pkgs/by-name/al/alsa-utils/package.nix
+++ b/pkgs/by-name/al/alsa-utils/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   version = "1.2.10";
 
   src = fetchurl {
-    url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
+    url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2";
     sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo=";
   };
   patches = [
diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index 6ea894c95494..66ad50e47dfe 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postInstall = ''
-    install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/${pname}/examples/
+    install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/anyrun/examples/
   '';
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix
index 43b630607b76..b2fcb5ff6317 100644
--- a/pkgs/by-name/as/assemblyscript/package.nix
+++ b/pkgs/by-name/as/assemblyscript/package.nix
@@ -9,7 +9,7 @@ buildNpmPackage rec {
 
   src = fetchFromGitHub {
     owner = "AssemblyScript";
-    repo = pname;
+    repo = "assemblyscript";
     rev = "v${version}";
     sha256 = "sha256-Jhjq+kLRzDesTPHHonImCnuzt1Ay04n7+O9aK4knb5g=";
   };
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   npmDepsHash = "sha256-mWRQPQVprM+9SCYd8M7NMDtiwDjSH5cr4Xlr5VP9eHo=";
 
   meta = with lib; {
-    homepage = "https://github.com/AssemblyScript/${pname}";
+    homepage = "https://github.com/AssemblyScript/assemblyscript";
     description = "TypeScript-like language for WebAssembly";
     license = licenses.asl20;
     maintainers = with maintainers; [ lucperkins ];
diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix
index a1a4df946704..91008472059b 100644
--- a/pkgs/by-name/au/audiobookshelf/package.nix
+++ b/pkgs/by-name/au/audiobookshelf/package.nix
@@ -20,13 +20,13 @@ let
 
   src = fetchFromGitHub {
     owner = "advplyr";
-    repo = pname;
+    repo = "audiobookshelf";
     rev = "refs/tags/v${source.version}";
     inherit (source) hash;
   };
 
   client = buildNpmPackage {
-    pname = "${pname}-client";
+    pname = "audiobookshelf-client";
     inherit (source) version;
 
     src = runCommand "cp-source" { } ''
@@ -74,13 +74,13 @@ buildNpmPackage {
   installPhase = ''
     mkdir -p $out/opt/client
     cp -r index.js server package* node_modules $out/opt/
-    cp -r ${client}/lib/node_modules/${pname}-client/dist $out/opt/client/dist
+    cp -r ${client}/lib/node_modules/audiobookshelf-client/dist $out/opt/client/dist
     mkdir $out/bin
 
-    echo '${wrapper}' > $out/bin/${pname}
-    echo "  exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/${pname}
+    echo '${wrapper}' > $out/bin/audiobookshelf
+    echo "  exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf
 
-    chmod +x $out/bin/${pname}
+    chmod +x $out/bin/audiobookshelf
   '';
 
   passthru = {
diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix
index 3978661baabb..c57ea6c12942 100644
--- a/pkgs/by-name/ba/baobab/package.nix
+++ b/pkgs/by-name/ba/baobab/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz";
     hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w=";
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "baobab";
     };
   };
 
diff --git a/pkgs/by-name/br/braa/package.nix b/pkgs/by-name/br/braa/package.nix
index a3b416ae482e..b4a482bfa8e4 100644
--- a/pkgs/by-name/br/braa/package.nix
+++ b/pkgs/by-name/br/braa/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "0.82";
 
   src = fetchzip {
-    url = "http://s-tech.elsat.net.pl/${pname}/${pname}-${version}.tar.gz";
+    url = "http://s-tech.elsat.net.pl/braa/braa-${version}.tar.gz";
     hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA=";
   };
 
diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix
index f5ed5d0882dc..0ea130064e3d 100644
--- a/pkgs/by-name/br/brill/package.nix
+++ b/pkgs/by-name/br/brill/package.nix
@@ -14,8 +14,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm644 *.ttf          -t $out/share/fonts/truetype
-    install -Dm644 *agreement.pdf -t $out/share/licenses/${pname}
-    install -Dm644 *use.pdf       -t $out/share/doc/${pname}
+    install -Dm644 *agreement.pdf -t $out/share/licenses/brill
+    install -Dm644 *use.pdf       -t $out/share/doc/brill
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index d170da92d8c7..c195ead5764c 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
       inherit (nixosTests) centrifugo;
       version = testers.testVersion {
         package = centrifugo;
-        command = "${pname} version";
+        command = "centrifugo version";
         version = "v${version}";
       };
     };
diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix
index 9ac53092c114..4a39d865d363 100644
--- a/pkgs/by-name/ch/cheese/package.nix
+++ b/pkgs/by-name/ch/cheese/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "man" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/cheese/${lib.versions.major version}/cheese-${version}.tar.xz";
     sha256 = "XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4=";
   };
 
diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix
index 2e0a07fe5d5e..9fe357071439 100644
--- a/pkgs/by-name/cl/cljfmt/package.nix
+++ b/pkgs/by-name/cl/cljfmt/package.nix
@@ -11,7 +11,7 @@ buildGraalvmNativeImage rec {
   version = "0.12.0";
 
   src = fetchurl {
-    url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar";
+    url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar";
     sha256 = "sha256-JdrMsRmTT8U8RZDI2SnQxM5WGMpo1pL2CQ5BqLxcf5M=";
   };
 
diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix
index 25a0952fc7da..78c692181f4e 100644
--- a/pkgs/by-name/co/coppwr/package.nix
+++ b/pkgs/by-name/co/coppwr/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postFixup = ''
-    patchelf $out/bin/${pname} \
+    patchelf $out/bin/coppwr \
       --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]}
   '';
 
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 127837e3f322..2c8cd21562de 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = pname;
+    repo = "cosmic-edit";
     rev = "epoch-${version}";
     hash = "sha256-ZG5Ctyp2crTDS0WxhQqwN4T6WR5qW79HTbICMlOA3P8=";
   };
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage rec {
 
   # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
   postInstall = ''
-    wrapProgram "$out/bin/${pname}" \
+    wrapProgram "$out/bin/cosmic-edit" \
       --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
         xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland
diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index 4e03188b5faf..32994724519a 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = pname;
+    repo = "cosmic-files";
     rev = "epoch-${version}";
     hash = "sha256-UwQwZRzOyMvLRRmU2noxGrqblezkR8J2PNMVoyG0M0w=";
   };
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
 
   # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
   postInstall = ''
-    wrapProgram "$out/bin/${pname}" \
+    wrapProgram "$out/bin/cosmic-files" \
       --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi wayland ]}
   '';
diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 216be5d959fb..c2859ba558de 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = pname;
+    repo = "cosmic-store";
     rev = "epoch-${version}";
     hash = "sha256-RuqWO2/sqMMd9xMRClAy7cwv7iCTEC15TZ7JLBZ2zwM=";
     fetchSubmodules = true;
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec {
 
   # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
   postInstall = ''
-    wrapProgram "$out/bin/${pname}" \
+    wrapProgram "$out/bin/cosmic-store" \
       --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index bd0fde3b8c95..699c8a8564e3 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = pname;
+    repo = "cosmic-term";
     rev = "epoch-${version}";
     hash = "sha256-dY4QGQXJFL+yjCYRGCg3NfMLMjlEBSEmxHn68PvhCAQ=";
   };
@@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec {
 
   # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
   postInstall = ''
-    wrapProgram "$out/bin/${pname}" \
+    wrapProgram "$out/bin/cosmic-term" \
       --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
         libxkbcommon
diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix
index 12ce3f76edeb..8016d2db2fe2 100644
--- a/pkgs/by-name/cr/crate2nix/package.nix
+++ b/pkgs/by-name/cr/crate2nix/package.nix
@@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "nix-community";
-    repo = pname;
+    repo = "crate2nix";
     rev = version;
     hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=";
   };
 
-  sourceRoot = "${src.name}/${pname}";
+  sourceRoot = "${src.name}/crate2nix";
 
   cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE=";
 
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   postInstall = ''
-    wrapProgram $out/bin/${pname} \
+    wrapProgram $out/bin/crate2nix \
       --prefix PATH ":" ${
         lib.makeBinPath [
           cargo
@@ -44,8 +44,8 @@ rustPlatform.buildRustPackage rec {
 
       for shell in bash zsh fish
       do
-        $out/bin/${pname} completions -s $shell
-        installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname}
+        $out/bin/crate2nix completions -s $shell
+        installShellCompletion crate2nix.$shell || installShellCompletion --$shell _crate2nix
       done
   '';
 
diff --git a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix
index 14f89056daf9..32470d4ab4ba 100644
--- a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix
+++ b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     # for lib/cups/filter/kyofilter_pre_H
     wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs"
 
-    install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright
+    install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/cups-kyocera-3500-4500/copyright
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix
index ff7f8fe14a7f..0e9d311c4dc7 100644
--- a/pkgs/by-name/db/dbqn/package.nix
+++ b/pkgs/by-name/db/dbqn/package.nix
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
   '' + (if buildNativeImage then ''
     mv dbqn $out/bin
   '' else ''
-    mkdir -p $out/share/${pname}
-    mv BQN.jar $out/share/${pname}/
+    mkdir -p $out/share/dbqn
+    mv BQN.jar $out/share/dbqn/
 
     makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \
-      --add-flags "-jar $out/share/${pname}/BQN.jar"
+      --add-flags "-jar $out/share/dbqn/BQN.jar"
   '') + ''
     ln -s $out/bin/dbqn $out/bin/bqn
 
diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix
index 44fca17bec32..b40371f51487 100644
--- a/pkgs/by-name/dc/dconf-editor/package.nix
+++ b/pkgs/by-name/dc/dconf-editor/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   version = "45.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz";
     sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
   };
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "dconf-editor";
     };
   };
 
diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix
index 97795c1d9f7a..54991136da64 100644
--- a/pkgs/by-name/de/devhelp/package.nix
+++ b/pkgs/by-name/de/devhelp/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/devhelp-${version}.tar.xz";
     sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ=";
   };
 
diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 8121f554a291..0c9265415f15 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   ];
 
   passthru.tests = {
-    simple = runCommand "${pname}-test" { } ''
+    simple = runCommand "dmarc-report-converter-test" { } ''
       ${dmarc-report-converter}/bin/dmarc-report-converter -h > $out
     '';
   };
diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix
index 585d072dae42..b355f96513c9 100644
--- a/pkgs/by-name/en/engage/package.nix
+++ b/pkgs/by-name/en/engage/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitLab {
     domain = "gitlab.computer.surgery";
     owner = "charles";
-    repo = pname;
+    repo = "engage";
     rev = "v${version}";
     hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk=";
   };
@@ -27,11 +27,11 @@ rustPlatform.buildRustPackage {
   ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
-    "installShellCompletion --cmd ${pname} "
+    "installShellCompletion --cmd engage "
     + builtins.concatStringsSep
       " "
       (builtins.map
-        (shell: "--${shell} <($out/bin/${pname} completions ${shell})")
+        (shell: "--${shell} <($out/bin/engage completions ${shell})")
         [
           "bash"
           "fish"
diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index 27aa4149e6c5..9ef4b303828b 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz";
     sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4=";
   };
 
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "eog";
     };
   };
 
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index fce52129f0ac..228e20ae0eab 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
     hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc=";
   };
 
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \
-      --subst-var-by EDS ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
+      --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \
       --subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas}
     patches="$patches $PWD/hardcode-gsettings.patch"
   '';
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = lib.optionalString stdenv.isDarwin ''
-    ln -s $out/lib/${pname}/*.dylib $out/lib/
+    ln -s $out/lib/evolution-data-server/*.dylib $out/lib/
   '';
 
   passthru = {
diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix
index aae851fbacd5..6ff964c684e9 100644
--- a/pkgs/by-name/fi/find-billy/package.nix
+++ b/pkgs/by-name/fi/find-billy/package.nix
@@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
     ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
 
     mkdir -p $out/share/find-billy
-    godot3-headless --export-pack 'Linux/X11' $out/share/${pname}/${pname}.pck
-    makeWrapper ${godot3}/bin/godot3 $out/bin/${pname} \
+    godot3-headless --export-pack 'Linux/X11' $out/share/find-billy/find-billy.pck
+    makeWrapper ${godot3}/bin/godot3 $out/bin/find-billy \
       --add-flags "--main-pack" \
-      --add-flags "$out/share/${pname}/${pname}.pck"
+      --add-flags "$out/share/find-billy/find-billy.pck"
 
     runHook postBuild
   '';
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     just build-icons
-    install -D ${pname}.desktop -t $out/share/applications
+    install -D find-billy.desktop -t $out/share/applications
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 5425fd2da084..b84ec2044032 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   postInstall = ''
-    mv $out/share/php/${pname}/* $out/
+    mv $out/share/php/firefly-iii/* $out/
     rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules
     ln -s ${dataDir}/storage $out/storage
     ln -s ${dataDir}/cache $out/bootstrap/cache
diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix
index 96fd659e47e7..990414e219c9 100644
--- a/pkgs/by-name/fu/fuchsia-cursor/package.nix
+++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "ful1e5";
-    repo = pname;
+    repo = "fuchsia-cursor";
     rev = "v${version}";
     hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM=";
   };
diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix
index 565ed9ae2d23..66f7bc222c27 100644
--- a/pkgs/by-name/ge/geary/package.nix
+++ b/pkgs/by-name/ge/geary/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/geary/${lib.versions.major version}/geary-${version}.tar.xz";
     sha256 = "r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE=";
   };
 
@@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "geary";
     };
   };
 
diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index 95c4448025ef..0d81d0ba969f 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz";
     hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E=";
   };
 
diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix
index 923f1ccc28bf..5c99f00c1206 100644
--- a/pkgs/by-name/gi/gitg/package.nix
+++ b/pkgs/by-name/gi/gitg/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   version = "44";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gitg/${lib.versions.majorMinor version}/gitg-${version}.tar.xz";
     hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
   };
 
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gitg";
     };
   };
 
diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix
index 0406ba52e231..15500ed8ea9d 100644
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@@ -51,7 +51,7 @@ in buildGoModule rec {
     "-X github.com/glasskube/glasskube/internal/config.Commit=${src.rev}"
   ];
 
-  subPackages = [ "cmd/${pname}" "cmd/package-operator" ];
+  subPackages = [ "cmd/glasskube" "cmd/package-operator" ];
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix
index dfbcc24898b5..75c971559f7b 100644
--- a/pkgs/by-name/gn/gnome-autoar/package.nix
+++ b/pkgs/by-name/gn/gnome-autoar/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz";
     sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix
index 577a8245426a..d1008f4867b7 100644
--- a/pkgs/by-name/gn/gnome-calculator/package.nix
+++ b/pkgs/by-name/gn/gnome-calculator/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   version = "46.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz";
     hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix
index a751ee382271..15108e40856e 100644
--- a/pkgs/by-name/gn/gnome-calendar/package.nix
+++ b/pkgs/by-name/gn/gnome-calendar/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   version = "46.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz";
     hash = "sha256-mGH/e4q9W3sgaQulXrdULH7FNLVmJp4ptbHoWMFhCJc=";
   };
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-calendar";
     };
   };
 
diff --git a/pkgs/by-name/gn/gnome-common/package.nix b/pkgs/by-name/gn/gnome-common/package.nix
index 0f9a1269b6ba..1954088e6587 100644
--- a/pkgs/by-name/gn/gnome-common/package.nix
+++ b/pkgs/by-name/gn/gnome-common/package.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.18.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.xz";
     sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
   };
 
diff --git a/pkgs/by-name/gn/gnome-dictionary/package.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix
index 9db61b591eb7..7e11d1dec189 100644
--- a/pkgs/by-name/gn/gnome-dictionary/package.nix
+++ b/pkgs/by-name/gn/gnome-dictionary/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   version = "40.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/gnome-dictionary-${version}.tar.xz";
     sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f";
   };
 
diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index 4ca25e2cf822..dd65e5727623 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/gnome-disk-utility-${version}.tar.xz";
     hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix
index c97bad1879b8..c05243ecb529 100644
--- a/pkgs/by-name/gn/gnome-font-viewer/package.nix
+++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz";
     hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix
index ee5b243adfc7..c26662eaec0b 100644
--- a/pkgs/by-name/gn/gnome-keyring/package.nix
+++ b/pkgs/by-name/gn/gnome-keyring/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/gnome-keyring-${version}.tar.xz";
     hash = "sha256-vybJZriot/MoXsyLs+RnucIPlTW5TcRRycVZ3c/2GSU=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-screenshot/package.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix
index e282277469f0..7af7cec11bfc 100644
--- a/pkgs/by-name/gn/gnome-screenshot/package.nix
+++ b/pkgs/by-name/gn/gnome-screenshot/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   version = "41.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-screenshot/${lib.versions.major version}/gnome-screenshot-${version}.tar.xz";
     sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc=";
   };
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-screenshot";
     };
   };
 
diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix
index 27c4576e0170..4ce32f874b19 100644
--- a/pkgs/by-name/gn/gnome-system-monitor/package.nix
+++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/gnome-system-monitor-${version}.tar.xz";
     hash = "sha256-U3YkgVjGhsMIJVRy6MKp5MFyVWQsFJ/HGYxtA05UdZk=";
   };
 
diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix
index b80e46b42d51..d67fc5d2c74b 100644
--- a/pkgs/by-name/gn/gnucap/package.nix
+++ b/pkgs/by-name/gn/gnucap/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz";
+    url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-${version}.tar.gz";
     hash = "sha256-MUCtGw3BxGWgXgUwzklq5T1y9kjBTnFBa0/GK0hhl0E=";
   };
 
diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix
index beb62fc1ce8a..57835efc4acc 100644
--- a/pkgs/by-name/go/goredo/package.nix
+++ b/pkgs/by-name/go/goredo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   version = "2.6.0";
 
   src = fetchurl {
-    url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst";
+    url = "http://www.goredo.cypherpunks.ru/download/goredo-${version}.tar.zst";
     hash = "sha256-XTL/otfCKC55TsUBBVors2kgFpOFh+6oekOOafOhcUs=";
   };
 
diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix
index ac2a95b09f1a..3d4713f70966 100644
--- a/pkgs/by-name/gu/guile-semver/package.nix
+++ b/pkgs/by-name/gu/guile-semver/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "0.1.1";
 
   src = fetchurl {
-    url = "https://files.ngyro.com/guile-semver/${pname}-${version}.tar.gz";
+    url = "https://files.ngyro.com/guile-semver/guile-semver-${version}.tar.gz";
     hash = "sha256-T3kJGTdf6yBKjqLtqSopHZu03kyOscZ3Z4RYmoYlN4E=";
   };
 
diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index a7787fd8ece6..8caaddf8b465 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "halo";
   version = "2.18.0";
   src = fetchurl {
-    url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
+    url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
     hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM=";
   };
 
diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix
index 186c4918b994..7353a8ed6aca 100644
--- a/pkgs/by-name/in/intiface-central/package.nix
+++ b/pkgs/by-name/in/intiface-central/package.nix
@@ -14,7 +14,7 @@ flutterPackages.v3_19.buildFlutterApplication rec {
   version = "2.6.0";
   src = fetchFromGitHub {
     owner = "intiface";
-    repo = pname;
+    repo = "intiface-central";
     rev = "v${version}";
     hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE=";
   };
diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix
index 945efaec3c19..8fa8aa976e34 100644
--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   version = "1.2405.17-jammy";
 
   src = fetchurl {
-    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb";
+    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
     hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk=";
   };
 
diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix
index e8228113881f..03f231ca365c 100644
--- a/pkgs/by-name/is/iscc/package.nix
+++ b/pkgs/by-name/is/iscc/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
     cp -r ./app/* "$out/bin"
 
-    cat << 'EOF' > "$out/bin/${pname}"
+    cat << 'EOF' > "$out/bin/iscc"
     #!${runtimeShell}
     export PATH=${wineWow64Packages.stable}/bin:$PATH
     export WINEDLLOVERRIDES="mscoree=" # disable mono
@@ -44,10 +44,10 @@ stdenv.mkDerivation rec {
     ${wineWow64Packages.stable}/bin/wine "$out/bin/ISCC.exe" "$wineInputFile"
     EOF
 
-    substituteInPlace $out/bin/${pname} \
+    substituteInPlace $out/bin/iscc \
       --replace "\$out" "$out"
 
-    chmod +x "$out/bin/${pname}"
+    chmod +x "$out/bin/iscc"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 7c88f7e4634d..d311e8785d5f 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -22,7 +22,7 @@ let
       nativeBuildInputs = [ appimageTools.appimage-exec ];
     }
     ''
-      appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname}
+      appimage-exec.sh -x $out ${src}/jetbrains-toolbox-${version}/jetbrains-toolbox
 
       # JetBrains ship a broken desktop file. Despite registering a custom
       # scheme handler for jetbrains:// URLs, they never mark the command as
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     runHook preInstall
 
     install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
-    makeWrapper ${appimage}/bin/${pname} $out/bin/${pname} \
+    makeWrapper ${appimage}/bin/jetbrains-toolbox $out/bin/jetbrains-toolbox \
       --append-flags "--update-failed" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]}
 
diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix
index 8ae46e7f5dc8..80f35d3d827d 100644
--- a/pkgs/by-name/jn/jnr-posix/package.nix
+++ b/pkgs/by-name/jn/jnr-posix/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar
+    install -D target/jnr-posix-${version}.jar $out/share/java/jnr-posix-${version}.jar
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix
index 5b28107f7b2d..5438236d1a7b 100644
--- a/pkgs/by-name/ke/keymapp/package.nix
+++ b/pkgs/by-name/ke/keymapp/package.nix
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -m755 -D keymapp "$out/bin/${pname}"
-    install -Dm644 icon.png "$out/share/pixmaps/${pname}.png"
+    install -m755 -D keymapp "$out/bin/keymapp"
+    install -Dm644 icon.png "$out/share/pixmaps/keymapp.png"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index c533b8fdb872..fc61d7c0d48f 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -73,7 +73,7 @@ buildDotnetModule rec {
 
   preFixup = ''
     # remove binaries for other platform, like upstream does
-    pushd $out/lib/${pname}
+    pushd $out/lib/libation
     rm -f *.x86.dll *.x64.dll
     ${lib.optionalString (stdenv.system != "x86_64-linux") "rm -f *.x64.so"}
     ${lib.optionalString (stdenv.system != "aarch64-linux") "rm -f *.arm64.so"}
@@ -81,9 +81,9 @@ buildDotnetModule rec {
     ${lib.optionalString (stdenv.system != "aarch64-darwin") "rm -f *.arm64.dylib"}
     popd
 
-    wrapDotnetProgram $out/lib/${pname}/Libation $out/bin/libation
-    wrapDotnetProgram $out/lib/${pname}/LibationCli $out/bin/libationcli
-    wrapDotnetProgram $out/lib/${pname}/Hangover $out/bin/hangover
+    wrapDotnetProgram $out/lib/libation/Libation $out/bin/libation
+    wrapDotnetProgram $out/lib/libation/LibationCli $out/bin/libationcli
+    wrapDotnetProgram $out/lib/libation/Hangover $out/bin/hangover
   '';
 
   meta = {
diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix
index b6c2120cd9ea..f9dce02b5d40 100644
--- a/pkgs/by-name/li/libeduvpn-common/package.nix
+++ b/pkgs/by-name/li/libeduvpn-common/package.nix
@@ -16,13 +16,13 @@ buildGoModule rec {
 
   buildPhase = ''
     runHook preBuild
-    go build -o ${pname}-${version}.so -buildmode=c-shared -tags=release ./exports
+    go build -o libeduvpn-common-${version}.so -buildmode=c-shared -tags=release ./exports
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
-    install -Dt $out/lib ${pname}-${version}.so
+    install -Dt $out/lib libeduvpn-common-${version}.so
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index 8db98ea2b664..435d15c34a5d 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
-    rev = "${pname}-${version}";
+    rev = "libmamba-${version}";
     hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix
index c026a8b7ce07..a4150b8786b5 100644
--- a/pkgs/by-name/li/littlefs-fuse/package.nix
+++ b/pkgs/by-name/li/littlefs-fuse/package.nix
@@ -5,15 +5,15 @@ stdenv.mkDerivation rec {
   version = "2.7.8";
   src = fetchFromGitHub {
     owner = "littlefs-project";
-    repo = pname;
+    repo = "littlefs-fuse";
     rev = "v${version}";
     hash = "sha256-dJt2Tcw+qdcOoZ9ejao9NXys/OYQTvbP9+dD6DCzFAw=";
   };
   buildInputs = [ fuse ];
   installPhase = ''
     runHook preInstall
-    install -D lfs $out/bin/${pname}
-    ln -s $out/bin/${pname} $out/bin/mount.littlefs
+    install -D lfs $out/bin/littlefs-fuse
+    ln -s $out/bin/littlefs-fuse $out/bin/mount.littlefs
     ln -s $out/bin $out/sbin
     runHook postInstall
   '';
diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index 2ede057a2fc7..72bedaf64f36 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -33,7 +33,7 @@ in {
   src = fetchurl {
     inherit hash;
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-${suffix}";
-    name = lib.optionalString stdenv.isLinux "${pname}-${version}.AppImage";
+    name = lib.optionalString stdenv.isLinux "logseq-${version}.AppImage";
   };
 
   nativeBuildInputs = [ makeWrapper ]
@@ -52,35 +52,35 @@ in {
    appimageContents = appimageTools.extract { inherit pname src version; };
   in
   ''
-    mkdir -p $out/bin $out/share/${pname} $out/share/applications
-    cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
-    cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop
+    mkdir -p $out/bin $out/share/logseq $out/share/applications
+    cp -a ${appimageContents}/{locales,resources} $out/share/logseq
+    cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop
 
     # remove the `git` in `dugite` because we want the `git` in `nixpkgs`
-    chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git
-    chmod +w $out/share/${pname}/resources/app/node_modules/dugite
-    rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git
-    chmod -w $out/share/${pname}/resources/app/node_modules/dugite
+    chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git
+    chmod +w $out/share/logseq/resources/app/node_modules/dugite
+    rm -rf $out/share/logseq/resources/app/node_modules/dugite/git
+    chmod -w $out/share/logseq/resources/app/node_modules/dugite
 
     mkdir -p $out/share/pixmaps
-    ln -s $out/share/${pname}/resources/app/icons/logseq.png $out/share/pixmaps/${pname}.png
+    ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png
 
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace Exec=Logseq Exec=${pname} \
-      --replace Icon=Logseq Icon=${pname}
+    substituteInPlace $out/share/applications/logseq.desktop \
+      --replace Exec=Logseq Exec=logseq \
+      --replace Icon=Logseq Icon=logseq
   '') + lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/{Applications/Logseq.app,bin}
     cp -R . $out/Applications/Logseq.app
-    makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/${pname}
+    makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq
   '' + ''
     runHook postInstall
   '';
 
   postFixup = lib.optionalString stdenv.isLinux ''
     # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
-    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+    makeWrapper ${electron}/bin/electron $out/bin/logseq \
       --set "LOCAL_GIT_DIRECTORY" ${git} \
-      --add-flags $out/share/${pname}/resources/app \
+      --add-flags $out/share/logseq/resources/app \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
   '';
 
diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix
index d4b2d8969597..fc8bb799930f 100644
--- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix
+++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix
@@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation rec {
   pname = "lxgw-wenkai-tc";
   version = "1.330";
   src = fetchurl {
-    url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/${pname}-v${version}.tar.gz";
+    url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz";
     hash = "sha256-qpX5shH1HbGMa287u/R1rMFgQeAUC0wwKFVD+QSTyho=";
   };
 
diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix
index 1ab977d04e82..2866d38da4cd 100644
--- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix
+++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "2.0.1";
 
   src = fetchurl {
-    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb";
+    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb";
     hash = "sha256-O9zbImSWMrRsaOozj5PsCRvQ3UsaJzLfoTohmLZvLkM=";
   };
 
diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix
index bc35c9598847..525918caab20 100644
--- a/pkgs/by-name/mi/minetest-mapserver/package.nix
+++ b/pkgs/by-name/mi/minetest-mapserver/package.nix
@@ -8,7 +8,7 @@ buildGoModule rec {
   version = "4.9.1";
 
   src = fetchFromGitHub {
-    owner = pname;
+    owner = "minetest-mapserver";
     repo = "mapserver";
     rev = "v${version}";
     hash = "sha256-3bL23hwJgYMPV2nSSfq9plttcx7UYvhUa6OCbKfBACY=";
@@ -19,8 +19,8 @@ buildGoModule rec {
   meta = with lib; {
     description = "Realtime mapserver for minetest";
     mainProgram = "mapserver";
-    homepage = "https://github.com/${pname}/mapserver/blob/master/readme.md";
-    changelog = "https://github.com/${pname}/mapserver/releases/tag/v${version}";
+    homepage = "https://github.com/minetest-mapserver/mapserver/blob/master/readme.md";
+    changelog = "https://github.com/minetest-mapserver/mapserver/releases/tag/v${version}";
     license = with licenses; [ mit cc-by-sa-30 ];
     platforms = platforms.all;
     maintainers = with maintainers; [ gm6k ];
diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix
index 2fcccf8c6c9e..b06f097c76d8 100644
--- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix
+++ b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "1.0.1";
 
   src = fetchurl {
-    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb";
+    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msalsdk-dbusclient/msalsdk-dbusclient_${version}_amd64.deb";
     hash = "sha256-AVPrNxCjXGza2gGETP0YrlXeEgI6AjlrSVTtqKb2UBI=";
   };
 
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index 4b7076a8e03e..9b51e9715906 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromSourcehut {
     owner = "~soywod";
-    repo = "${pname}-cli";
+    repo = "neverest-cli";
     rev = "v${version}";
     hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE=";
   };
diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix
index b11fe8ee740e..81a5d52ee72b 100644
--- a/pkgs/by-name/nf/nf-test/package.nix
+++ b/pkgs/by-name/nf/nf-test/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "0.9.0";
 
   src = fetchurl {
-    url = "https://github.com/askimed/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/askimed/nf-test/releases/download/v${version}/nf-test-${version}.tar.gz";
     hash = "sha256-PhI866NrbokMsSrU6YeSv03S1+VcNqVJsocI3xPfDcc=";
   };
   sourceRoot = ".";
diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index f9dcdb5031bd..829b1bf8a4a4 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec {
     darwin.apple_sdk.frameworks.Security
   ];
 
-  env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/${pname}/modules";
+  env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
 
   postInstall = ''
-    mkdir -p $out/share/${pname}
-    cp -r $src/${pname}/modules $out/share/${pname}/
+    mkdir -p $out/share/numbat
+    cp -r $src/numbat/modules $out/share/numbat/
   '';
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/pd/pdf2odt/package.nix b/pkgs/by-name/pd/pdf2odt/package.nix
index 809af8919343..a5d14a6fc299 100644
--- a/pkgs/by-name/pd/pdf2odt/package.nix
+++ b/pkgs/by-name/pd/pdf2odt/package.nix
@@ -28,7 +28,7 @@ resholve.mkDerivation rec {
     runHook preInstall
 
     install -Dm0555 pdf2odt           -t $out/bin
-    install -Dm0444 README.md LICENSE -t $out/share/doc/${pname}
+    install -Dm0444 README.md LICENSE -t $out/share/doc/pdf2odt
 
     ln -rs $out/bin/pdf2odt $out/bin/pdf2ods
 
diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix
index fe94bdc0a147..e96b55472637 100644
--- a/pkgs/by-name/pl/plemoljp-hs/package.nix
+++ b/pkgs/by-name/pl/plemoljp-hs/package.nix
@@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm444 PlemolJP_HS/*.ttf -t $out/share/fonts/truetype/${pname}
-    install -Dm444 PlemolJP35_HS/*.ttf -t $out/share/fonts/truetype/${pname}-35
-    install -Dm444 PlemolJPConsole_HS/*.ttf -t $out/share/fonts/truetype/${pname}-console
-    install -Dm444 PlemolJP35Console_HS/*.ttf -t $out/share/fonts/truetype/${pname}-35console
+    install -Dm444 PlemolJP_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs
+    install -Dm444 PlemolJP35_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-35
+    install -Dm444 PlemolJPConsole_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-console
+    install -Dm444 PlemolJP35Console_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-35console
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix
index 40687bb720f9..c4675319ec0e 100644
--- a/pkgs/by-name/pl/plemoljp-nf/package.nix
+++ b/pkgs/by-name/pl/plemoljp-nf/package.nix
@@ -12,8 +12,8 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm444 PlemolJPConsole_NF/*.ttf -t $out/share/fonts/truetype/${pname}-console
-    install -Dm444 PlemolJP35Console_NF/*.ttf -t $out/share/fonts/truetype/${pname}-35console
+    install -Dm444 PlemolJPConsole_NF/*.ttf -t $out/share/fonts/truetype/plemoljp-nf-console
+    install -Dm444 PlemolJP35Console_NF/*.ttf -t $out/share/fonts/truetype/plemoljp-nf-35console
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix
index 43472cb743e0..8f7f092de310 100644
--- a/pkgs/by-name/pl/plemoljp/package.nix
+++ b/pkgs/by-name/pl/plemoljp/package.nix
@@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm444 PlemolJP/*.ttf -t $out/share/fonts/truetype/${pname}
-    install -Dm444 PlemolJP35/*.ttf -t $out/share/fonts/truetype/${pname}-35
-    install -Dm444 PlemolJPConsole/*.ttf -t $out/share/fonts/truetype/${pname}-console
-    install -Dm444 PlemolJP35Console/*.ttf -t $out/share/fonts/truetype/${pname}-35console
+    install -Dm444 PlemolJP/*.ttf -t $out/share/fonts/truetype/plemoljp
+    install -Dm444 PlemolJP35/*.ttf -t $out/share/fonts/truetype/plemoljp-35
+    install -Dm444 PlemolJPConsole/*.ttf -t $out/share/fonts/truetype/plemoljp-console
+    install -Dm444 PlemolJP35Console/*.ttf -t $out/share/fonts/truetype/plemoljp-35console
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index 0e19eb417167..d108ed652b10 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "moonrepo";
-    repo = pname;
+    repo = "proto";
     rev = "v${version}";
     hash = "sha256-o/du9XmiS7U5ypm6osQtVTjrJY60iLCkJ4DWCYOeIoY=";
   };
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     # proto looks up a proto-shim executable file in $PROTO_LOOKUP_DIR
-    wrapProgram $out/bin/${pname} \
+    wrapProgram $out/bin/proto \
       --set PROTO_LOOKUP_DIR $out/bin
   '';
 
diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix
index c1b925e200bb..b78ac0a2b50d 100644
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@@ -15,7 +15,7 @@ buildDotnetModule rec {
 
   src = fetchFromGitHub {
     owner = "mattpannella";
-    repo = "${pname}";
+    repo = "pupdate";
     rev = "${version}";
     hash = "sha256-odlKNp6kjOAYeRIHnLniqkCXTi1UXF3szn8tJtrxzQU=";
   };
diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix
index 953674cd3ec5..b46d30355a29 100644
--- a/pkgs/by-name/pw/pw3270/package.nix
+++ b/pkgs/by-name/pw/pw3270/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "PerryWerneck";
-    repo = pname;
+    repo = "pw3270";
     rev = version;
     hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g=";
   };
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Schemas get installed to wrong directory.
     mkdir -p $out/share/glib-2.0
-    mv $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas $out/share/glib-2.0/
+    mv $out/share/gsettings-schemas/pw3270-${version}/glib-2.0/schemas $out/share/glib-2.0/
     rm -rf $out/share/gsettings-schemas
   '';
 
diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix
index a613bea272aa..6d94200fcc9c 100644
--- a/pkgs/by-name/ra/ratchet/package.nix
+++ b/pkgs/by-name/ra/ratchet/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
     [
       "-s"
       "-w"
-      "-X ${package_url}/internal/version.name=${pname}"
+      "-X ${package_url}/internal/version.name=ratchet"
       "-X ${package_url}/internal/version.version=${version}"
       "-X ${package_url}/internal/version.commit=${src.rev}"
     ];
diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix
index 397d03a13e13..d25117c00b4c 100644
--- a/pkgs/by-name/re/read-it-later/package.nix
+++ b/pkgs/by-name/re/read-it-later/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
-    repo = pname;
+    repo = "read-it-later";
     rev = version;
     hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY=";
   };
diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix
index 7dbd0434ba41..f15b9b365a4b 100644
--- a/pkgs/by-name/re/redmine/package.nix
+++ b/pkgs/by-name/re/redmine/package.nix
@@ -15,7 +15,7 @@ in
     inherit version;
 
     src = fetchurl {
-      url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
+      url = "https://www.redmine.org/releases/redmine-${version}.tar.gz";
       hash = "sha256-iiIyD9nJQOZZjzrV+3o5MxlchgaO7plLpvzcIsXOy1k=";
     };
 
diff --git a/pkgs/by-name/re/regina/package.nix b/pkgs/by-name/re/regina/package.nix
index f551d09dfc72..f805ffe2465f 100644
--- a/pkgs/by-name/re/regina/package.nix
+++ b/pkgs/by-name/re/regina/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "3.9.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/regina-rexx-${version}.tar.gz";
     hash = "sha256-7ZjHp/HVpBSLAv7xsWruSmpthljQGoDPXFAwFe8Br6U=";
   };
 
diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index a8dc3d9828f7..a26a00a41d37 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
 
     cp -aR . "$out/share/regripper/"
 
-    cat > "$out/bin/${pname}" << EOF
+    cat > "$out/bin/regripper" << EOF
     #!${runtimeShell}
     exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@"
     EOF
 
-    chmod u+x  "$out/bin/${pname}"
+    chmod u+x  "$out/bin/regripper"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix
index 6a7461f3b13e..85e8ed70ab0a 100644
--- a/pkgs/by-name/re/revolt-desktop/package.nix
+++ b/pkgs/by-name/re/revolt-desktop/package.nix
@@ -47,19 +47,19 @@
 
           mkdir -p $out/bin $out/share/{applications,revolt-desktop}
 
-          cp -a ${final.appimageContents}/{locales,resources} $out/share/${pname}
-          cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
+          cp -a ${final.appimageContents}/{locales,resources} $out/share/revolt-desktop
+          cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/revolt-desktop.desktop
           cp -a ${final.appimageContents}/usr/share/icons $out/share/icons
 
-          substituteInPlace $out/share/applications/${pname}.desktop \
-            --replace 'Exec=AppRun' 'Exec=${pname}'
+          substituteInPlace $out/share/applications/revolt-desktop.desktop \
+            --replace 'Exec=AppRun' 'Exec=revolt-desktop'
 
           runHook postInstall
         '';
 
         postFixup = ''
-          makeWrapper ${electron}/bin/electron $out/bin/${pname} \
-            --add-flags $out/share/${pname}/resources/app.asar \
+          makeWrapper ${electron}/bin/electron $out/bin/revolt-desktop \
+            --add-flags $out/share/revolt-desktop/resources/app.asar \
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
         '';
       }
@@ -77,7 +77,7 @@
 
           mkdir -p "$out/Applications/" "$out/bin/"
           mv Revolt.app "$out/Applications/"
-          makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/${pname}"
+          makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/revolt-desktop"
 
           runHook postInstall
         '';
diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix
index 9361ca564dc6..9486c13cb1e2 100644
--- a/pkgs/by-name/rs/rs/package.nix
+++ b/pkgs/by-name/rs/rs/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   version = "20200313";
 
   src = fetchurl {
-    url = "https://www.mirbsd.org/MirOS/dist/mir/rs/${pname}-${version}.tar.gz";
+    url = "https://www.mirbsd.org/MirOS/dist/mir/rs/rs-${version}.tar.gz";
     sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li";
   };
 
diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix
index 2ebc5bae4d0b..127dcf23a7a5 100644
--- a/pkgs/by-name/se/seahorse/package.nix
+++ b/pkgs/by-name/se/seahorse/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   version = "43.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/seahorse/${lib.versions.major version}/seahorse-${version}.tar.xz";
     hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0=";
   };
 
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "seahorse";
     };
   };
 
diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix
index 011d25f349bc..baff481f6f2b 100644
--- a/pkgs/by-name/si/signaturepdf/package.nix
+++ b/pkgs/by-name/si/signaturepdf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "24eme";
-    repo = "${pname}";
+    repo = "signaturepdf";
     rev = "v${version}";
     hash = "sha256-WPcnG1iRT4l4S/CSZkj75lIiyzVLsrSyH3GUJa7Tedc=";
   };
diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index e7f2954ca39f..52dc9d7bc01e 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz";
     hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk=";
   };
 
diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix
index ee3f66b5d9dc..7c043da4e359 100644
--- a/pkgs/by-name/so/sonarlint-ls/package.nix
+++ b/pkgs/by-name/so/sonarlint-ls/package.nix
@@ -92,14 +92,14 @@ maven.buildMavenPackage rec {
           LATEST_TAG=$(curl https://api.github.com/repos/${src.owner}/${src.repo}/tags | \
             jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") |
             map(tonumber)) | reverse | .[0].name')
-          update-source-version ${pname} "$LATEST_TAG"
+          update-source-version sonarlint-ls "$LATEST_TAG"
           sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${pkgFile}
 
           echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..."
-          nix-build -A ${pname}.fetchedMavenDeps 2> ${pname}-stderr.log || true
+          nix-build -A sonarlint-ls.fetchedMavenDeps 2> sonarlint-ls-stderr.log || true
 
-          NEW_MVN_HASH=$(grep "got:" ${pname}-stderr.log | awk '{print ''$2}')
-          rm ${pname}-stderr.log
+          NEW_MVN_HASH=$(grep "got:" sonarlint-ls-stderr.log | awk '{print ''$2}')
+          rm sonarlint-ls-stderr.log
           # escaping double quotes looks ugly but is needed for variable substitution
           # use # instead of / as separator because the sha256 might contain the / character
           sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${pkgFile}
diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix
index 39a16c5d372c..696bd36ddd8e 100644
--- a/pkgs/by-name/sr/srgn/package.nix
+++ b/pkgs/by-name/sr/srgn/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexpovel";
     repo = "srgn";
-    rev = "${pname}-v${version}";
+    rev = "srgn-v${version}";
     hash = "sha256-d53aSo1gzINC8WdMzjCHzU/8+9kvrrGglV4WsiCt+rM=";
   };
 
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 5cffda41dcba..21be1dd81802 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 
   postInstall = ''
-    mv $out/bin/{${pname},stackit} # rename the binary
+    mv $out/bin/{stackit-cli,stackit} # rename the binary
 
     installShellCompletion --cmd stackit \
       --bash <($out/bin/stackit completion bash) \
diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix
index 55d368fb3749..14efc8ed1dde 100644
--- a/pkgs/by-name/su/substudy/package.nix
+++ b/pkgs/by-name/su/substudy/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "emk";
     repo = "subtitles-rs";
-    rev = "${pname}_v${version}";
+    rev = "substudy_v${version}";
     hash = "sha256-ACYbSQKaOJ2hS8NbOAppfKo+Mk3CKg0OAwb56AH42Zs=";
   };
 
diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix
index aad4727da20b..fa2f495ffd12 100644
--- a/pkgs/by-name/su/sushi/package.nix
+++ b/pkgs/by-name/su/sushi/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/sushi/${lib.versions.major version}/sushi-${version}.tar.xz";
     hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY=";
   };
 
diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix
index f7f5c84d204b..8ce57143381a 100644
--- a/pkgs/by-name/sw/swayosd/package.nix
+++ b/pkgs/by-name/sw/swayosd/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    name = "${pname}-${version}";
+    name = "swayosd-${version}";
     hash = "sha256-exbVanUvGp0ub4WE3VcsN8hkcK0Ipf0tNfd92UecICg=";
   };
 
diff --git a/pkgs/by-name/sy/synthesia/package.nix b/pkgs/by-name/sy/synthesia/package.nix
index 44c48bb59b03..78c82dd010dd 100644
--- a/pkgs/by-name/sy/synthesia/package.nix
+++ b/pkgs/by-name/sy/synthesia/package.nix
@@ -20,11 +20,11 @@ stdenvNoCC.mkDerivation rec {
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
+      name = "synthesia";
       desktopName = "Synthesia";
       comment = meta.description;
-      exec = pname;
-      icon = pname;
+      exec = "synthesia";
+      icon = "synthesia";
       categories = [ "Game" "Audio" ];
       startupWMClass = "synthesia.exe";
     })
@@ -47,11 +47,11 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin
-    cat <<'EOF' > $out/bin/${pname}
+    cat <<'EOF' > $out/bin/synthesia
     #!${runtimeShell}
     export PATH=${wineWowPackages.stable}/bin:$PATH
     export WINEARCH=win64
-    export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/${pname}"}/wine"
+    export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/synthesia"}/wine"
     export WINEDLLOVERRIDES="mscoree=" # disable mono
     if [ ! -d "$WINEPREFIX" ] ; then
       mkdir -p "$WINEPREFIX"
@@ -59,8 +59,8 @@ stdenvNoCC.mkDerivation rec {
     fi
     wine "$WINEPREFIX/drive_c/Program Files (x86)/Synthesia/Synthesia.exe"
     EOF
-    chmod +x $out/bin/${pname}
-    install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/${pname}.png
+    chmod +x $out/bin/synthesia
+    install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/synthesia.png
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/ta/tarlz/package.nix b/pkgs/by-name/ta/tarlz/package.nix
index 0798c6c83551..9873d2be1326 100644
--- a/pkgs/by-name/ta/tarlz/package.nix
+++ b/pkgs/by-name/ta/tarlz/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ lzlib ];
 
   src = fetchurl {
-    url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz";
+    url = "mirror://savannah/lzip/tarlz/tarlz-${version}.tar.lz";
     sha256 = "7d0bbe9c3a137bb93a10be56988fcf7362e4dbc65490639edc4255b704105fce";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # system clock issues
 
   meta = with lib; {
-    homepage = "https://www.nongnu.org/lzip/${pname}.html";
+    homepage = "https://www.nongnu.org/lzip/tarlz.html";
     description =
       "Massively parallel combined implementation of the tar archiver and the lzip compressor";
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/te/termcap/package.nix b/pkgs/by-name/te/termcap/package.nix
index 6382ade90ea7..9a91ead85985 100644
--- a/pkgs/by-name/te/termcap/package.nix
+++ b/pkgs/by-name/te/termcap/package.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
   postInstall = lib.optionalString (!enableStatic) ''
     rm $out/lib/libtermcap.a
   '' + lib.optionalString enableShared (let
-    libName = "lib${pname}${stdenv.hostPlatform.extensions.sharedLibrary}";
-    impLibName = "lib${pname}.dll.a";
+    libName = "libtermcap${stdenv.hostPlatform.extensions.sharedLibrary}";
+    impLibName = "libtermcap.dll.a";
     winImpLib = lib.optionalString stdenv.hostPlatform.isWindows
       "-Wl,--out-implib,${impLibName}";
   in ''
diff --git a/pkgs/by-name/ti/tinycompress/package.nix b/pkgs/by-name/ti/tinycompress/package.nix
index c58ef57fbd7c..f49255e552ee 100644
--- a/pkgs/by-name/ti/tinycompress/package.nix
+++ b/pkgs/by-name/ti/tinycompress/package.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "1.2.11";
 
   src = fetchurl {
-    url = "mirror://alsa/tinycompress/${pname}-${version}.tar.bz2";
+    url = "mirror://alsa/tinycompress/tinycompress-${version}.tar.bz2";
     hash = "sha256-6754jCgyjnzKJFqvkZSlrQ3JHp4NyIPCz5/rbULJ8/w=";
   };
 
diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix
index c2cf2ff9a7d4..8c99d22f822c 100644
--- a/pkgs/by-name/to/totem/package.nix
+++ b/pkgs/by-name/to/totem/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   version = "43.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz";
     sha256 = "s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4=";
   };
 
diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix
index 8e8a6f39678b..a5fc0c456f83 100644
--- a/pkgs/by-name/tr/tracexec/package.nix
+++ b/pkgs/by-name/tr/tracexec/package.nix
@@ -48,8 +48,8 @@ rustPlatform.buildRustPackage {
     # Remove test binaries (e.g. `empty-argv`, `corrupted-envp`) and only retain `tracexec`
     find "$out/bin" -type f \! -name tracexec -print0 | xargs -0 rm -v
 
-    install -Dm644 LICENSE -t "$out/share/licenses/${pname}/"
-    install -Dm644 THIRD_PARTY_LICENSES.HTML -t "$out/share/licenses/${pname}/"
+    install -Dm644 LICENSE -t "$out/share/licenses/tracexec/"
+    install -Dm644 THIRD_PARTY_LICENSES.HTML -t "$out/share/licenses/tracexec/"
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix
index 82afb1ef10ae..b40216bbd08d 100644
--- a/pkgs/by-name/tr/treefmt2/package.nix
+++ b/pkgs/by-name/tr/treefmt2/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X git.numtide.com/numtide/treefmt/build.Name=${pname}"
+    "-X git.numtide.com/numtide/treefmt/build.Name=treefmt"
     "-X git.numtide.com/numtide/treefmt/build.Version=v${version}"
   ];
 
diff --git a/pkgs/by-name/ud/udev-gothic-nf/package.nix b/pkgs/by-name/ud/udev-gothic-nf/package.nix
index 14f66f5e4f7f..bdd4cffdf043 100644
--- a/pkgs/by-name/ud/udev-gothic-nf/package.nix
+++ b/pkgs/by-name/ud/udev-gothic-nf/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm644 *.ttf -t $out/share/fonts/${pname}
+    install -Dm644 *.ttf -t $out/share/fonts/udev-gothic-nf
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/ud/udev-gothic/package.nix b/pkgs/by-name/ud/udev-gothic/package.nix
index 4acb50ee342a..85fdeebf7f34 100644
--- a/pkgs/by-name/ud/udev-gothic/package.nix
+++ b/pkgs/by-name/ud/udev-gothic/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm644 *.ttf -t $out/share/fonts/${pname}
+    install -Dm644 *.ttf -t $out/share/fonts/udev-gothic
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix
index 15fbab6fdbee..92ecebc4b518 100644
--- a/pkgs/by-name/vv/vvvvvv/package.nix
+++ b/pkgs/by-name/vv/vvvvvv/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       name = "VVVVVV";
       desktopName = "VVVVVV";
       comment = meta.description;
-      exec = pname;
+      exec = "vvvvvv";
       icon = "VVVVVV";
       terminal = false;
       categories = [ "Game" ];
@@ -69,12 +69,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 VVVVVV $out/bin/${pname}
+    install -Dm755 VVVVVV $out/bin/vvvvvv
     install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png"
     cp -r "$src/desktop_version/fonts/" "$out/share/"
     cp -r "$src/desktop_version/lang/" "$out/share/"
 
-    wrapProgram $out/bin/${pname} \
+    wrapProgram $out/bin/vvvvvv \
       --add-flags "-assets ${dataZip}" \
       --add-flags "-langdir $out/share/lang" \
       --add-flags "-fontsdir $out/share/fonts"
diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix
index 572f68a923a8..e655624b33ba 100644
--- a/pkgs/by-name/ye/yelp-xsl/package.nix
+++ b/pkgs/by-name/ye/yelp-xsl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "42.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/yelp-xsl-${version}.tar.xz";
     sha256 = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80=";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "yelp-xsl";
     };
   };
 
diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix
index 7d9549d97093..49bc8954e9b4 100644
--- a/pkgs/by-name/ye/yelp/package.nix
+++ b/pkgs/by-name/ye/yelp/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   version = "42.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/yelp/${lib.versions.major version}/yelp-${version}.tar.xz";
     sha256 = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs=";
   };
 
diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix
index a5a144a28287..cd24d14636f9 100644
--- a/pkgs/by-name/yg/yggdrasil/package.nix
+++ b/pkgs/by-name/yg/yggdrasil/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   ldflags = [
     "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}"
-    "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}"
+    "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=yggdrasil"
     "-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock"
     "-s"
     "-w"
diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index 94aa7acce2e0..f0950cdc33c4 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6.2";
 
   src = fetchurl {
-    url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2";
+    url = "http://zsync.moria.org.uk/download/zsync-${version}.tar.bz2";
     sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
   };