diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index 21d69f14d7f3..5bc81a6daf66 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "ethabi-${version}";
+  pname = "ethabi";
   version = "7.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 26c9192ee6fa..100c0f8ba41f 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -6,7 +6,7 @@
 }:
 
 rustPlatform.buildRustPackage rec {
-  name = "polkadot-${version}";
+  pname = "polkadot";
   version = "0.2.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 3aeee7e6972f..634d4e8538a1 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "librustzcash-unstable-${version}";
+  pname = "librustzcash-unstable";
   version = "2017-03-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index d82bdc665498..4c7f9cde5ce7 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, rustPlatform , fetchFromGitHub, Security }:
 rustPlatform.buildRustPackage rec {
-  name = "whitebox_tools-${version}";
+  pname = "whitebox_tools";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index 98ed10b0c7cc..8ba562de1cb7 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -2,7 +2,7 @@
 
 python2Packages.buildPythonApplication rec {
   version = "2.9.3.1";
-  name = "electrum-dash-${version}";
+  pname = "electrum-dash";
 
   src = fetchurl {
     url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz";
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index 0f4e72502bba..e734e44a2e04 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "moolticute-${version}";
+  pname = "moolticute";
   version = "0.30.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 5bb2b5b94616..93f233a4f925 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
-  name = "todiff-${version}";
+  pname = "todiff";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index bd8eb5451526..f4d6fce3545e 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "click-${version}";
+  pname = "click";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 0c210dcc535b..9bf801ee93d7 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -4,7 +4,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "habitat-${version}";
+  pname = "habitat";
   version = "0.30.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index a5b4c577b4cb..640421bef8f5 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "cfdyndns-${version}";
+  pname = "cfdyndns";
   version = "0.0.1";
   src = fetchFromGitHub {
     owner = "colemickens";
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 2795ac4e46e4..f7a9521c9937 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -2,11 +2,11 @@
 , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
 
 rustPlatform.buildRustPackage rec {
-  name = "newsboat-${version}";
+  pname = "newsboat";
   version = "2.16.1";
 
   src = fetchurl {
-    url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
+    url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz";
     sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0";
   };
 
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 6bdaf2ffaf48..7304fd2f654b 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "rawdog-${version}";
+  pname = "rawdog";
   version = "2.23";
 
   src = fetchurl {
-    url = "https://offog.org/files/${name}.tar.gz";
+    url = "https://offog.org/files/${pname}-${version}.tar.gz";
     sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 0f11d9a6df05..b37e0b00ce76 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
 
 python2Packages.buildPythonApplication rec {
-  name = "mailpile-${version}";
+  pname = "mailpile";
   version = "1.0.0rc2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index bc4f526bb3a4..f9a911d82108 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "elan-${version}";
+  pname = "elan";
   version = "0.7.5";
 
   cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd";
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
index 340073b016e3..4469e7f06e03 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python2Packages, fetchurl }:
   python2Packages.buildPythonApplication rec {
-    name = "labelImg-${version}";
+    pname = "labelImg";
     version = "1.6.0";
     src = fetchurl {
       url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index daa8b4943227..0dfcbfda0024 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   version = "0.4.4";
-  name = "rink-${version}";
+  pname = "rink";
 
   src = fetchFromGitHub {
     owner = "tiffany352";
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index d16ea2710503..0dfa19882028 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "bzr-tools-${version}";
+  pname = "bzr-tools";
   version = "2.6.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index a2ebb8195db4..4c818060d220 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -4,11 +4,11 @@
 }:
 
 python2Packages.buildPythonApplication  rec {
-  name = "cvs2svn-${version}";
+  pname = "cvs2svn";
   version = "2.5.0";
 
   src = fetchurl {
-    url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz";
+    url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz";
     sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 2d171df8bf24..32b9c8a980dc 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -4,8 +4,6 @@ python2Packages.buildPythonApplication rec {
   pname = "git-big-picture";
   version = "0.10.1";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "esc";
     repo = pname;
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index fbbb2d952422..418cf2e5866f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -1,6 +1,6 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
-  name = "git-codeowners-${version}";
+  pname = "git-codeowners";
   version = "0.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 90b8b54434bd..77fc04281153 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -16,7 +16,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "git-dit-${version}";
+  pname = "git-dit";
   version = "0.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 45c97868c4bf..ba0625c433de 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -2,10 +2,10 @@
 
 python2Packages.buildPythonApplication rec {
   version = "1.4.2";
-  name = "git-up-${version}";
+  pname = "git-up";
 
   src = fetchurl {
-    url = "mirror://pypi/g/git-up/${name}.zip";
+    url = "mirror://pypi/g/git-up/${pname}-${version}.zip";
     sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
   };
 
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 2428c6cebddd..4467e9746ce9 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchzip, python2Packages}:
 
 python2Packages.buildPythonApplication rec {
-  name = "gitinspector-${version}";
+  pname = "gitinspector";
   version = "0.4.4";
   namePrefix = "";
 
   src = fetchzip {
     url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz";
     sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m";
-    name = name + "-src";
+    name = "${pname}-${version}" + "-src";
   };
 
   checkInputs = with python2Packages; [
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 180664d33863..6d0e39d47bf4 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
-  name = "pijul-${version}";
+  pname = "pijul";
   version = "0.12.0";
 
   src = fetchurl {
-    url = "https://pijul.org/releases/${name}.tar.gz";
+    url = "https://pijul.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
   };
 
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index d3b027fada68..e9950c32549a 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
 python2Packages.buildPythonApplication rec {
-  name = "rabbitvcs-${version}";
+  pname = "rabbitvcs";
   version = "0.17.1";
   namePrefix = "";
 
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 7d655bfc5d3b..a225c23ceebc 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -3,7 +3,7 @@
   libiconv, CoreFoundation, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "sit-${version}";
+  pname = "sit";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index c68cc928848d..c769ec0a66d6 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "tailor-${version}";
+  pname = "tailor";
   version = "0.9.35";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 23084c6286a4..13afe0a42619 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
-  name = "cntr-${version}";
+  pname = "cntr";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 0a139448cb3a..bce254061421 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, rustPlatform, libseccomp }:
 
 rustPlatform.buildRustPackage rec {
-  name = "railcar-${version}";
+  pname = "railcar";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index eac15ca71418..1787e40eb96c 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -8,7 +8,7 @@ let
 in
 
 rustPlatform.buildRustPackage rec {
-  name = "dwm-status-${version}";
+  pname = "dwm-status";
   version = "1.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix
index 26b06b4e652e..fe9e83492e42 100644
--- a/pkgs/data/machine-learning/mnist/default.nix
+++ b/pkgs/data/machine-learning/mnist/default.nix
@@ -20,7 +20,7 @@ let
   };
 in
   stdenvNoCC.mkDerivation rec {
-    name = "mnist-${version}";
+    pname = "mnist";
     version = "2018-11-16";
     installPhase = ''
       mkdir -p $out
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 44d784133f5f..5353862424a0 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -1,7 +1,7 @@
 { stdenvNoCC, lib, fetchurl }:
 
 stdenvNoCC.mkDerivation rec {
-  name = "fasm-bin-${version}";
+  pname = "fasm-bin";
 
   version = "1.73.16";
 
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 537bdaf445cd..9793eee1708b 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "rustfmt-${version}";
+  pname = "rustfmt";
   inherit (rustPlatform.rust.rustc) version src;
 
   # the rust source tarball already has all the dependencies vendored, no need to fetch them again
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index d8e687980aa7..30a601ef8dfd 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -3,7 +3,8 @@
 let version = "0.9.5.1.1"; in
 
 python2Packages.buildPythonPackage {
-  name = "pyrex-${version}";
+  pname = "pyrex";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 21b8a7da06eb..69a930891885 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -3,7 +3,8 @@
 let version = "0.9.6.4"; in
 
 python2Packages.buildPythonPackage {
-  name = "pyrex-${version}";
+  pname = "pyrex";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
index ac291668e2d9..44ac11be5400 100644
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "wasm-gc-${version}";
+  pname = "wasm-gc";
   version = "0.1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index ad1d0e396a91..557d6f176097 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -4,7 +4,7 @@ with rustPlatform;
 
 buildRustPackage rec {
   version = "0.4.1";
-  name = "loc-${version}";
+  pname = "loc";
 
   src = fetchFromGitHub {
     owner = "cgag";
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 300feb9a41b5..250002a16b76 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -4,7 +4,6 @@
 rustPlatform.buildRustPackage rec {
   pname = "panopticon";
   version = "unstable-20171202";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "das-labor";
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 0c8e6ff591bf..12289cbb68aa 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "clog-cli-${version}";
+  pname = "clog-cli";
   version = "0.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index af25f3f75952..a88963c6e2cd 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "mdsh-${version}";
+  pname = "mdsh";
   version = "0.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 17560f55ec4a..68d1a74b2777 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -9,7 +9,7 @@ with rustPlatform;
 
 buildRustPackage rec {
   version = "0.22.0";
-  name = "geckodriver-${version}";
+  pname = "geckodriver";
 
   src = fetchFromGitHub {
     owner = "mozilla";
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 70fa18ceddb5..5faceca57166 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -4,7 +4,7 @@ with rustPlatform;
 
 buildRustPackage rec {
   version = "0.9.1";
-  name = "git-series-${version}";
+  pname = "git-series";
 
   src = fetchFromGitHub {
     owner = "git-series";
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 0c994e88e23f..b9a4658d3dee 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   version = "0.2.10";
-  name = "sccache-${version}";
+  pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 6f96b81e7a46..fac5b8e58309 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
-  name = "parinfer-rust-${version}";
+  pname = "parinfer-rust";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index ee6a7ec78c20..f1bda9997ac6 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -2,7 +2,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "pax-rs-${version}";
+  pname = "pax-rs";
   version = "0.4.0";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 72b9406211cb..e00f0ae7dd04 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "rq-${version}";
+  pname = "rq";
   version = "0.10.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 8fb0b63727a2..17103bae50a6 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "cargo-asm-${version}";
+  pname = "cargo-asm";
   version = "0.1.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index f19aabae7a18..7ccc85283599 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "cargo-fuzz-${version}";
+  pname = "cargo-fuzz";
   version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock
 
   src =
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 0ca12bd7bf4f..144e1d71a110 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
 
 rustPlatform.buildRustPackage rec {
-  name = "cargo-generate-${version}";
+  pname = "cargo-generate";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index ca4b6825a38f..24bad0eb8e44 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "rust-cbindgen-${version}";
+  pname = "rust-cbindgen";
   version = "0.8.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index b2f6701be876..a06723fc28c8 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "racer-${version}";
+  pname = "racer";
   version = "2.1.22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index aa33f04123f5..bfc30193eeda 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "racerd-${version}";
+  pname = "racerd";
   version = "2019-03-20";
   src = fetchFromGitHub {
     owner = "jwilm";
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index fd5bc6978310..8a87bf5cf4df 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "rainicorn-${version}";
+  pname = "rainicorn";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index 4e7032025c3d..32cc66f76e92 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "svd2rust-${version}";
+  pname = "svd2rust";
   version = "0.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index d9ff6f673d87..3f721eaee2a9 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -8,7 +8,7 @@
 }:
 
 rustPlatform.buildRustPackage rec {
-  name = "wasm-pack-${version}";
+  pname = "wasm-pack";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index e1f8e8abab80..e191d372704b 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -44,7 +44,7 @@ let
 in
 
 stdenvNoCC.mkDerivation rec {
-  name = "twbt-${version}";
+  pname = "twbt";
   version = release.twbtRelease;
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 63b766b21a5c..25d0eb1fd029 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "dstat-${version}";
+  pname = "dstat";
   format = "other";
   version = "0.7.3";
 
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 1e9b1c276d0c..1699324546d1 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -7,7 +7,8 @@ let
   makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation {
     inherit src;
 
-    name = "linux-headers-${version}";
+    pname = "linux-headers";
+    inherit version;
 
     ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
 
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index 30ab9374cba0..352c5a80e1f4 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -2,7 +2,6 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "webmetro";
-  name = "${pname}-${version}";
   version = "unstable-20180426";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 383387b4056c..2bd376593879 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "ion-${version}";
+  pname = "ion";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index edafbf5525bf..b1770af2406e 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -2,7 +2,7 @@
 , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "xidlehook-${version}";
+  pname = "xidlehook";
   version = "0.7.0";
 
   doCheck = false;
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 1225441392c4..f0945d7d778b 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -4,7 +4,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "intecture-agent-${version}";
+  pname = "intecture-agent";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index 577d439c805a..a3208bddabe9 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -4,7 +4,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "intecture-auth-${version}";
+  pname = "intecture-auth";
   version = "0.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index b0bb63984f0d..90d65a3f2951 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -4,7 +4,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "intecture-cli-${version}";
+  pname = "intecture-cli";
   version = "0.3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
index 472b4a6508f2..3d219eed012c 100644
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages  }:
 
 python2Packages.buildPythonApplication rec {
-  name     = "amazon-glacier-cmd-interface-${version}";
+  pname = "amazon-glacier-cmd-interface";
   version  = "2016-09-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index b090da852638..1cf7a19014e4 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -5,11 +5,11 @@
 , rsync, makeWrapper }:
 
 python2Packages.buildPythonApplication rec {
-  name = "duplicity-${version}";
+  pname = "duplicity";
   version = "0.7.19";
 
   src = fetchurl {
-    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
+    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6";
   };
   patches = [
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index e0ac2c3f2328..bd5c10ea122c 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -3,7 +3,7 @@
 , Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "rdedup-${version}";
+  pname = "rdedup";
   version = "3.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index ebab6c5b16ba..e2538387d450 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "btrfs-dedupe-${version}";
+  pname = "btrfs-dedupe";
   version = "1.1.0";
 
 
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index ec734e52f733..614e323e6b29 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "gitfs-${version}";
+  pname = "gitfs";
   version = "0.4.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 7719406cb6bf..5875f64f7ef3 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
-  name = "gifski-${version}";
+  pname = "gifski";
   version = "0.8.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index 6e455caf9066..50aeae78fce8 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "svgcleaner-${version}";
+  pname = "svgcleaner";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix
index 7391c271cd17..6b7a51e08f51 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/tools/misc/bmap-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "bmap-tools-${version}";
+  pname = "bmap-tools";
   version = "3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index 7ca103062c11..f5291d0789e6 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, help2man }:
 
 python2Packages.buildPythonApplication rec {
-  name = "crudini-${version}";
+  pname = "crudini";
   version = "0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index ef00c753d3aa..591cd5fe0408 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "diskus-${version}";
+  pname = "diskus";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index b9a66ba95d9f..4dffae557a4e 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "dust-${version}";
+  pname = "dust";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 1447c70412b6..d94f1c1929ff 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -5,7 +5,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "exa-${version}";
+  pname = "exa";
   version = "0.9.0";
 
   cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf";
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 91c1b3b70719..7465cb67f61a 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "fd-${version}";
+  pname = "fd";
   version = "7.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 76795892e715..bf6740d7ee4a 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -3,7 +3,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "heatseeker-${version}";
+  pname = "heatseeker";
   version = "1.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index 7e6b6124024a..56a1dc75a455 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }:
 
 rustPlatform.buildRustPackage rec {
-  name        = "journaldriver-${version}";
+  pname = "journaldriver";
   version     = "1.1.0";
   cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g";
 
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 822932dc5ac4..480c0abc728d 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -2,10 +2,10 @@
 
 python2Packages.buildPythonApplication rec {
   version = "0.4.6";
-  name = "kargo-${version}";
+  pname = "kargo";
 
   src = fetchurl {
-    url = "mirror://pypi/k/kargo/${name}.tar.gz";
+    url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz";
     sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
   };
 
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index 334daef44817..ebf93f0684f0 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
-  name = "mcfly-${version}";
+  pname = "mcfly";
   version = "v0.3.1";
   rev = "${version}";
 
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 8e65d4d2a543..412726e276d6 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }:
 
 rustPlatform.buildRustPackage rec {
-  name    = "miniserve-${version}";
+  pname = "miniserve";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix
index 37cbea46c813..c77ca56655ab 100644
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ b/pkgs/tools/misc/parallel-rust/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "parallel-rust-${version}";
+  pname = "parallel-rust";
   version = "0.11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 7acbbc210614..ff98bce39d8c 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,7 +1,6 @@
 { stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "powerline-rs";
-  name = "${pname}-${version}";
   version = "0.1.9";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index ce633ac4447a..85f90ed1692f 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }:
 
 rustPlatform.buildRustPackage rec {
-  name = "tealdeer-${version}";
+  pname = "tealdeer";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index 4f6a71135aa8..f9ccec87adc0 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -1,6 +1,6 @@
 { rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }:
 rustPlatform.buildRustPackage rec {
-  name = "termplay-${version}";
+  pname = "termplay";
   version = "2.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index 856bda755cb4..4ffa250bdf53 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "${pname}-${version}";
   pname = "vivid";
   version = "0.4.0";
 
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index be8745802dad..eb14d89bfc92 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "void-${version}";
+  pname = "void";
   version = "1.1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index a276b13a59ca..b994aecfc0e0 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -2,7 +2,7 @@
 }:
 
 rustPlatform.buildRustPackage rec {
-  name = "websocat-${version}";
+  pname = "websocat";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index 34b227d5a6d3..aee1b5c0e1d9 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub, sqlite }:
 
 rustPlatform.buildRustPackage rec {
-  name = "bukubrow-${version}";
+  pname = "bukubrow";
   version = "2.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index 915d1c3595f1..37d2eea825f0 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -15,7 +15,8 @@ apk = stdenv.mkDerivation {
 };
 in
 rustPlatform.buildRustPackage {
-  name = "gnirehtet-${version}";
+  pname = "gnirehtet";
+  inherit version;
 
   src = fetchFromGitHub {
       owner = "Genymobile";
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index e74a3554dc29..31b111f2b83d 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "s3cmd-${version}";
+  pname = "s3cmd";
   version = "2.0.2";
   
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix
index 84e7558713c9..b01d373088b7 100644
--- a/pkgs/tools/networking/ssh-agents/default.nix
+++ b/pkgs/tools/networking/ssh-agents/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  name = "ssh-agents-${version}";
+  pname = "ssh-agents";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index f72d004c291b..f47ccab45ea4 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -6,7 +6,7 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "tox-node-${version}";
+  pname = "tox-node";
   version = "0.0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
index 69f4fc435c91..13b7ffd2af71 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, darwin }:
 
 rustPlatform.buildRustPackage rec {
-  name    = "nixdoc-${version}";
+  pname = "nixdoc";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix
index 5e635f0fc26f..2fe89ccfa986 100644
--- a/pkgs/tools/package-management/cargo-graph/default.nix
+++ b/pkgs/tools/package-management/cargo-graph/default.nix
@@ -1,6 +1,6 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
-  name = "cargo-graph-${version}";
+  pname = "cargo-graph";
   version = "0.2.0-d895af1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix
index 619fbb115976..c8a43bda64a4 100644
--- a/pkgs/tools/package-management/cargo-license/default.nix
+++ b/pkgs/tools/package-management/cargo-license/default.nix
@@ -1,6 +1,6 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
-  name = "cargo-license-${version}";
+  pname = "cargo-license";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 2521a2ceebf6..2dcb03048577 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rustPlatform, fetchFromGitHub, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "cargo-release-${version}";
+  pname = "cargo-release";
   version = "0.10.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 8b654188c51a..8c3035ae79aa 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
 rustPlatform.buildRustPackage rec {
-  name = "cargo-tree-${version}";
+  pname = "cargo-tree";
   version = "0.26.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 9b666dbfa642..17d023f6daf3 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
 rustPlatform.buildRustPackage rec {
-  name = "nix-du-${version}";
+  pname = "nix-du";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 62e0bc81afaf..1d025581b614 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -3,7 +3,7 @@
 }:
 
 rustPlatform.buildRustPackage rec {
-  name = "nix-index-${version}";
+  pname = "nix-index";
   version = "0.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
index 078cc614bb42..930bf8382c64 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, lib, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name    = "mq-cli-${version}";
+  pname = "mq-cli";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 49db5e13d721..212f071f2769 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "coloursum-${version}";
+  pname = "coloursum";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index de395f183d18..3123d31a7b54 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }:
 
 rustPlatform.buildRustPackage rec {
-  name = "mdbook-${version}";
+  pname = "mdbook";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
index f88ac6951bfc..a68d2266b431 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  name = "staccato-${version}";
+  pname = "staccato";
   version = "0.1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 479085be0e1d..cf44782432c4 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "xsv-${version}";
+  pname = "xsv";
   version = "0.13.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index a7886f317c15..98c80da5b2c1 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -2,7 +2,7 @@
 , darwin, fontconfig, harfbuzz, openssl, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
-  name = "tectonic-${version}";
+  pname = "tectonic";
   version = "0.1.11";
 
   src = fetchFromGitHub {