diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
index 3a65cb800a98a9f938ca0bdf5cadea3dbdc53a18..4d7af138292cc93569fa30de2fbe1d636edf9671 100644
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -4,11 +4,11 @@ with lib;
 
 let
   hpssacli = pkgs.stdenv.mkDerivation rec {
-    name = "hpssacli-${version}";
+    pname = "hpssacli";
     version = "2.40-13.0";
 
     src = pkgs.fetchurl {
-      url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+      url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
       sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
     };
 
diff --git a/nixos/tests/common/letsencrypt/default.nix b/nixos/tests/common/letsencrypt/default.nix
index 8fe59bf4e70cacdb53e2f0a35791c6b355d7e627..58d87c64e34456bd5592f2a664e7caef328d3dd3 100644
--- a/nixos/tests/common/letsencrypt/default.nix
+++ b/nixos/tests/common/letsencrypt/default.nix
@@ -56,11 +56,11 @@
 
 let
   softhsm = pkgs.stdenv.mkDerivation rec {
-    name = "softhsm-${version}";
+    pname = "softhsm";
     version = "1.3.8";
 
     src = pkgs.fetchurl {
-      url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+      url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
       sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif";
     };
 
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix
index 3ea7b90f84a782c85535c893b7606765469224d8..720fd0b88be95c70b3ba96b9a40d639ec184e8ec 100644
--- a/pkgs/applications/audio/AMB-plugins/default.nix
+++ b/pkgs/applications/audio/AMB-plugins/default.nix
@@ -2,10 +2,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "AMB-plugins-${version}";
+  pname = "AMB-plugins";
   version = "0.8.1";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl";
   };
 
diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix
index b9322c37df0090b52b7efd7d8ce1e61f3e9c63de..ed1f05eaf5c6631f827f7fe920a121c545ab8b42 100644
--- a/pkgs/applications/audio/FIL-plugins/default.nix
+++ b/pkgs/applications/audio/FIL-plugins/default.nix
@@ -2,10 +2,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "FIL-plugins-${version}";
+  pname = "FIL-plugins";
   version = "0.3.0";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw";
   };
 
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index ed7a8481f693c5486f84f6fbfbd3064cb12fbe95..92f46abddd5a93fbd3a6972c06ab8b02edc2d6e9 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -2,7 +2,7 @@
 
   stdenv.mkDerivation rec {
   version = "16.06";
-  name = "mma-${version}";
+  pname = "mma";
 
   src = fetchurl {
     url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 70709ae4ac4c046c1a9c3091beab4882f96e32c6..b94fed41341205d4625753b2c203ae94c632f706 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (python2Packages) python dbus-python;
 in stdenv.mkDerivation rec {
-  name = "a2jmidid-${version}";
+  pname = "a2jmidid";
   version = "8";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index b602707b3921ac73f310edcdc660fc77a8630885..adb38d4bbbabe67fbec78993ea03d75477fdc422 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -6,7 +6,8 @@
 let version = "2.9.3";
 in
   stdenv.mkDerivation {
-    name = "abcde-${version}";
+    pname = "abcde";
+    inherit version;
     src = fetchurl {
       url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
       sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04";
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index 7b80b32331bc20e08d4ead058ca34efa28b3a363..389052d30e1cb3a1af53801acde5f2cd7b077da4 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aeolus-${version}";
+  pname = "aeolus";
   version = "0.9.7";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
   };
 
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index d6064e80e3ff201ffd81eb22fe81ce6db039bbc9..0750c38550b176abc6c51c739b859700c82b4c73 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -2,7 +2,7 @@
 , wafHook }:
 
 stdenv.mkDerivation  rec {
-  name = "ams-lv2-${version}";
+  pname = "ams-lv2";
   version = "1.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index 02d818410df4132d6aac07cf36e8a761a7b246f1..4b48f5f1eea2c51c25f956fab8c681977ea62967 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "ario-${version}";
+  pname = "ario";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ario-player/${name}.tar.gz";
+    url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz";
     sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
   };
 
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 91a0a1f140c2904dec9dbfd9a4ed93aa25578feb..4b76ebdf6053277eeb8b78c62ee8b8ccb3c2cd29 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "artyFX-${version}";
+  pname = "artyFX";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index 9c42c98ba5e33811b950f54b95fadb96739b09fa..e4c145b35c758bbacb9d58ed90fc4f2621c2f34f 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -13,9 +13,9 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.9.3";
-  name = "asunder-${version}";
+  pname = "asunder";
   src = fetchurl {
-    url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
+    url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
     sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
   };
 
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 68660b5d054bc01c9c3d75d31892e045654a49de..12e8237d4857dacf4a19f816ff0cbb3449815447 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "audacious-${version}";
+  pname = "audacious";
   version = "3.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index b685fda7683dc51900279aa37978d627b3de1689..6be40a7b93aa18c2d742489f26b9fbcad6f4f75f 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.3.2";
-  name = "audacity-${version}";
+  pname = "audacity";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index 7b84cd02a627adb3244d1922ddade4e2da52cdea..534b87e9fa7430eb1022b7e6aad0bbd7ae4405fc 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -5,11 +5,11 @@
 , pulseaudioSupport ? true, libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "audio-recorder-${version}";
+  pname = "audio-recorder";
   version = "2.1.3";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz";
     sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r";
   };
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
index c49470b76e2d48576ccd994f881a4b0138eb251c..7ca5d83b48b2de28d5e6800c332eb7669c62e3f7 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "avldrums.lv2";
   version = "0.3.5";
 
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index e3f1b6acf87462266fb133d68538cd3271173503..7f551304df11ee0d8d6e7b4a57f5a5a58ff8a84c 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.12-2";
-  name = "axoloti-${version}";
+  pname = "axoloti";
 
   src = fetchFromGitHub {
     owner = "axoloti";
diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix
index 07a78260991f59210e1617ec3000f64d2e79bb6f..e9fa6daecfe393f747b45581e87a4dcf4bf9bcb8 100644
--- a/pkgs/applications/audio/axoloti/dfu-util.nix
+++ b/pkgs/applications/audio/axoloti/dfu-util.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
 
 stdenv.mkDerivation rec {
-  name="dfu-util-${version}";
+  pname = "dfu-util";
   version = "0.8";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb1-axoloti ];
 
   src = fetchurl {
-    url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+    url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
     sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
   };
 
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 6827d12b321793ebf7f6ac8ab9a1397e58a27f2f..c35df95b24c70da82f478215152973959a270d96 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -7,7 +7,7 @@ let
     [ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
 in
 stdenv.mkDerivation rec {
-  name = "baudline-${version}";
+  pname = "baudline";
   version = "1.08";
 
   src =
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index fbe2c97042f060245bbf4ab653b7b45cbbf9682f..6f471f3a02839097dc934ceb02ffbc79cc2f595b 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -1,11 +1,11 @@
 { stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "bitmeter-${version}";
+  pname = "bitmeter";
   version = "1.2";
 
   src = fetchurl {
-    url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz";
+    url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz";
     sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
   };
 
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index 31716fce1c2115c4f4b64a63201ef5e176d7e74f..83586847190607f9b8d1774ab20cc277c5e87c83 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -6,7 +6,7 @@
 , xdg_utils, zenity, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "bitwig-studio-${version}";
+  pname = "bitwig-studio";
   version = "1.3.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index e1ed12b9bd2ea9900039183208dee1b15c9c9b84..504900d65955b4a63b93b6e577ada0b80c698055 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
 
 stdenv.mkDerivation  rec {
-  name = "bristol-${version}";
+  pname = "bristol";
   version = "0.60.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bristol/${name}.tar.gz";
+    url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz";
     sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
   };
 
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index adda92353647eb4b6edb97d0b91a2ba6a9460d85..2dee463aeee23fa7525a8ae834633cc7d9b4a997 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ffmpeg, sox }:
 
 stdenv.mkDerivation rec {
-  name = "bs1770gain-${version}";
+  pname = "bs1770gain";
   version = "0.5.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
+    url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz";
     sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
   };
 
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 7d7d25ea88a0fe7d54ea9f857b63824d9b215e10..0106e8b45846bf6f2eddb1a054ff19352f557f98 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -2,11 +2,11 @@
 , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "calf-${version}";
+  pname = "calf";
   version = "0.90.3";
 
   src = fetchurl {
-    url = "https://calf-studio-gear.org/files/${name}.tar.gz";
+    url = "https://calf-studio-gear.org/files/${pname}-${version}.tar.gz";
     sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3";
   };
 
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 1f53809e9059574c47c1b3cc9ece4e65309ba594..eabbf86683752fcce87b6927bf88a8e273763d44 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "caps-${version}";
+  pname = "caps";
   version = "0.9.26";
   src = fetchurl {
     url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 04f0f9d30259373a3048e13f0d1f01bd2663f339..9c2f17c5cc9c459fcb2b6f92313aca5552b2e3c1 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caudec-${version}";
+  pname = "caudec";
+  inherit version;
 
   src = fetchurl {
     url = "http://caudec.net/downloads/caudec-${version}.tar.gz";
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 439175b090a8a8a44f4e41a41313c33d7be2cd47..5c5c262056ec657f11468cd04ae2824e366de0af 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -2,7 +2,7 @@
   libpulseaudio, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "cava-${version}";
+  pname = "cava";
   version = "0.6.1";
 
   buildInputs = [
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 382d4a1b66755969e98dccb943231bd961a37177..76f76c1e750dbd2ad943d8383eca9c07328f21f6 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -2,11 +2,11 @@
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
-  name = "cd-discid-${version}";
+  pname = "cd-discid";
   version = "1.4";
 
   src = fetchurl {
-    url = "http://linukz.org/download/${name}.tar.gz";
+    url = "http://linukz.org/download/${pname}-${version}.tar.gz";
     sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
   };
 
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index da26a7188357dac24b8ca1187f44ca992c9c2f24..692485d0dcfd7d7d63a9ae891dccd532c5c79776 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.0.0";
-  name = "chuck-${version}";
+  pname = "chuck";
 
   src = fetchurl {
     url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 1b0dfebe22c2b6efd830eac7afc18674bbcee58e..f48a429b389675af44e5e950d5bd84bcdc83cdd9 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -67,7 +67,8 @@ let
   '';
 
   free = stdenv.mkDerivation {
-    name = "clementine-free-${version}";
+    pname = "clementine-free";
+    inherit version;
     inherit src patches nativeBuildInputs postPatch;
 
     # gst_plugins needed for setup-hooks
@@ -95,7 +96,8 @@ let
 
   # Unfree Spotify blob for Clementine
   unfree = stdenv.mkDerivation {
-    name = "clementine-blob-${version}";
+    pname = "clementine-blob";
+    inherit version;
     # Use the same patches and sources as Clementine
     inherit src nativeBuildInputs postPatch;
 
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index b574993338de4af0174e3260d13911c38a7ec315..b88951c0fc5ba8f8f14ac4eda8e2c87438f94c38 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -101,7 +101,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cmus-${version}";
+  pname = "cmus";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
index 2147a84f24be236a99cb97f90baa1315d5e36ac2..51b88607208e1fba31fd04897e7d4c0af0811c0d 100644
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-10-11";
-  name = "cmusfm-unstable-${version}";
+  pname = "cmusfm-unstable";
   src = fetchFromGitHub {
     owner = "Arkq";
     repo = "cmusfm";
diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix
index c3b3b9441357026460a023d4198be726f66967a4..0b8afada0206f95566b4111a198ab2c7ecfe04a0 100644
--- a/pkgs/applications/audio/csa/default.nix
+++ b/pkgs/applications/audio/csa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "csa-${version}";
+  pname = "csa";
   version = "0.5.100810";
 
   src = fetchurl {
-    url = "mirror://sourceforge/csa/${name}.tar.gz";
+    url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz";
     sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3";
   };
 
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix
index e97341acbb446abcc72953f80382715f9c14235f..86e200ab252ffb287f6bded94a50854065adced7 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@@ -3,7 +3,7 @@
   qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "csound-qt-${version}";
+  pname = "csound-qt";
   version = "0.9.6-beta3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index cb968ee9e00f8528e1b14e6148ae034fad6323b3..758448c2fb33b5d5f74c4a1cca2fc932bcad9d6f 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "csound-${version}";
+  pname = "csound";
   # When updating, please check if https://github.com/csound/csound/issues/1078
   # has been fixed in the new version so we can use the normal fluidsynth
   # version and remove fluidsynth 1.x from nixpkgs again.
diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
index dab3a97f6e7345472e9ab46af66b8058f540833c..b26360f0c469bd3b9e516cc13e4f685a5fa298a0 100644
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-headerbar-gtk3-plugin-${version}";
+  pname = "deadbeef-headerbar-gtk3-plugin";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
index d2355681b72832d402a20379f043da0e0a2b495b..8a81101983f7bae3dab425a558e10bf84444b7db 100644
--- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-infobar-plugin-${version}";
+  pname = "deadbeef-infobar-plugin";
   version = "1.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 4d5367087c1056055c10f29fe28c4fa7f251341d..5b27f3c3f3235f74c5f0ab699b0f46865adfa1fd 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, deadbeef, glib }:
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-mpris2-plugin-${version}";
+  pname = "deadbeef-mpris2-plugin";
   version = "1.12";
 
   src = fetchurl {
-    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
   };
 
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
index d01e7879335dfd4cae387b0d4b182c4cf97d1680..331e3fb96989d4e45cbbe9e8b3de540d1a6b3073 100644
--- a/pkgs/applications/audio/denemo/default.nix
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -5,7 +5,7 @@
 , portaudio, portmidi, fftw, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "denemo-${version}";
+  pname = "denemo";
   version = "2.3.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index d16534b03d3266268537fb59fcb1168a3d13971d..1785ca60060c724fe5a20313a9f3ba063acf0945 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -27,7 +27,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "dfasma-${version}";
+  pname = "dfasma";
   version = "1.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 1c41451b08f3757c64d0aa407e90244633641b8a..054fc758d645098d7c90eb8d07f88b357f43da25 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -8,7 +8,7 @@ let
               else if stdenv.hostPlatform.isWindows then "mingw"
               else "linux";
 in stdenv.mkDerivation rec {
-  name = "distrho-ports-${version}";
+  pname = "distrho-ports";
   version = "2018-04-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index e5354b06094642f61123e22a76f2cb0ef9d41a02..11b214f6bb3820dff147b938d41c1cbe7e217e02 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.17";
-  name = "drumgizmo-${version}";
+  pname = "drumgizmo";
 
   src = fetchurl {
-    url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
+    url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1";
   };
 
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index f8e1db4814ccc6996362597efc191cb2ad37a1ff..8f1f79169d7be8ee1c9db0a0dbd0587481787c40 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "drumkv1-${version}";
+  pname = "drumkv1";
   version = "0.9.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
+    url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
     sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983";
   };
 
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index 1013b8a560caaa928e77623dd9d02636b788a9f3..6c9cd628a518c1359202f46eb906964969e0add2 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -14,7 +14,7 @@
 # TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log.
 
 stdenv.mkDerivation rec {
-  name = "ecasound-${version}";
+  pname = "ecasound";
   version = "2.9.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 4138a07ec0674634462d72b7444a6a98c46926fb..2338c0ed376e9bab6ad5f0009e067ab4d348c0dc 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
 
 stdenv.mkDerivation rec {
-  name = "eflite-${version}";
+  pname = "eflite";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz";
     sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
   };
 
diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix
index 209ffa05bf2839b016c5ba71ca2baea3b37231b4..0e2c950051a5a9ccc7cef4725bb4a3c948c668c8 100644
--- a/pkgs/applications/audio/ekho/default.nix
+++ b/pkgs/applications/audio/ekho/default.nix
@@ -5,7 +5,8 @@
 let
   version = "5.8.2";
 in stdenv.mkDerivation rec {
-  name = "ekho-${version}";
+  pname = "ekho";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "Chinese text-to-speech software";
@@ -23,7 +24,7 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz";
+    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz";
     sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj";
   };
 
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 651604c71a11d0dcc0442cae44d493191c27e293..0308fad831d0867a92076c486febb1c26f42680e 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig
 , xorg }:
 stdenv.mkDerivation rec {
-  name = "eq10q-${version}";
+  pname = "eq10q";
   version = "2.2";
   src = fetchurl {
-    url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
+    url = "mirror://sourceforge/project/eq10q/${pname}-${version}.tar.gz";
     sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
   };
 
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 5d0af8cf17ab4639f4d6935c2b0a5b1432847404..043d5b9d2d3aa0fb4cb7f19d09b20897d104b3db 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -4,7 +4,7 @@
 , sonicSupport ? true, sonic }:
 
 stdenv.mkDerivation rec {
-  name = "espeak-ng-${version}";
+  pname = "espeak-ng";
   version = "1.49.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix
index 28e4879efdc080eaf5c9c55216bd36722d9a865a..bbfe1ad5623f3d3c753f24ba9e7a30d8cd341a71 100644
--- a/pkgs/applications/audio/eteroj.lv2/default.nix
+++ b/pkgs/applications/audio/eteroj.lv2/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "eteroj.lv2";
   version = "0.4.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "OpenMusicKontrollers";
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 6e47d921d345fb0c0ea242a8759444f328e8039f..687608b435246c39a9f8d40a02f38dbeed613b0e 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -25,7 +25,8 @@ let
   };
 
   faust = stdenv.mkDerivation {
-    name = "faust-${version}";
+    pname = "faust";
+    inherit version;
 
     inherit src;
 
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 383d2deb10bb4a77e18f8ebe123734510c79715a..ad1239b22af27f52e4e2857e108697e17d83de96 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -35,7 +35,8 @@ let
 
   faust = stdenv.mkDerivation {
 
-    name = "faust-${version}";
+    pname = "faust";
+    inherit version;
 
     inherit src;
 
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 754c480706033825699f81a91ea4829e1a3b205f..4268a783c8d8fb5fc7da549aa0389e93faf34cda 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "faustlive-${version}";
+  pname = "faustlive";
   version = "2017-12-05";
   src = fetchFromGitHub {
     owner = "grame-cncm";
diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix
index f0863bfc50b03380a2b2c14443d471b01e9ad96d..19ed23523556e924c773b1c4bed993ded44e7a57 100644
--- a/pkgs/applications/audio/flac123/default.nix
+++ b/pkgs/applications/audio/flac123/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:
 
 stdenv.mkDerivation rec {
-  name = "flac123-${version}";
+  pname = "flac123";
   version = "0.0.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz";
+    url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz";
     sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
   };
 
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 2d2d88308cc1549d3c302119a8ef3436881b6652..02317fee15f144cf1992b476e0b12a8301011467 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flacon-${version}";
+  pname = "flacon";
   version = "5.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 58d095080fe53358fef8030d9d4efbc747edfbcd..dc163de8ade7523ea7c6fb5659e6e2b1093a1e78 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
 stdenv.mkDerivation rec {
-  name = "fmsynth-unstable-${version}";
+  pname = "fmsynth-unstable";
   version = "2015-02-07";
   src = fetchFromGitHub {
     owner = "Themaister";
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index 680fab4ca64316f230f9d171956c07739eaa335d..a92d331baadbbcf4b7e7ae1d8e40e5452f186181 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "fomp-${version}";
+  pname = "fomp";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
   };
 
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 28b2cd98e02c3c2e6ebc8cce0a57743e047c8bbb..330ae56f13f0f040e9f4fef00273bc22bbc21ded 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "git-2015-05-21";
-  name = "foo-yc20-${version}";
+  pname = "foo-yc20";
   src = fetchFromGitHub {
     owner = "sampov2";
     repo = "foo-yc20";
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index efb832ae625f2d34f20238b2155a4dfaa457c444..a2588093309d4f4d1d698b979764ada1ac041085 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "freewheeling-${version}";
+  pname = "freewheeling";
   version = "0.6.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index a0a79785283c0d0916d5bba75380964bc1794b2b..d95b3eea596d6beec810b161e8b33d1fc54491c6 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.1";
-  name = "game-music-emu-${version}";
+  pname = "game-music-emu";
 
   src = fetchurl {
-    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2";
     sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw";
   };
 
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index e9ce20f6c80acb46653da9ecc402103e68174f2d..d8fada45eb167440a24458630c6d238ed2c521d6 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gigedit-${version}";
+  pname = "gigedit";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
     sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
   };
 
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 07d5684e98e7c91b5da7c87228618998a77c03a7..cae35b6251904f8be6fc92b36b7940913d2f98cf 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gmpc-${version}";
+  pname = "gmpc";
   version = "11.8.16";
 
   libmpd = stdenv.mkDerivation {
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 3981bc79276937c067d3e586831c5f69b59456fd..3406f31788473a821704833e93ac828c9e490071 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -5,7 +5,7 @@
 # rustPlatform.buildRustPackage rec {
 stdenv.mkDerivation rec {
   version = "0.4.6";
-  name = "gnome-podcasts-${version}";
+  pname = "gnome-podcasts";
 
   src = fetchurl {
     url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 7716b1e0c3552b54e4918471caf872ceb93104e5..b51b72f1c8a4551bb83568986ffe9b7261c6468d 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -43,7 +43,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "google-play-music-desktop-player-${version}";
+  pname = "google-play-music-desktop-player";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 3aea07235d8acec604c11ec8980afdd5c93e9bc0..94d0f5eb50f52e277f911e5acb7a9f265a15d3ba 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -19,7 +19,8 @@ let
   version = "7.2";
 
 in stdenv.mkDerivation rec {
-  name = "gradio-${version}";
+  pname = "gradio";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "haecker-felix";
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
index e7a23b6f204c5b8f5a6a56c3528366578a591ec6..e027680f5fe64d88ad37faf78589bc2d21da0a1c 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/applications/audio/greg/default.nix
@@ -3,7 +3,6 @@
 with pythonPackages; buildPythonApplication rec {
   pname = "greg";
   version = "0.4.7";
-  name = pname + "-" + version;
 
   disabled = !isPy3k;
 
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index e01dbc1d30fe59b79886fc16761e7e64534a77a2..fd3632ee1552e45cb273c6619764231b9ebf7269 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.5";
-  name = "gtkpod-${version}";
+  pname = "gtkpod";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
+    url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz";
     sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
   };
 
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 9df4308131eb3c7ba7c03fbad8966b95bd7a3c8f..91f4b1dcdfe9c31352cacc22f208ee0208278506 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -11,7 +11,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "guitarix-${version}";
+  pname = "guitarix";
   version = "0.38.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix
index 04cb57800f95507fa0dfe0298f88d0f8f990ccf7..1f4323eb9d55ce2297a551af351851d3b4b6292f 100644
--- a/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/pkgs/applications/audio/gxplugins-lv2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "GxPlugins.lv2";
   version = "0.7";
 
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index fa76a1a26e823a03ab7fe2e53714c24212285213..d32c55122c5fef2c26df97846d0bef73f9f031d0 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -3,7 +3,7 @@
 
   stdenv.mkDerivation rec {
   version = "0.9.0";
-  name = "helm-${version}";
+  pname = "helm";
 
   src = fetchFromGitHub {
     owner = "mtytel";
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index d68bfbf2ae4e15386cd16dd5d946c92fe86b5eeb..50093f8a61dee1df9e314bfce2e6c15ed3dfb20b 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.7";
-  name = "hydrogen-${version}";
+  pname = "hydrogen";
 
   src = fetchurl {
     url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 69fc4b419c0649e82939d88d0a47188bde81afb5..2cc39e649434a73542d23053b157cfd2cc4d9a44 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.0-b31";
-  name = "i-score-${version}";
+  pname = "i-score";
 
   src = fetchFromGitHub {
     owner = "OSSIA";
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index c26980e1bb263549f927658d05f94a8229e7c2c2..1fd8531fb7f3d259611f3c5da31ed4560e02e46c 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "iannix-${version}";
+  pname = "iannix";
   version = "2016-01-31";
   src = fetchFromGitHub {
     owner = "iannix";
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index d2720fcace67326ad950d48b2a048fa4fd33328f..0fdb3b2a4a14958730bbb74c1cf019a13504b681 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "id3v2-${version}";
+  pname = "id3v2";
   version = "0.1.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/id3v2/${name}.tar.gz";
+    url = "mirror://sourceforge/id3v2/${pname}-${version}.tar.gz";
     sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
   };
 
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix
index 2b8c041a074084aecaf6b39ae410645d3d90ace9..341c41818421de9de1a23b80d064861b0ddc74be 100644
--- a/pkgs/applications/audio/infamousPlugins/default.nix
+++ b/pkgs/applications/audio/infamousPlugins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
 
 stdenv.mkDerivation rec {
-  name = "infamousPlugins-${version}";
+  pname = "infamousPlugins";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index 84be6b866faefff3e9f4ab067d756a214c455819..0ca5988383a67b65a2b98d88f706b40ab8a7ae39 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  name = "ir.lv2-${version}";
+  pname = "ir.lv2";
   version = "1.2.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 33c74f2b04433c1afeb66ef7a57138148923550d..92b2f8ac5153c35a03bf3cff42672563d42e769e 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
 
 stdenv.mkDerivation rec {
-  name = "jaaa-${version}";
+  pname = "jaaa";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1czksxx2g8na07k7g57qlz0vvkkgi5bzajcx7vc7jhb94hwmmxbc";
   };
 
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index f11bba34c74caaad818dbd5519c4e0fa0bfaaaf6..c62ccc4fc8831a757bc5f795fb6923d20c76823e 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjack2, libsndfile, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "jack_capture-${version}";
+  pname = "jack_capture";
   version = "0.9.73";
 
   src = fetchurl {
-    url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz";
+    url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz";
     sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
   };
 
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 75a8a6a4b1a11da810c5e4d16f9f913eb00aead9..d31bc981e0cbf93b03a7ff4750f58365976a2661 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "jack_oscrolloscope-${version}";
+  pname = "jack_oscrolloscope";
   version = "0.7";
 
   src = fetchurl {
-    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
     sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
   };
 
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 0f1ed143ddddc0ec2767678b03d75b7a695462e0..a40d5101b34f228af783dc0c9ee4428a25d89ec2 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -2,11 +2,11 @@
 , serd, sord , sratom, suil, wafHook }:
 
 stdenv.mkDerivation  rec {
-  name = "jalv-${version}";
+  pname = "jalv";
   version = "1.6.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa";
   };
 
diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
index 18b7bcd1d568f1359ea50d9d95a2f5fa87576daa..a9eb15aabf357dfc3979d51ce69e8093b5a9fd39 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/pkgs/applications/audio/japa/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.2";
-  name = "japa-${version}";
+  pname = "japa";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897";
   };
 
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index 344e6894baf5d4a05827110c4549e68fb7df227f..4bb1d63a1e71532fd1c24d8ff58466a837e09d4b 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libav, libkeyfinder }:
 
 stdenv.mkDerivation rec {
-  name = "keyfinder-cli-${version}";
+  pname = "keyfinder-cli";
   version = "2015-09-13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 55039e8508bc064df1b3b33462206eb56d814b7f..d47fc3b6190dab4afddfe0e10f9103fe1bb3ed0d 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }:
 
 stdenv.mkDerivation rec {
-  name = "keyfinder-${version}";
+  pname = "keyfinder";
   version = "2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 04d0349c88f6bca680bef0777427852f0f766357..dfb07c4f456877757e8a9598d9f9608005fa6051 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "kid3-${version}";
+  pname = "kid3";
   version = "3.7.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
     sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8";
   };
 
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index 5e54609f8bf0d013f0904a52b35a938841bb9aac..f33245d8f1c955a0b828f8e9b96b51532711d72d 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -2,11 +2,11 @@
 , libsamplerate, libsndfile, liblo, libjack2, boost }:
 
 stdenv.mkDerivation rec {
-  name = "klick-${version}";
+  pname = "klick";
   version = "0.12.2";
 
   src = fetchurl {
-    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
     sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
   };
 
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index a60b3db2fb86aa3e8e8f916c7076bed0a1d8fa70..44186abc3c46c0a56cecf69a4e4083673632ee6c 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -2,7 +2,7 @@
 , perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "swh-plugins-${version}";
+  pname = "swh-plugins";
   version = "0.4.17";
 
 
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index 72bb7010b627596b354a20da67987e26ed99b575..a7779ee8aeea1db822c6c727297224bae153b157 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "ladspa-sdk-${version}";
+  pname = "ladspa-sdk";
   version = "1.15";
   src = fetchurl {
     url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index b57b7283b8505a610f388e242c1419a23fa48420..3fad5de1de5929aae50ad121ec34689e89e97c7b 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "ladspa.h-${version}";
+  pname = "ladspa.h";
   version = "1.15";
   src = fetchurl {
     url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 7fb5a01e2c80b6ef8c2c6fbccbff12929bdab1c5..e96972b0d1b1e0157e6a07719f01918992857287 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -4,11 +4,11 @@
 assert libuuid != null;
 
 stdenv.mkDerivation  rec {
-  name = "lash-${version}";
+  pname = "lash";
   version = "0.5.4";
 
   src = fetchurl {
-    url = "mirror://savannah/lash/${name}.tar.gz";
+    url = "mirror://savannah/lash/${pname}-${version}.tar.gz";
     sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
   };
 
diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index a8e33c23dc0d7e6ab084f6340dba0d2aa7750802..b5a99150cb223a4af71159a6b168710900c546ca 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -4,10 +4,10 @@ let
   inherit (python2Packages) pyGtkGlade pygtksourceview python;
 in stdenv.mkDerivation rec {
   version = "12.02.1";
-  name = "linuxband-${version}";
+  pname = "linuxband";
 
   src = fetchurl {
-    url = "http://linuxband.org/assets/sources/${name}.tar.gz";
+    url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
     sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
   };
 
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index f173e41321f082ecfe197364ab99a835ca58922c..26fc2408d8ac0a0efc27aa31c97cffba990b7233 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -2,11 +2,11 @@
 , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "linuxsampler-${version}";
+  pname = "linuxsampler";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
     sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
   };
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 59e94e0bdad5d74b7df29d8e36766c847cd9c7d7..d22065eb9fe087b12c3c8a43970c66ea47340464 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -4,7 +4,7 @@
 , qtbase, qtx11extras, qttools, SDL ? null }:
 
 stdenv.mkDerivation rec {
-  name = "lmms-${version}";
+  pname = "lmms";
   version = "1.2.0-rc7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
index c80485734cae8925d8f472157497b27ed916567d..3d5c6f699dd23ea78057db7d071f9a1baf92a804 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -6,12 +6,11 @@
 stdenv.mkDerivation rec {
   pname = "lsp-plugins";
   version = "1.1.9";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sadko4u";
     repo = "${pname}";
-    rev = "${name}";
+    rev = "${pname}-${version}";
     sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2";
   };
 
diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix
index 81db133ff9ab026520fe798c857539c4c15c92d6..c986e3af288e12f9a4d0b7dcce42c42b4781e881 100644
--- a/pkgs/applications/audio/ltc-tools/default.nix
+++ b/pkgs/applications/audio/ltc-tools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}:
 
 stdenv.mkDerivation rec {
-  name = "ltc-tools-${version}";
+  pname = "ltc-tools";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index d3821c51fbc6a6aaa45a76918666e18f99a932c7..7288d39ce779119d4a08bdf9708f33bf8923af4c 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
-  name = "lv2bm-${version}";
+  pname = "lv2bm";
   version = "git-2015-11-29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index f355c540f301bf861922de575699e14da43686e4..6488d1bd65e562482d8f30d2f94e37fa0d6345df 100644
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "CharacterCompressor-${version}";
+  pname = "CharacterCompressor";
   version = "0.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index 90e4eabeef0b7b32f3e375856681aaaa0fa92ff2..c5728b6e8b7bce19492334c45cba1db3379ab693 100644
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "CompBus-${version}";
+  pname = "CompBus";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index 73dd7b48e9c4255306e58b9384ef1f1092b26d50..331e58c4bd2947cf7c5febff76631709b3b2da2c 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "constant-detune-chorus-${version}";
+  pname = "constant-detune-chorus";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index 39065db6edeb53eb85316eeaddd2e638437abba0..046ee70e990c9f0debc3b908e532e035d48de912 100644
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "LazyLimiter-${version}";
+  pname = "LazyLimiter";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index 362451988d38e27536a99905415ff691552d2003..aa7da17dafd18bb18099b18690b2778253578869 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "MBdistortion-${version}";
+  pname = "MBdistortion";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index 3f809aa78474963ab01e17f838d12c8120f19b35..ae05866e57d09abdd81e5b852a6525f75f1f448d 100644
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "RhythmDelay-${version}";
+  pname = "RhythmDelay";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 740763889ffd2dce2aea967734dae3bddc1f5690..718bbdaf49ea9c4469097a70e7decfafbb3ab1e6 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
 stdenv.mkDerivation rec {
-  name = "VoiceOfFaust-${version}";
+  pname = "VoiceOfFaust";
   version = "1.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index 6237628e600c8076454abb209c2ddb211222122c..356e95bf97c84c6fc2524d6392ff7822dcc7de08 100644
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "pluginUtils-${version}";
+  pname = "pluginUtils";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index cb9247fd3d084b7736143271c85b171287767bb8..292cd3dfd8606453631f2e4b30ba180faa946cd3 100644
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  name = "shelfMultiBand-${version}";
+  pname = "shelfMultiBand";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 26290e5bf8885a431d53f17ca44794ff9355adb2..901be5a23d08b1fecfa16e8656336cda2ba7b490 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "mda-lv2-${version}";
+  pname = "mda-lv2";
   version = "1.2.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
   };
 
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix
index d16107e4c292a1c8daf93c78199da6c55fa6814c..4d2fa0e15b48923caf02ad660b5d4c57d3a145b2 100644
--- a/pkgs/applications/audio/meterbridge/default.nix
+++ b/pkgs/applications/audio/meterbridge/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.3";
-  name = "meterbridge-${version}";
+  pname = "meterbridge";
 
   src = fetchurl {
-    url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
+    url = "http://plugin.org.uk/meterbridge/${pname}-${version}.tar.gz";
     sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz";
   };
 
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index db70e59218b37380ea98a51ae41ea2320cfa0a59..e4d6c0293df84597c59746456d4885e5ea309d56 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -3,7 +3,7 @@
 , vorbis-tools }:
 
 stdenv.mkDerivation rec {
-  name = "mhwaveedit-${version}";
+  pname = "mhwaveedit";
   version = "1.4.24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix
index dd8b28fc2d8bd463d90dbcef6653a8917eeea64a..48052fc4ec88321c187c333f96b590459fdb3025 100644
--- a/pkgs/applications/audio/midisheetmusic/default.nix
+++ b/pkgs/applications/audio/midisheetmusic/default.nix
@@ -5,7 +5,8 @@
 let
   version = "2.6";
 in stdenv.mkDerivation {
-  name = "midisheetmusic-${version}";
+  pname = "midisheetmusic";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz";
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 6b3abeb1e23cd37b10384e7b4e48c85f197a0a2c..7f86e2c20716880cdffe94fae89f4ae5c013bf4c 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.02.00";
-  name = "milkytracker-${version}";
+  pname = "milkytracker";
 
   src = fetchFromGitHub {
     owner  = "milkytracker";
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix
index dcaffe3eb9b48032cc231c07527c993e68b6c2e2..e91b2c9360de7a95802a9af07d3bbb08cbb11f70 100644
--- a/pkgs/applications/audio/mimic/default.nix
+++ b/pkgs/applications/audio/mimic/default.nix
@@ -3,7 +3,7 @@
 , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "mimic-${version}";
+  pname = "mimic";
   version = "1.2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index bc7c2ff9a24ffad5dc34eefcfd91d86fd1a52269..5cf9b1b8ab70bb34606c0bc7c7856f32be53a033 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation rec {
-  name = "mixxx-${version}";
+  pname = "mixxx";
   version = "2.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 3ed330cc74379acb754f5799f375c196c4a59ab5..89d062d584e56f2342175429d87215a000e7e8bf 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -30,7 +30,7 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "moc-${version}";
+  pname = "moc";
   version = "2.5.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index c66f78373228cf5edb5ac01b379c901a8728f6f4..3fbe927be4bad0bfdfea85766a82eff1f1b02a52 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "mod-distortion-git-${version}";
+  pname = "mod-distortion-git";
   version = "2016-08-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 1b3e89d4885e41bfef552a0e073d9e61095789b7..58bb4d3e327442e2cd88769aa20423ceab66b08a 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "3.99-u4-b5";
   pname = "monkeys-audio";
-  name = pname + "-" + version;
 
   patches = [ ./buildfix.diff ];
 
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
index eb5aa7c036cc2f53749b367387f4f26cdf455fb8..727133be78df0aeebc2560504b20af635156140c 100644
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
 
   version = "3.2.6";
 
-  name = "mp3blaster-${version}";
+  pname = "mp3blaster";
 
   src = fetchFromGitHub {
     owner = "stragulus";
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index f2922e7eecf9931613cc36c39ab5164e7cecbfe7..f067c5af6df3f4638b76d0b7ac03bcedd14c9fa4 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -3,11 +3,10 @@
 stdenv.mkDerivation rec {
   pname = "mp3splt";
   version = "2.6.2";
-  name = "${pname}-${version}";
 
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry";
   };
 
diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix
index 7477bea7602c4cd1b8c2f6615c0210d2dd3a04e5..6c35779f6c4cf0e52e39c71d0d1ca52f4e4c2348 100644
--- a/pkgs/applications/audio/mp3val/default.nix
+++ b/pkgs/applications/audio/mp3val/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mp3val-${version}";
+  pname = "mp3val";
   version = "0.1.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mp3val/${name}-src.tar.gz";
+    url = "mirror://sourceforge/mp3val/${pname}-${version}-src.tar.gz";
     sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm";
   };
 
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 220e72b568afa736444ca72d9c76e12d1d9adbdb..b13e1cc037a0f93297a27b712ccc3aa4b916dedb 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }:
 
 stdenv.mkDerivation rec {
-  name = "mpc-${version}";
+  pname = "mpc";
   version = "0.28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index efaef97257e0a1c028107084066873a30bdccbed..f024e5a6a1d16bc655cedcbba8596ea84d9a1727 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -2,10 +2,11 @@
 
 let version = "0.2.4"; in
 stdenv.mkDerivation rec {
-  name = "mpc123-${version}";
+  pname = "mpc123";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz";
     sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
   };
 
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 3ffc5265f7a034f31e0b9002ca9224fff22159ee..65dfe3484b666e251ab3957de531aa22235ea830 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpg321-${version}";
+  pname = "mpg321";
   version = "0.3.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index b3efa82ead4792f3a22fd06a2a156c1e584bfd13..8582fd78192909f28e869b1ade1e8663fd8d9cc1 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -17,7 +17,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "muse-sequencer-${version}";
+  pname = "muse-sequencer";
   version = "3.1pre1";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
index e14594ae3b2d370e05f2ff2e08425ad201998918..6f81ebbb8f1e7a64a5bde44e432666416dc44fdc 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -8,7 +8,7 @@ in
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "musescore-darwin-${version}";
+  pname = "musescore-darwin";
   version = "${concatStringsSep "." versionComponents}";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index a595bb069005ba3c17fee66a72a01125ca8b4aec..2e69c3cda7a34317a6ceb537dc8095b41db38175 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "musescore-${version}";
+  pname = "musescore";
   version = "3.0.5";
 
   src = fetchzip {
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index a35d9c670fe8759cd37d08a53ce7a97e9ba61e47..d89b61aa21f44d3592a3cdb5c85df268aaca629c 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -2,7 +2,7 @@
 , mpd_clientlib, gettext, boost }:
 
 stdenv.mkDerivation rec {
-  name = "ncmpc-${version}";
+  pname = "ncmpc";
   version = "0.34";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index d35cefb88416be1b48f5a3558d25a40c436d0bcc..2ba36b4a50d92fcd7fb7e45c4f67f18b24353fc8 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -11,11 +11,11 @@ assert taglibSupport -> (taglib != null);
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "ncmpcpp-${version}";
+  pname = "ncmpcpp";
   version = "0.8.2";
 
   src = fetchurl {
-    url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
+    url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2";
     sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5";
   };
 
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix
index 8b715a24e3cb8675e6a93aceef647ad30a4ddb0c..53ed9b3297c178dbe685e737d0b9f56f7d03e6e2 100644
--- a/pkgs/applications/audio/ncpamixer/default.nix
+++ b/pkgs/applications/audio/ncpamixer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "ncpamixer-${version}";
+  pname = "ncpamixer";
   version = "1.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 44dd0d2d4ec397313da448aaf2ddb95f065f98a3..94cf32f8f8234d9e509d9d70eed8b10a006eebe8 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "non-${version}";
+  pname = "non";
   version = "2018-02-15";
   src = fetchFromGitHub {
     owner = "original-male";
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index 85c902d383963b4b0d9f02c45749b8330d692075..490ecc967bbfbd9c0bedb79f29e128fbb5c9d08a 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libmad }:
 
 stdenv.mkDerivation rec {
-  name = "normalize-${version}";
+  pname = "normalize";
   version = "0.7.7";
 
   src = fetchurl {
-    url = "mirror://savannah/normalize/${name}.tar.gz";
+    url = "mirror://savannah/normalize/${pname}-${version}.tar.gz";
     sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
   };
 
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index bb186687c66ecfee25859e3e2167818b2b68a0b6..91443bb1ef7f6a008d9321f2739d180f8ed0bd4b 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2-2";
-  name = "nova-filters-${version}";
+  pname = "nova-filters";
 
   src = fetchurl {
     url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz;
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index f8f08369ab93cb5c692731bb73d9d602363d6b1b..8116bcaf0bda9af86da4cf4fbef5471d6d767c6a 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -4,7 +4,8 @@
 let
   version = "0.4.1";
 in stdenv.mkDerivation rec {
-  name = "openmpt123-${version}";
+  pname = "openmpt123";
+  inherit version;
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix
index cc4a781ef66c0ef15b38dcbfd3893b023328db80..2507f08e9e5990580429e0cebcfbf114f9e74da0 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/pkgs/applications/audio/pamix/default.nix
@@ -3,7 +3,7 @@
 , libpulseaudio, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "pamix-${version}";
+  pname = "pamix";
   version = "1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 7f3940e0ae9cf5ed41a9f7fb89caa692b6a5ff6a..4f76aefb5ed3d8e5c0aedfcc2ea62638523ce2ab 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "patchage-${version}";
+  pname = "patchage";
   version = "1.0.1";
   src = fetchsvn {
     url = http://svn.drobilla.net/lad/trunk/patchage/;
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index ae43bad5b2c29ca982c86e5a7b219d9e0534e5d4..6440f6e787ffaf96610fbbfc3277740cac3664c7 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "cyclone-${version}";
+  pname = "cyclone";
   version = "0.3beta-2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index 0eb75d77c68c943c4ddbf15c0be3684967ad1f5d..21ba375200bc65d97db135a4474de924bcea047b 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "maxlib-${version}";
+  pname = "maxlib";
   version = "1.5.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
index 972a162b73f446158f8df68f4f81d85587b006cf..9e7de39218d532f491f19426a5763eecfc24e828 100644
--- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
+++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "mrpeach-${version}";
+  pname = "mrpeach";
   version = "1.1";
 
   # this was to only usable url I could find:
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index 37d692a3ab5a69c12294ab559a3da21f16afbcc9..c214d3fcf40509b379ebac0407563c9c33fd8b4a 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "puremapping-${version}";
+  pname = "puremapping";
   version = "20160130";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index f2e54b327fceebd0912c2041e57593dafe695967..fa9660fbbf61a7954bbba612608727ccd27ea900 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.0";
-  name = "timbreid-${version}";
+  pname = "timbreid";
 
   src = fetchurl {
     url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip";
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index d56462ccc8443156aac4a18912335825276d91d5..cc307417c061f6ebcc290a8802a4cd338132fce1 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "zexy-${version}";
+  pname = "zexy";
   version = "2.2.4";
 
   src = fetchurl {
-    url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz";
+    url = "https://puredata.info/downloads/zexy/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
   };
 
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index d86e5aae2cd4868a19a27b7937e9ae38457100fa..8bbeffb1f7a3266723572400d949e1c0006115dc 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -3,11 +3,11 @@
 , pkgconfig, openssl }:
 
 stdenv.mkDerivation  rec {
-  name = "petri-foo-${version}";
+  pname = "petri-foo";
   version = "0.1.87";
 
   src = fetchurl {
-    url =  "mirror://sourceforge/petri-foo/${name}.tar.bz2";
+    url =  "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 53afcdd2306aec82795cf5314eeb9acffaae3c14..c2c4672be12b69ea550f0d837e792fab6276be0b 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
 
 stdenv.mkDerivation  rec {
-  name = "pianobooster-${version}";
+  pname = "pianobooster";
   version = "0.6.4b";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index 16d5eb69cb97929fea0e283df403be4a131674a3..8c21dc8f2ad71495148309c20481648e21f1fbd7 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "playbar2-${version}";
+  pname = "playbar2";
   version = "2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
index 5529998803cfd0f1fcbe153d382a246a03b772d7..346387be7e3cf421250aa3abce3065e607eae9de 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
-  name = "plugin-torture-${version}";
+  pname = "plugin-torture";
   version = "2016-07-25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix
index 9f51d30082593f6a915337bd9b9bc26f03326230..f9b3fbae21370b8ff2c6cc1961d347e64bf52e57 100644
--- a/pkgs/applications/audio/pmidi/default.nix
+++ b/pkgs/applications/audio/pmidi/default.nix
@@ -3,7 +3,8 @@
 , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055"
 }:
 stdenv.mkDerivation {
-  name = "pmidi-${version}";
+  pname = "pmidi";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz";
diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
index 5cfbb7bf5a483ac13ea14ead7eea8a5244b0db71..6d168ec566187c627cebb36bc1ceee1db3e30098 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ponymix-${version}";
+  pname = "ponymix";
   version = "5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 5db5035c8352c9aef7050b21dbe51afa9c5a601c..9414f4211d7a202b59e04d4c97803e0b73ededf8 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "praat-${version}";
+  pname = "praat";
   version = "6.0.43";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 9989f75c0bd7a1e74d3408c6dbd03e8d848437e0..b8082c12c644e45668189742e6424c3f9a81a4a0 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -23,7 +23,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "pulseaudio-modules-bt-${version}";
+  pname = "pulseaudio-modules-bt";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 6ade9042b53275e77ce75f93997371c23b37061b..5886a465409a12c36aa61b3eb53e231c1bbb9daf 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation  rec {
-  name = "puredata-${version}";
+  pname = "puredata";
   version = "0.49-0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 9b8c8035239db34e7a7c282a673294d341c38d4d..0b50d3098aa2302c0b04c11b2bfe7a20d07f0dcb 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -2,12 +2,12 @@
 
 mkDerivation rec {
   version = "0.5.9";
-  name = "qjackctl-${version}";
+  pname = "qjackctl";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
-    url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
+    url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
     sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk";
   };
 
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 16e76bb631c9e48c053ee3cb5fcf3e1af5994d00..d627f352e734b28aa2aba1941d201e99bf544e7e 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.5";
-  name = "qmidinet-${version}";
+  pname = "qmidinet";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
+    url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
     sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y";
   };
 
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index 7f5191a02c20831c11cecb5df9a8d55f50abac7f..2a83d98b6ea3a92ac8ad20dc97ef6892f8bdc45a 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.0";
-  name = "qmidiroute-${version}";
+  pname = "qmidiroute";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz";
     sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
   };
 
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 4e6df82a32a91c272d66499cf7a41fa629637f10..a878f4edad8ffade5d2999a88c70fa75d338f2cc 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -2,11 +2,11 @@
 , liblscp, libgig, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "qsampler-${version}";
+  pname = "qsampler";
   version = "0.5.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsampler/${name}.tar.gz";
+    url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz";
     sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs";
   };
 
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 82e003b2bea3494b73926ff5db7a800446a219a6..81b7e35b6309149bd07c89027747de8150f7a94c 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "qsynth-${version}";
+  pname = "qsynth";
   version = "0.5.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsynth/${name}.tar.gz";
+    url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
     sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6";
   };
 
diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix
index 453da89953e0fbe9f3079701d895e84d594abc20..68e8e6402acf5291b77d02bf90188262d9a37a18 100644
--- a/pkgs/applications/audio/qtscrobbler/default.nix
+++ b/pkgs/applications/audio/qtscrobbler/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "qtscrobbler-${version}";
+  pname = "qtscrobbler";
   version = "0.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index ec71cfb427c6a15307d35b52ce0f7f038263ed0f..36302458a75b0410400f7e3377faf0467fa09a8c 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -2,11 +2,11 @@
 libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
 
 stdenv.mkDerivation  rec {
-  name = "rakarrack-${version}";
+  pname = "rakarrack";
   version = "0.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rakarrack/${name}.tar.bz2";
+    url = "mirror://sourceforge/rakarrack/${pname}-${version}.tar.bz2";
     sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
   };
 
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 6530d737c33dd20a75fceba0e6be6df99c106392..9cff98f61372ac606317e39ccddd0b2a440344b1 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "reaper-${version}";
+  pname = "reaper";
   version = "5.981";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix
index 1918fa9e3a991023be3726dcd2f3e1f915b6420f..e32fd42af3232c6d8630d72a7c66f319d95749ca 100644
--- a/pkgs/applications/audio/redoflacs/default.nix
+++ b/pkgs/applications/audio/redoflacs/default.nix
@@ -2,7 +2,7 @@
 , flac, sox }:
 
 stdenv.mkDerivation rec {
-  name = "redoflacs-${version}";
+  pname = "redoflacs";
   version = "0.30.20150202";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index ddbefd129ffe3cc896f537e09072e932273db008..62625aa421d1ba5d32bfb2f43526e2afda604e68 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "renoise-${version}";
+  pname = "renoise";
   version = "3.1.0";
 
   src =
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index 6516532df33f4c1208d58b86a2ed8dae1cdd237f..c34b27edd96dcc602fcd02535813b542e2e75310 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -4,7 +4,8 @@
 let
   version = "unstable-2018-02-10";
 in stdenv.mkDerivation rec {
-  name = "rhvoice-${version}";
+  pname = "rhvoice";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Olga-Yakovleva";
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 313227f779851184450485b33e8598df6c3cfa5a..9445bf3723c992eb78551b56b556d5307e302e97 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation (rec {
   version = "19.06";
-  name = "rosegarden-${version}";
+  pname = "rosegarden";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+    url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2";
     sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc";
   };
 
diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix
index 9e0a3712c97151a14b92ff5d7b953294cb89bb17..82aa86f795bb426e5e8919b677285658d5d6c901 100644
--- a/pkgs/applications/audio/rubyripper/default.nix
+++ b/pkgs/applications/audio/rubyripper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ruby, cdparanoia, makeWrapper }:
 stdenv.mkDerivation rec {
   version = "0.6.2";
-  name = "rubyripper-${version}";
+  pname = "rubyripper";
   src = fetchurl {
     url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2";
     sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1";
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index f9b1fe6afe00600b17565b3fb2cde0594caadbdc..5a62a8a4292d3ec8bccd7bdab0f05a7faa3e862b 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "samplv1-${version}";
+  pname = "samplv1";
   version = "0.9.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samplv1/${name}.tar.gz";
+    url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
     sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8";
   };
 
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index fbe90c5377df752c3be31aab0b7ad05f1ef317ee..7776fa0c166e356365a276f6d209cca0e4171563 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.1.1-git1-20180828";
 in
 stdenv.mkDerivation {
-  name = "sayonara-player-${version}";
+  pname = "sayonara-player";
+  inherit version;
 
   src = fetchurl {
     url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index ab1a6e387383a24d10750c327002b966630c11cd..f902b2dd41b0e808166e7ee62767890a09b2c3fd 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "20120105";
-  name = "schismtracker-${version}";
+  pname = "schismtracker";
 
   src = fetchurl {
-    url = "http://schismtracker.org/dl/${name}.tar.bz2";
+    url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2";
     sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii";
   };
 
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index d47ede27ece2f6ed5af7859fa3f8f69e9acef509..9bab024f021e5e33fb501e98cba5316fc034268d 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "seq24-${version}";
+  pname = "seq24";
   version = "0.9.3";
 
   src = fetchurl {
-    url = "https://launchpad.net/seq24/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/seq24/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3";
   };
 
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 1047734a2c183d40a41f4f369aa7cae585d1ca1c..9502cb7b7e7e8168e13cb9270fb3fd5d70a26f82 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation  rec {
-  name = "setbfree-${version}";
+  pname = "setbfree";
   version = "0.8.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index a98d1431d65e4473f229300ba581bbaf08d7dfa4..5708ef0ce0a658b092f7e05ec7bda2dcc8747ac0 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sfxr-qt-${version}";
+  pname = "sfxr-qt";
   version = "1.2.0";
   src = fetchFromGitHub {
     owner = "agateau";
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index 8645251b384d27a786c9095c7476d5fc1438acad..dc8d95d2c490d1ca74af2eff540ad8aa9c434602 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.10";
-  name = "shntool-${version}";
+  pname = "shntool";
 
   src = fetchurl {
     url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index b857c5b683584c47f37aaa635a578825530d41aa..aff8c173d9f2b617f918db8122fead4fb59a3c3c 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.4";
-  name = "sidplayfp-${version}";
+  pname = "sidplayfp";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz";
+    url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz";
     sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m";
   };
 
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 5730dec6b9944a2fbeac0a9f6ae341fce4f3ba16..21a36cecbe5495a4d2b3b5466d81c9ec3a817da3 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -32,7 +32,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "snapcast-${version}";
+  pname = "snapcast";
   version = "0.15.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index ee72b6cdb1a4945756be66a1d2b681079ba35320..7934af8aad8e2bca9cc97ecc9309d9bfd97140c0 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -21,7 +21,7 @@ let
 
 in stdenv.mkDerivation rec {
   version = "3.1.0";
-  name = "sonic-pi-${version}";
+  pname = "sonic-pi";
 
   src = fetchFromGitHub {
     owner = "samaaron";
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d5f613b4594550b4e26b469aa6241679e7aded09..501d097f29faabf42b5ec0a20cedd127e405cf4a 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sonic-visualiser-${version}";
+  pname = "sonic-visualiser";
   version = "2.4.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz";
     sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb";
   };
 
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index bf4d96c6fc4ecacc2158855e96d93ca08cfe0752..8dcca85a25c408753f6db7f0f7b19aac391a679c 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sooperlooper-git-${version}";
+  pname = "sooperlooper-git";
   version = "2016-07-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index cf0b5db81f620989e619e925a2ac6828b9d3f341..5d8ae0928c907b008006556f53d67bdabcf09b97 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "sorcer-${version}";
+  pname = "sorcer";
   version = "1.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index babe4edff9df68edb2b024a0d7291ce02e27c1cc..01f0708d1157ec021cd41cc48eb8a1c56ba0eed6 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -15,7 +15,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "soundscape-renderer-unstable-${version}";
+  pname = "soundscape-renderer-unstable";
 
   version = "2016-11-03";
 
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 64deede535b2f3e3edc8c12977aa2e26142d2ad1..7544a3520c76061aaf6f0f57bef12de6c2962759 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }:
 
 stdenv.mkDerivation rec {
-  name = "spectmorph-${version}";
+  pname = "spectmorph";
   version = "0.5.0";
   src = fetchurl {
-    url = "http://spectmorph.org/files/releases/${name}.tar.bz2";
+    url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
     sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
   };
 
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 6614e37022470f3683999ae355b1df6aefa09c05..4c1682b1e0b8f3b071ca5cd59dcac49e8812d076 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "spectrojack-${version}";
+  pname = "spectrojack";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
+    url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz";
     sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 8af7888f74bb30234932b01a3e8dbde7e7d22d95..f4922e388c46f78f8f5e11850bfe852fdbcd60a0 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }:
 
 stdenv.mkDerivation rec {
-  name = "spek-${version}";
+  pname = "spek";
   version = "0.8.3";
 
   src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz";
     sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
   };
diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix
index 372e507ed0e909c9d5aaffa1380504f0f9a52662..3c9565df9199bbdaf110680db04847fa67be4db0 100644
--- a/pkgs/applications/audio/split2flac/default.nix
+++ b/pkgs/applications/audio/split2flac/default.nix
@@ -18,7 +18,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "split2flac-${version}";
+  pname = "split2flac";
   version = "122";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 77aa7994994304dd4be2cd6048c46e3c8494ca4d..403075f91352d702fd0019ef3e9fad5914b7be17 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -60,7 +60,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "spotify-${version}";
+  pname = "spotify";
+  inherit version;
 
   # fetch from snapcraft instead of the debian repository most repos fetch from.
   # That is a bit more cumbersome. But the debian repository only keeps the last
diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix
index 64ae9491535aec223f6651dd1cbe8ff54bb478b3..3447049099b1502d8e00dc70f8d722df4e0f28be 100644
--- a/pkgs/applications/audio/spotifywm/default.nix
+++ b/pkgs/applications/audio/spotifywm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
 stdenv.mkDerivation rec {
-  name = "spotifywm-unstable-${version}";
+  pname = "spotifywm-unstable";
   version = "2016-11-28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix
index 19386b47794263d2915097885ae4f4111a13856a..9eb71835caa92f3ccde18a80b1e9d74642afb0a6 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/pkgs/applications/audio/ssrc/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "ssrc";
-  name = "${pname}-${version}";
   version = "1.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix
index 39d1c266a37368db6498649030d8ea7565e4a915..efa87a2f72cca04b2ab64e76e7ce0bd83d63f3e7 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/pkgs/applications/audio/streamripper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:
 
 stdenv.mkDerivation rec {
-  name = "streamripper-${version}";
+  pname = "streamripper";
   version = "1.64.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/streamripper/${name}.tar.gz";
+    url = "mirror://sourceforge/streamripper/${pname}-${version}.tar.gz";
     sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
   };
 
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index 957ee50ca7ad9655d110c309a37ad248fe3bb4a6..1a3d1a96c85dc2423e51be7e443f2137251bfd61 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -12,7 +12,7 @@ let
     else "x86";
 in
 stdenv.mkDerivation rec {
-  name = "SunVox-${version}";
+  pname = "SunVox";
   version = "1.9.4c";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index 5e26b6c1cdb8ff13474412fe7e4a44d0a898ead0..d25e61c37f5d2d7d788499b37e468367349d38e7 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "svox-${version}";
+  pname = "svox";
   version = "2017-07-18";
 
   src = fetchgit {
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index 6fa0eb7f8f2b090bd8344f532c92c47e521f5af7..b59752d7cc3e5e43ae5bd44d60e6c902fc700121 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "swh-lv2-${version}";
+  pname = "swh-lv2";
   version = "1.0.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index d28329b011710d714f52aac7a853756c78b85b05..1c373aefb4f6f9b35b847df8d17cffc555f7fc6a 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }:
 
 stdenv.mkDerivation rec {
-  name = "synthv1-${version}";
+  pname = "synthv1";
   version = "0.9.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/synthv1/${name}.tar.gz";
+    url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
     sha256 = "0cvamqzg74qfr7kzk3skimskmv0j3d1rmmpbpsmfcrg8srvyx9r2";
   };
 
diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix
index a739d72898e2d683d001bfb7b699262cea6db884..2438cf68536d5d6f69496bed5e9d76d152c6b4c5 100644
--- a/pkgs/applications/audio/tambura/default.nix
+++ b/pkgs/applications/audio/tambura/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
   pname = "Tambura";
-  name = "${pname}-${version}";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index 257963de256f1a63f215c547012bef434ad8b0fb..40362fdd49688f9ef5c0dab4e19b5b49661a2d5e 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tetraproc-${version}";
+  pname = "tetraproc";
   version = "0.8.6";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7";
   };
 
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 78bd43383539921c05988ae9d3df3c07a5cf6623..c983123ca3830e2c647b31d45e83e4cb952a1f78 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -12,11 +12,11 @@ assert enableKDE       -> kdelibs4     != null;
 assert enableTelepathy -> telepathy-qt != null;
 
 stdenv.mkDerivation rec {
-  name = "tomahawk-${version}";
+  pname = "tomahawk";
   version = "0.8.4";
 
   src = fetchurl {
-    url = "http://download.tomahawk-player.org/${name}.tar.bz2";
+    url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2";
     sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g";
   };
 
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 7407904194826b90d9137c7257ee3a7b477c2e37..8eb846ac9c56dcc7edeaa0911dc3c3882fcea489 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -2,7 +2,7 @@
 , glib, gst_all_1,  gtk3, libSM, libX11, libpng12, pango, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "transcribe-${version}";
+  pname = "transcribe";
   version = "8.72";
 
   src = if stdenv.hostPlatform.system == "i686-linux" then
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 0c432acf4afe42c6734b074bdfa5e8ff98735741..0f70f956713165d685b0f9a1a5f694b8f8a86d68 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -3,7 +3,7 @@
 , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
 }:
 stdenv.mkDerivation rec {
-  name = "traverso-${version}";
+  pname = "traverso";
   version = "0.49.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix
index cdee979768cf531b236beff5e6e158e687391734..521133cb08fcaf2760b86b9543389f5e2c835841 100644
--- a/pkgs/applications/audio/tree-from-tags/default.nix
+++ b/pkgs/applications/audio/tree-from-tags/default.nix
@@ -7,7 +7,8 @@ let
     gemdir  = ./.;
   };
 in stdenv.mkDerivation {
-  name = "tree-from-tags-${version}";
+  pname = "tree-from-tags";
+  inherit version;
   src = fetchFromGitHub {
     owner  = "dbrock";
     repo   = "bongo";
diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index 7db3b7ec23768c409faf98426cfd3827f74f740c..b5ff8e41fe0b5c9baf009eafe9465c6698484458 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -3,7 +3,8 @@
 let
   version = "2.13";
 in stdenv.mkDerivation rec {
-  name = "uade123-${version}";
+  pname = "uade123";
+  inherit version;
   src = fetchurl {
     url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
     sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 9a27ed302e6c542761a1683389017dea2a2fa68f..234b98a893c853845279b144878b7eb422504dfe 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -27,7 +27,7 @@ let
   };
 in
 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "VCV-Rack-${version}";
+  pname = "VCV-Rack";
   version = "1.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index ce561b5db314ecfddd875c7ea8e2f337ed38082e..7f02ea9cefec0540d33a7b3598ae529ec864b916 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.09.2";
-  name = "vimpc-${version}";
+  pname = "vimpc";
 
   src = fetchFromGitHub {
     owner = "boysetsfrog";
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index b7b0fba2d548fc38c2fd6e513b7969d1e483bc5e..485edaa1ff27538b0b5dcba724c5d14f2bb0f0f6 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }:
 
 stdenv.mkDerivation  rec {
-  name = "vkeybd-${version}";
+  pname = "vkeybd";
   version = "0.1.18d";
 
   src = fetchurl {
-    url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${name}.tar.bz2";
+    url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${pname}-${version}.tar.bz2";
     sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";
   };
 
diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
index dde96764fe6c61bea501887623c87e28638a9fa8..2bc40a78af4818469118428592aa7f3b8cfa9002 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -5,7 +5,8 @@
 let
   version = "0.5.1";
 in stdenv.mkDerivation rec {
-  name = "vmpk-${version}";
+  pname = "vmpk";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "Virtual MIDI Piano Keyboard";
@@ -15,7 +16,7 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2";
     sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
   };
 
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix
index 735e4eb632c2f2c5013776661652ee9ea9f78a2e..13bf1d674c7c4b795c7098aee7a902eb29c53620 100644
--- a/pkgs/applications/audio/wolf-shaper/default.nix
+++ b/pkgs/applications/audio/wolf-shaper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "wolf-shaper-${version}";
+  pname = "wolf-shaper";
   version = "0.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index ece2f5677912b1fe90b1a67c3c36411b83bc84ac..22594d3ec85ddeb52980535000d46268bafddbc9 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "20190714";
-  name = "x42-plugins-${version}";
+  pname = "x42-plugins";
 
   src = fetchurl {
-    url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
+    url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
     sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4";
   };
 
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index a55b47a6c16b8fa48253889d5a9e510f2f080591..c0803ffa418570addfd6c5a9604d867c2d0e142b 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -2,11 +2,11 @@
 ladspaH, ladspaPlugins, liblo, pkgconfig }:
 
 stdenv.mkDerivation  rec {
-  name = "xsynth-dssi-${version}";
+  pname = "xsynth-dssi";
   version = "0.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dssi/${name}.tar.gz";
+    url = "mirror://sourceforge/dssi/${pname}-${version}.tar.gz";
     sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
   };
 
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
index ca6d6240688aa82637c9b62266a3a264d558893c..c8902f1dda4be6866995bd562c712ab02105b67f 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -1,12 +1,12 @@
 {stdenv,fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "yasr-${version}";
+  pname = "yasr";
 
   version = "0.6.9";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${pname}-${version}.tar.gz";
     sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1";
   };
 
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index b800df016c9ae1a2485d7bba57378c33977fa902..7976f7477171f26cfae17f7b8d365344c41907bc 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "ympd-${version}";
+  pname = "ympd";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 00a22ac711e796ebb6cb2043d34b8906e2fd0169..0936fe5a8ed76b83a85fa81954a7ef442a3659e7 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -5,11 +5,11 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
-  name = "yoshimi-${version}";
+  pname = "yoshimi";
   version = "1.5.11.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
+    url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
     sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154";
   };
 
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 69906b81438292a4283d8135829a11ae237c4a7a..cc04632cfb5cda67e380e459e26f28d5c5097566 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
 
 stdenv.mkDerivation rec {
-  name = "zam-plugins-${version}";
+  pname = "zam-plugins";
   version = "3.11";
 
   src = fetchgit {
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix
index faa90e684aeaaf6eb0b58013b51404aaec16055f..1ec6946cf38c3d976b2c208d3cac7913bb9b3b67 100644
--- a/pkgs/applications/audio/zita-njbridge/default.nix
+++ b/pkgs/applications/audio/zita-njbridge/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.4";
-  name = "zita-njbridge-${version}";
+  pname = "zita-njbridge";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j";
   };
 
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 7bc1c07befa17b6831e2f13d9ab4db08b45f132a..e22bf9ed653a462a87331090ebff7ed0332e03cd 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation  rec {
-  name = "zynaddsubfx-${version}";
+  pname = "zynaddsubfx";
   version = "3.0.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix
index 3a480f70d4b7b5d0c995105abaaa432ae89f1f90..1366bb484a913c3c734efbb33302c0d99271acdd 100644
--- a/pkgs/applications/backup/vdmfec/default.nix
+++ b/pkgs/applications/backup/vdmfec/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "vdmfec-${version}";
+  pname = "vdmfec";
   version = "1.0";
 
   src = fetchurl {
-    url = "http://members.tripod.com/professor_tom/archives/${name}.tgz";
+    url = "http://members.tripod.com/professor_tom/archives/${pname}-${version}.tgz";
     sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm";
   };
 
diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix
index 5a09641c70d16f9f6182844723bc36cea4912ee0..d65889be3ac03e45c2ec82d86ae5bbb1f1cb02f8 100644
--- a/pkgs/applications/blockchains/aeon/default.nix
+++ b/pkgs/applications/blockchains/aeon/default.nix
@@ -7,7 +7,8 @@ let
   version = "0.12.9.0";
 in
 stdenv.mkDerivation {
-  name = "aeon-${version}";
+  pname = "aeon";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "aeonix";
diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index 481e19c66cdc6b1b7e7b413acf188e8a556ba7f9..a8846431f1efd27fd667d68416586bbef2b4f4f3 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -3,7 +3,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "clightning-${version}";
+  pname = "clightning";
   version = "0.7.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix
index b2f2a457a99d6861ea560c949968468c259c78bb..03dcd6cb54e6de4f6fa055af5886c832f14a6e99 100644
--- a/pkgs/applications/blockchains/dashpay.nix
+++ b/pkgs/applications/blockchains/dashpay.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "dashpay-${version}";
+  pname = "dashpay";
   version = "0.12.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix
index cc3e83befa64a9820d152280a22c4787819e02a0..16d39e85da153863f8581704a28cf8395c7fc0a3 100644
--- a/pkgs/applications/blockchains/dcrd.nix
+++ b/pkgs/applications/blockchains/dcrd.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
 
 buildGoPackage rec {
-  name = "dcrd-${version}";
+  pname = "dcrd";
   version = "1.1.2";
   rev = "refs/tags/v${version}";
   goPackagePath = "github.com/decred/dcrd";
diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
index 8d966684b23c5ec884cc98ff1b04ce296bd8f1bd..163ed2615d33e2870be6ab5ed309a3476dc35ff4 100644
--- a/pkgs/applications/blockchains/dcrwallet.nix
+++ b/pkgs/applications/blockchains/dcrwallet.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
 
 buildGoPackage rec {
-  name = "dcrwallet-${version}";
+  pname = "dcrwallet";
   version = "1.1.2";
   rev = "refs/tags/v${version}";
   goPackagePath = "github.com/decred/dcrwallet";
diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix
index 8405ea8f842b97f4ea6031bacfab539278d6c01e..0ab63bb53951e6096a37f8555225f49299a85b4d 100644
--- a/pkgs/applications/blockchains/dero.nix
+++ b/pkgs/applications/blockchains/dero.nix
@@ -2,7 +2,7 @@
 , lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
-  name = "dero-${version}";
+  pname = "dero";
   version = "0.11.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix
index 664159be20134a7de0ddbd7527e82aa7d7da30cf..6cf84f76f919c19701dfdeb571259758a0bbc72a 100644
--- a/pkgs/applications/blockchains/freicoin.nix
+++ b/pkgs/applications/blockchains/freicoin.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.6-2";
-  name = "freicoin-${version}";
+  pname = "freicoin";
 
   src = fetchFromGitHub {
     owner = "freicoin";
diff --git a/pkgs/applications/blockchains/go-ethereum-classic/default.nix b/pkgs/applications/blockchains/go-ethereum-classic/default.nix
index 7461e4c376ab672939f27e5443ff9439f76e913c..ed8086f742f93b7b57351a1f950f30f52a571670 100644
--- a/pkgs/applications/blockchains/go-ethereum-classic/default.nix
+++ b/pkgs/applications/blockchains/go-ethereum-classic/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-ethereum-classic-${version}";
+  pname = "go-ethereum-classic";
   version = "4.0.0";
 
   goPackagePath = "github.com/ethereumproject/go-ethereum";
diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix
index 02a6d25df516423392f414a41ec4ea6d1a639903..dfa005abb6ec2125ffdfc3f197aef33db0b0ac51 100644
--- a/pkgs/applications/blockchains/masari.nix
+++ b/pkgs/applications/blockchains/masari.nix
@@ -2,7 +2,7 @@
 , lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
-  name = "masari-${version}";
+  pname = "masari";
   version = "0.1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index f351c9fa504324fdd75699c056dee719a63d48af..b6f0745286169d780e5ee856a6be915b383dc259 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name    = "monero-${version}";
+  pname = "monero";
   version = "0.14.1.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index 58ab367c020f2526724be9a28555b9b45499baf2..a8d29ae149d94d692e2984c52282131658aefccc 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "nano-wallet-${version}";
+  pname = "nano-wallet";
   version = "18.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix
index c59b2ccb8ac3ee6cb8ae60381e10d0d9e1883003..0615aed2ca03fc02a5ec354ee0169e5467d4a24b 100644
--- a/pkgs/applications/blockchains/parity-ui/default.nix
+++ b/pkgs/applications/blockchains/parity-ui/default.nix
@@ -5,13 +5,13 @@ let
 uiEnv = pkgs.callPackage ./env.nix { };
 
 in stdenv.mkDerivation rec {
-  name = "parity-ui-${version}";
+  pname = "parity-ui";
   version = "0.3.4";
 
   src = fetchurl {
     url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
     sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
-    name = "${name}.deb";
+    name = "${pname}-${version}.deb";
   };
 
   nativeBuildInputs = [ makeWrapper nodePackages.asar ];
diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix
index f5efa0bb52c2f2e41ce3de21f5936429f731196e..613d57cd9c8c8700da20692c513bfacd25a3102d 100644
--- a/pkgs/applications/blockchains/particl/particl-core.nix
+++ b/pkgs/applications/blockchains/particl/particl-core.nix
@@ -16,7 +16,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "particl-core-${version}";
+  pname = "particl-core";
   version = "0.17.1.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix
index e2cf8aa182f33f03403afbecb72e35bdbbc64e28..c0833de7dbf36951060c47f17cee67a44519933c 100644
--- a/pkgs/applications/blockchains/pivx.nix
+++ b/pkgs/applications/blockchains/pivx.nix
@@ -9,7 +9,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pivx-${version}";
+  pname = "pivx";
   version = "3.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix
index 026008b2761a9dd4ffdff8588c72b0d4cf62335d..ad65da057aeca67f2dbe4aea4765ef429d207229 100644
--- a/pkgs/applications/blockchains/sumokoin.nix
+++ b/pkgs/applications/blockchains/sumokoin.nix
@@ -2,7 +2,7 @@
 , libunwind, lmdb, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  name = "sumokoin-${version}";
+  pname = "sumokoin";
   version = "0.2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix
index 7aed32978326bc4b5c421cbe41b37731f007f3e3..365afb5a24119cc8e4dd3508e5cdefc35f4e2514 100644
--- a/pkgs/applications/blockchains/wownero.nix
+++ b/pkgs/applications/blockchains/wownero.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "wownero-${version}";
+  pname = "wownero";
 
   version = "0.6.1.2";
   src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index 45fd3cb8cbb7ddd18ec38db289d3746b2322a584..8302303a08e7a84fa77368d092798c1e1185d8e7 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.1";
-  name = "lightdm-enso-os-greeter-${version}";
+  pname = "lightdm-enso-os-greeter";
 
   src = fetchgit {
     url = https://github.com/nick92/Enso-OS;
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index 91446f73507e424abc8635bb9b8e6a82798c1914..69635718e3ba517e04e7de6d1595e830359a17f2 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "lightdm-mini-greeter-${version}";
+  pname = "lightdm-mini-greeter";
   version = "0.3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 61db182f7446285abdb6331dd07e7225e26d43a5..f892a9da50b985b3f39718f89f5dc6cc2a1b1f16 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -12,10 +12,11 @@ let
   version = "2.0.6";
 in
 stdenv.mkDerivation rec {
-  name = "lightdm-gtk-greeter-${version}";
+  pname = "lightdm-gtk-greeter";
+  inherit version;
 
   src = fetchurl {
-    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
   };
 
diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix
index e8edcc3f634c32b8859978f549c39da02452b491..2f0a770bc71c0cc078bd51b307d2ee4b4dfb2671 100644
--- a/pkgs/applications/display-managers/ly/default.nix
+++ b/pkgs/applications/display-managers/ly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, linux-pam }:
 
 stdenv.mkDerivation rec { 
-  name = "ly-${version}";
+  pname = "ly";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index b5d32493003d79b4e1b7dc823d8b9038e79c3cf4..fc61d43436da2c146f871fa707d2c3eec70fc821 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,13 +1,14 @@
 { mkDerivation, lib, fetchFromGitHub
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs
-, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
+, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
 }:
 
 let
   version = "0.18.1";
 
 in mkDerivation rec {
-  name = "sddm-${version}";
+  pname = "sddm";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "sddm";
@@ -29,7 +30,7 @@ in mkDerivation rec {
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
   buildInputs = [
-    libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
+    libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix
index 214b435429ae4add0978ed94c58125c0c106b3ab..1bd73bebe03b0beaba568baac8847be053ff7f95 100644
--- a/pkgs/applications/editors/aewan/default.nix
+++ b/pkgs/applications/editors/aewan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "aewan-${version}";
+  pname = "aewan";
   version = "1.0.01";
 
   src = fetchurl {
-    url = "mirror://sourceforge/aewan/${name}.tar.gz";
+    url = "mirror://sourceforge/aewan/${pname}-${version}.tar.gz";
     sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
   };
 
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 7db4d3e947bf6d080f65032ab5f12c6a7c0e67aa..170fde7b9cafa74ca25f9ddd9d7d2c84141da78c 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -10,7 +10,7 @@ let
   skia = callPackage ./skia.nix {};
 in
 stdenv.mkDerivation rec {
-  name = "aseprite-${version}";
+  pname = "aseprite";
   version = if unfree then "1.2.11" else "1.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix
index 9f1db1464482b27a104db16f2d8c7a3be7424c6f..a12ccd257f8a1f16bd6cba74e18f9b69733b15cc 100644
--- a/pkgs/applications/editors/bonzomatic/default.nix
+++ b/pkgs/applications/editors/bonzomatic/default.nix
@@ -1,7 +1,6 @@
 { stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "bonzomatic";
   version = "2018-03-29";
 
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 17ae40521986c54380ae23d848823e4ceb841f5c..439b721632d06a76287d8f01d5e6c2797f2fda20 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -8,13 +8,13 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "brackets-${version}";
+  pname = "brackets";
   version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
     sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp";
-    name = "${name}.deb";
+    name = "${pname}-${version}.deb";
   };
 
   phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index f5e14ff1e096da1808421228d82977c7eb5fdd2d..3237c543ee69dc7b96647f7fb51d95eaaeb6563a 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "bvi-${version}";
+  pname = "bvi";
   version = "1.4.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bvi/${name}.src.tar.gz";
+    url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz";
     sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1";
   };
 
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index d08e006ec5b31174d7691f4e13489b3d5abac4e5..2c6b153370e40bae607e2beab2c4eb68f7666c3c 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "bviplus-${version}";
+  pname = "bviplus";
   version = "0.9.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
index 4ab11064eae3d7a014d2f7e6caa1320b081eaf01..65ec43939127892f3601de7d7ead63a899461664 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-10-27";
-  name = "deadpixi-sam-unstable-${version}";
+  pname = "deadpixi-sam-unstable";
 
   src = fetchFromGitHub {
     owner = "deadpixi";
diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix
index f4581c4beceb1153a8d5542db038916332d3769e..efb3a2f9ffabbe8ae25b8fe38d29079fa63f29d7 100644
--- a/pkgs/applications/editors/dhex/default.nix
+++ b/pkgs/applications/editors/dhex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dhex-${version}";
+  pname = "dhex";
   version = "0.69";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix
index 12ca7a071406f0759b1eddf9cfc0b18deb87841d..2f83b0b8d992ab3eae31358ea1743d23dc099b1b 100644
--- a/pkgs/applications/editors/dit/default.nix
+++ b/pkgs/applications/editors/dit/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchurl, stdenv, libiconv, ncurses, lua }:
 
 stdenv.mkDerivation rec {
-  name = "dit-${version}";
+  pname = "dit";
   version = "0.5";
 
   src = fetchurl {
-    url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz";
+    url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc";
   };
 
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 0b6e28434f56458a5812a3c11641d532c1febdf0..0de514233f8ed49544274b40a38f6f75bf241a34 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
 
 stdenv.mkDerivation rec {
-  name = "edbrowse-${version}";
+  pname = "edbrowse";
   version = "3.7.4";
 
   buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix
index 17fa75fe6343252f0a4fff9cefe00f1cea7cca3e..acda484ba3a3f10474be35d647021f6d522df236 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/pkgs/applications/editors/edit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }:
 
 stdenv.mkDerivation rec {
-  name = "edit-nightly-${version}";
+  pname = "edit-nightly";
   version = "20160425";
 
   src = fetchgit {
diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix
index 2d1cbb75981e3ef70f3d540ff66dbdcda8f824a1..ce9f57ef40b6782346f1aa0a258ba1b63ebc1926 100644
--- a/pkgs/applications/editors/emacs-modes/cedille/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cedille, emacs }:
 
 stdenv.mkDerivation rec {
-  name    = "cedille-mode-${version}";
+  pname = "cedille-mode";
   version = cedille.version;
 
   src = cedille.src;
diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index 38457af120bcf5a14fce99153c7f05e0979e5ac9..255b30d60ed1129c54844cbbf222782c0923bf28 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
-  name    = "hol_light-mode-${version}";
+  pname = "hol_light-mode";
   version = "73";
 
   src = fetchsvn {
diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
index 199a5886e1df2c25935d03b447c82e16a789676d..75b72516a3cd28eb1e3cbbb0d1eb76f4872e80ae 100644
--- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
@@ -6,7 +6,8 @@
 let version = "0.15";
 
 in stdenv.mkDerivation {
-  name = "hsc3-mode-${version}";
+  pname = "hsc3-mode";
+  inherit version;
   src = fetchurl {
     url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz;
     sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 17cf213a799da696a86ae45d12c8cfb97cd4a950..27dcd1063bf2a2bb2532d7f229ee4c6077b0ddb7 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -21,7 +21,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2019-02-22";
-  name = "icicles-${version}";
+  pname = "icicles";
 
   srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
 
-  installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
+  installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/";
 
   meta = {
     homepage = https://www.emacswiki.org/emacs/Icicles;
diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
index 3cc8156337e0309b5e6b56f367b7b4644b647c44..eaa0f2c2a5b1df75ee8dd63401b0b7355f700772 100644
--- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
@@ -4,7 +4,8 @@ let
   version = "3.6-4-gb659bf8";
 in
 stdenv.mkDerivation {
-  name = "ido-ubiquitous-${version}";
+  pname = "ido-ubiquitous";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "DarwinAwardWinner";
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 9f8d408dd5a2dabd1c7289e4fefb38618bbce653..becc2dc5dc9b80e65b5417081c6e322de5d13f1c 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -5,7 +5,8 @@
 
 let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
 in stdenv.mkDerivation {
-  name = "ocaml-mode-${version}";
+  pname = "ocaml-mode";
+  inherit version;
   inherit (ocaml) prefixKey src;
 
   # a quick configure to get the Makefile generated. Since
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index 6d420599152a6a28a5503c6ae272e7bf1708d5ad..e48fba1551e7829946975dd365cecac12f96be30 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -4,7 +4,7 @@ with qt5;
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
-  name = "featherpad-${version}";
+  pname = "featherpad";
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "FeatherPad";
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 104206a1491323e2bea43d91933000ff7b2d0699..b8b11e5e831eeeb294ca3ba6876d173b42e4a8c6 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fltk13, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "flpsed-${version}";
+  pname = "flpsed";
   version = "0.7.3";
 
   src = fetchurl {
-    url = "http://www.flpsed.org/${name}.tar.gz";
+    url = "http://www.flpsed.org/${pname}-${version}.tar.gz";
     sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
   };
 
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 0ff56e9145fb348348ff47e1415e12c6b3e5acd3..a30a8f702242de87415646d58a82a2c7e5659ccf 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -7,10 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "geany-${version}";
+  pname = "geany";
+  inherit version;
 
   src = fetchurl {
-    url = "https://download.geany.org/${name}.tar.bz2";
+    url = "https://download.geany.org/${pname}-${version}.tar.bz2";
     sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
   };
 
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
index 8aea8508aefdd82bf77a1cd40f682fda33204da0..de57fb092157a0db73b7e22f1fc7f3f84b086786 100644
--- a/pkgs/applications/editors/hecate/default.nix
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "0.0.1";
-  name = "hecate-${version}";
+  pname = "hecate";
 
   src = fetchFromGitHub {
     owner  = "evanmiller";
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index dce02b5689064ef92352df6fe2586166c99e207f..4e67fc304b184685c10ac0daa713c883dee41ebf 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "heme-${version}";
+  pname = "heme";
   version = "0.4.2";
   src = fetchurl {
     url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 22cc4d47e680705308e918d4b5f72a945427e232..a6437f070b98ea38101b4a13d213b2867f906f12 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "hexcurse-${version}";
+  pname = "hexcurse";
   version = "1.60.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix
index 4671df77554f5befc584aa949bd5adea65df4d25..09191b38e1bc302d666780279bd4388a6067d605 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/pkgs/applications/editors/hexedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "hexedit-${version}";
+  pname = "hexedit";
   version = "1.2.13";
 
   src = fetchurl {
-    url = "http://rigaux.org/${name}.src.tgz";
+    url = "http://rigaux.org/${pname}-${version}.src.tgz";
     sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
   };
 
diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix
index e7f200a4c07762763e0e0c1c215c1c5efed8c08d..5e5f2f8563cb8ae03d761d0b0ab136f072c0b160 100644
--- a/pkgs/applications/editors/howl/default.nix
+++ b/pkgs/applications/editors/howl/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "howl-${version}";
+  pname = "howl";
   version = "0.6";
 
   # Use the release tarball containing pre-downloaded dependencies sources
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 63864bc581df892f4c0a198d2a0c16cc373fdff3..fc1fe969bdc0d59b4374fd518f2bad74dece34d6 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ht-${version}";
+  pname = "ht";
   version = "2.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 11322e8240c29d9105ae98a697d34ec5e0769112..21a6a8475182af29d83d0105daf42021c36acece 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -13,7 +13,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "jedit-${version}";
+  pname = "jedit";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
     sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x";
diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index b2ace8accd8a99ec6c5fff596ba6ea078b7fe0d2..6f5839b3d06f6de0d43a11277ccb922f4198a9df 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.6";
-  name = "joe-${version}";
+  pname = "joe";
 
   src = fetchurl {
-    url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
+    url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz";
     sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9";
   };
 
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 9547b82efa1f79616cc56bb137cc1c1d54ce90ec..cb9f10281c701340022ef7118e8893d941daf5c5 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "juicipp-${version}";
+  pname = "juicipp";
   version = "1.2.3";
 
   meta = {
diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix
index 5e6406e33f286679ee590d67307348a8e6e1cc0c..4a44b35a0fa77cbda71f1c0d59f11c6f6930410e 100644
--- a/pkgs/applications/editors/jupp/default.nix
+++ b/pkgs/applications/editors/jupp/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "jupp-${version}";
+  pname = "jupp";
   version = "3.1";
   srcName = "joe-3.1jupp31";
 
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index b212773712c2170da6f39123fc0f54cfaf7ec331..df46cb12338617b80196b82ee7b4a7bb7b4b30e2 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -21,7 +21,8 @@ let
 in
 
   stdenv.mkDerivation rec {
-    name = "kodestudio-${version}";
+    pname = "kodestudio";
+    inherit version;
 
     src = fetchurl {
         url = urlStr;
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index c3b46cf61df811e2946f554d230292331cf6b093..795342fba5d813a9e829679b2d2a6ec49fc7802e 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.18.1";
-  name = "leafpad-${version}";
+  pname = "leafpad";
   src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz";
     sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
   };
 
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index a2274be463edbcdaef9da311843df65a7557ded2..ff824d8b45bf9fa8e6e966c1381152e79d65b3d4 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "leo-editor-${version}";
+  pname = "leo-editor";
   version = "5.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index c3a280aed921ca33def72ff0eb71f76d75617b8a..90e8c73e075d3dd5e6047301dd45b2f4d1410094 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -21,13 +21,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "lighttable-${version}";
+  pname = "lighttable";
   version = "0.8.1";
 
   src =
       fetchurl {
         name = "LightTableLinux64.tar.gz";
-        url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz";
+        url = "https://github.com/LightTable/LightTable/releases/download/${version}/${pname}-${version}-linux.tar.gz";
         sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
       };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     tar xf ${src}
     mkdir -p $out/{bin,share/LightTable}
-    mv ./${name}-linux/* $out/share/LightTable
+    mv ./${pname}-${version}-linux/* $out/share/LightTable
 
     patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 4fb8d51b969288913b89c39b71517d4fb46376dc..de1a5ce7879faf4cfb3c5b7415658c6f3f81424c 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }:
 
 stdenv.mkDerivation rec {
-  name = "mg-${version}";
+  pname = "mg";
   version = "20171014";
 
   src = fetchurl {
-    url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
+    url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz";
     sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai";
   };
 
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
index fab3646efdff7f9d5ec2ae1c32b67936332dcab4..e6b93f20c48862e09b7f315ba681c847490f40d7 100644
--- a/pkgs/applications/editors/micro/default.nix
+++ b/pkgs/applications/editors/micro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage  rec {
-  name = "micro-${version}";
+  pname = "micro";
   version = "1.4.1";
 
   goPackagePath = "github.com/zyedidia/micro";
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index a027242c5eefc7d0b35883a9120da18cab255547..9cfcf95e78b16cfd549b1f8c548adada00a67475 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qmake, qtbase, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  name = "mindforger-${version}";
+  pname = "mindforger";
   version = "1.48.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index 3f7eba73ca49b3e2808999ea9b781d499058d421..4e960524b94f74ec06b05349f523b15173b68373 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "moe-${version}";
+  pname = "moe";
   version = "1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/moe/${name}.tar.lz";
+    url = "mirror://gnu/moe/${pname}-${version}.tar.lz";
     sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc";
   };
 
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index c2917aa394f9264505b3f1063cf8e7778f34c0dd..3a21eec07f424e9ceea9ece125f4253c7eda51d6 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -7,10 +7,10 @@
 stdenv.mkDerivation rec {
   version = "5.9.4.5";
   revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b";
-  name = "monodevelop-${version}";
+  pname = "monodevelop";
 
   src = fetchurl {
-    url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2";
     sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji";
   };
 
diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix
index 1b1c6eaf9e543064345e91120f4800b33a1c3ea1..70f99fa749b772d882f52ede549af3c944e91afa 100644
--- a/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -7,10 +7,10 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostP
     { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; };
 in stdenv.mkDerivation rec {
   version = "1.2";
-  name = "tuxguitar-${version}";
+  pname = "tuxguitar";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz";
+    url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz";
     sha256 = metadata.sha256;
   };
 
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 44f8c243bd6d26610f269d9ecb8b4070533f4d07..aea585ce8d66107118e121aa2c1a68cef4ce2210 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -19,11 +19,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "nano-${version}";
+  pname = "nano";
   version = "4.4";
 
   src = fetchurl {
-    url = "mirror://gnu/nano/${name}.tar.xz";
+    url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
     sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia";
   };
 
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
index fb30036e146f191573abd9072cb8ffbc45aeab39..7902ddc410cf886c097115a16a7fc20759c3c890 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nanorc-${version}";
+  pname = "nanorc";
   version = "2018-09-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index 9bc6425bc411c77498f8fd85e6445622fb5d4a14..96687ab81d67e683884b2f58e69586f1a685f252 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "ne-${version}";
+  pname = "ne";
   version = "3.1.2";
   src = fetchFromGitHub {
     owner = "vigna";
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index 6fff6df8cdda7fadfd8c99271b5fbcefa4eb6b05..b1b3a416178bc3a847a88bf05ba9b90ea8f15e6b 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "nedit-${version}";
+  pname = "nedit";
   version = "5.7";
   
   src = fetchurl {
-    url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz";
+    url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz";
     sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd";
   };
 
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 0d0877015eee914e179135a51ff45e002e3eaf6e..7d558dfb89373797a49cd27323299e174348798b 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -20,7 +20,7 @@ let
     ));
 in
   stdenv.mkDerivation rec {
-    name = "neovim-unwrapped-${version}";
+    pname = "neovim-unwrapped";
     version = "0.3.8";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index 3d215b28856407c7847497748053a53eccc3708e..ba01304f723a9febba1c9cff8cddb404c9c4326c 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -15,7 +15,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "netbeans-${version}";
+  pname = "netbeans";
+  inherit version;
   src = fetchurl {
     url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip";
     sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx";
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 03bdd5e088223c64011373490008b1f927593c28..287758e0fd83477df675ca64a895ba6a613a2b96 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -3,11 +3,11 @@
 , qca-qt5, shared-mime-info }:
 
 stdenv.mkDerivation rec {
-  name = "okteta-${version}";
+  pname = "okteta";
   version = "0.26.2";
 
   src = fetchurl {
-    url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv";
   };
 
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index f90e17a6065bf18bd3908e99ffadc2b72445d8f1..74e5460f529fee7ae91b3b8bb0663190f70ff522 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -13,7 +13,8 @@ let
   gwtVer = "2.8.1";
 in
 stdenv.mkDerivation rec {
-  name = "RStudio-${version}";
+  pname = "RStudio";
+  inherit version;
 
   nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
 
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
 
   desktopItem = makeDesktopItem {
-    name = name;
+    name = "${pname}-${version}";
     exec = "rstudio %F";
     icon = "rstudio";
     desktopName = "RStudio";
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 2f4693982a9c01daa55e1d5338cf07d9f91fb37d..2dceee0a37dfa881c7bd926a9035f58c77d75693 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "scite-${version}";
+  pname = "scite";
   version = "4.0.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 90d89ce7799f3c9c780580d6d762be6f1f9c8f37..ac171f60ead75d4664a8cef768096bf0fed6182c 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "sigil-${version}";
+  pname = "sigil";
   version = "0.9.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index 2d52aedc831c097f6480252fd838a05265779758..629bd9d019d2772a8d73ee412535a69c1245e559 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -15,7 +15,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "standardnotes-${version}";
+  pname = "standardnotes";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage";
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index a6d624d4b1ec282d71ab26ed605db728f54eed22..efbca2949dd427a4007056b1b6ea472905f020a9 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
 stdenv.mkDerivation rec {
   version = "git-2014-08-20";
-  name = "supertux-editor-${version}";
+  pname = "supertux-editor";
 
   src = fetchFromGitHub {
     owner = "SuperTux";
diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index dd986b346a3712cc24091181f2819790118f5a5c..48af4a99dadaa27ff611fd7609df53680e1f576f 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "tecoc-git-${version}";
+  pname = "tecoc-git";
   version = "20150606";
 
   src = fetchFromGitHub {
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
   makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros
+    mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
     cp src/tecoc $out/bin
-    cp src/aaout.txt doc/* $out/share/doc/${name}
+    cp src/aaout.txt doc/* $out/share/doc/${pname}-${version}
     cp lib/* lib2/* $out/lib/teco/macros
     (cd $out/bin
      ln -s tecoc Make
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
index dfb2e49e0c8d02ccbc18514bd8225c4bd5de1bb0..5d5843890e14b894116e320d0e53088bca371830 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -15,7 +15,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "TeXmacs-${version}";
+  pname = "TeXmacs";
+  inherit version;
 
   src= fetchurl {
     url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 79ece9d62a98c1303441a10623b0c03eb77b9058..2a4459ddc3ed42fd54ae6ba33d7cf4acfe499c2c 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "texmaker";
   version = "5.0.3";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
+    url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
     sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30";
   };
 
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 50113dd1566b3d6e2beadaca7c09cc1bf79a7a4f..04e2cb45e283bcd1c6f0874197a23525daade5bb 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "texstudio";
   version = "2.12.16";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 79cad6a9782cea69668c745164eb4f10b057393e..85006e51b6636c2f8919821cfa586e1c15300c82 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
 stdenv.mkDerivation rec {
   version = "10.2";
-  name = "textadept-${version}";
+  pname = "textadept";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 86904c11f7489090a1e5d618ba68fb2ee90db574..8042363f73c9e193811bc6799a8c6247b644c3d5 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -4,7 +4,7 @@
 , withPython ? true, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "texworks-${version}";
+  pname = "texworks";
   version = "0.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index aa3b4b99d7a076cacad989c138afc4a22a74e957..6bfce921d0f6e05372621411c7f79d15b2adc1ec 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "tweak-${version}";
+  pname = "tweak";
   version = "3.02";
 
   src = fetchurl {
-    url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz";
+    url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${pname}-${version}.tar.gz";
     sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v";
   };
 
diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix
index 551fa67d9863e49a05f8e9efa9b4560d45e68ffd..fad4e82d37ffe32b4f4cc2161c1177118f9744db 100644
--- a/pkgs/applications/editors/uemacs/default.nix
+++ b/pkgs/applications/editors/uemacs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "uemacs-${version}";
+  pname = "uemacs";
   version = "2014-12-08";
 
   src = fetchgit {
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index 8d3a5353c9891057ba8aaa4d6cbc4928818ad3eb..d1aa59569e62bb6cc6c039c0efc41b6c43b902d0 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "vbindiff-${version}";
+  pname = "vbindiff";
   version = "3.0_beta5";
 
   buildInputs = [ ncurses ];
 
   src = fetchurl {
-    url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz";
+    url = "https://www.cjmweb.net/vbindiff/${pname}-${version}.tar.gz";
     sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh";
   };
 
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 4d37b77f61bffd045ca7ec3b4b60c5ec0a6a96aa..1d65be3e73dd7dcbc692c43f08fd16fc334c7e70 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -68,7 +68,7 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "vim_configurable-${version}";
+  pname = "vim_configurable";
 
   inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
 
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 26cd61d182bd158f8b27d69c3d287ba9ff9322c8..732bfbf0bfd3949abb2329564f25e356db7976ff 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -13,7 +13,7 @@ let
   common = callPackage ./common.nix {};
 in
 stdenv.mkDerivation rec {
-  name = "vim-${version}";
+  pname = "vim";
 
   inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
 
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 369184a35e23b3ced9dff525fd109b336e61b413..82977c2e6bc53a41fcfff636de2569027ff38727 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -25,7 +25,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "macvim-${version}";
+  pname = "macvim";
 
   version = "8.1.1722";
 
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 7825188fea9bc9be0bd40f48617f2c21c000ac8a..5b9548df7f178d6b14474fee85205f56bdb704b4 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vis-${version}";
+  pname = "vis";
   version  = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix
index ce67cc2d6484226d748fe2f40d11340cf3c31429..aab3aecd7d693ad4669fb458fa997a1fbf996364 100644
--- a/pkgs/applications/editors/wily/default.nix
+++ b/pkgs/applications/editors/wily/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.13.42";
-  name = "wily-${version}";
+  pname = "wily";
 
   src = fetchurl {
-    url = "mirror://sourceforge/wily/${name}.tar.gz";
+    url = "mirror://sourceforge/wily/${pname}-${version}.tar.gz";
     sha256 = "1jy4czk39sh365b0mjpj4d5wmymj98x163vmwzyx3j183jqrhm2z";
   };
 
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index c345e8a95d55b6a1e8976877cf13eeea6f52d6d1..09ccbad6cd75a58ca91103c1ec397076e38bb89f 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "wxHexEditor-${version}";
+  pname = "wxHexEditor";
   version = "0.24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix
index d91403bc54ff66b077c6b773ff487165f5851a6a..eeda097db2583afafb2554e47b5fa74271076a19 100644
--- a/pkgs/applications/editors/xmlcopyeditor/default.nix
+++ b/pkgs/applications/editors/xmlcopyeditor/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }:
 
 stdenv.mkDerivation rec {
-  name = "xmlcopyeditor-${version}";
+  pname = "xmlcopyeditor";
   version = "1.2.1.3";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "mirror://sourceforge/xml-copy-editor/${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
     sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v";
   };
 
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index a90275638dc82de8bef8032785035b0d0ab66e1f..100e64fc1975808415637975b213228762b35f6f 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -9,7 +9,7 @@ let
     (self: [ self.yi ] ++ extraPackages self);
 in
 stdenv.mkDerivation rec {
-  name = "yi-custom-${version}";
+  pname = "yi-custom";
   version = "0.0.0.1";
   dontUnpack = true;
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 38aeee6d13efc6490071ec5502b996ed7912cbaf..244f37b10dfff73ebf16894cbdab8383ea4951ed 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "OpenOrienteering-Mapper-${version}";
+  pname = "OpenOrienteering-Mapper";
   version = "0.8.4";
 
   buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 7440e2633a331cfbe4979e7e75d354834dac5489..1ae1221a330cb10e0078680b85d04a3eb5e15d02 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "saga";
   version = "7.3.0";
-  name = "${pname}-${version}";
 
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 003a17aa3d44cbf5b6faac1b4c26942ec4bd40ab..cbd930668f99c21beee38f6e7147d27c01749904 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -20,7 +20,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "imagemagick-${version}";
+  pname = "imagemagick";
   inherit (cfg) version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index ecc6a5b00dec810afcfaa916cf0c926b1e63caa8..59f471ab4e34851c3fcd42a8b236791e372fda9c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -32,7 +32,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "imagemagick-${version}";
+  pname = "imagemagick";
   inherit (cfg) version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 938df76e25725c9ce179c1502e9c49d4126d9ddf..e35a0190d8bc60179938c59ab841430ef9e40e81 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "pythonmagick-${version}";
+  pname = "pythonmagick";
   version = "0.9.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5210af4df7ad5a161111bbd66c48d503914a4911..fb06266cdc59e9c09f8ebd45e04b0c080883ad1b 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -7,7 +7,7 @@
 assert useUnrar -> unrar != null;
 
 stdenv.mkDerivation rec {
-  name = "ahoviewer-${version}";
+  pname = "ahoviewer";
   version = "1.6.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 09664889f35bc0418685855547fe4b3c15a4d53d..5132d5950aab8c8f637a9c41b3b05ef974e87f31 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "alchemy-${version}";
+  pname = "alchemy";
   version = "008";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix
index c918e4b302bb614a8d635d432a543180f278699c..c4f1b4218d079e850f23c863bfa94e1fc682758b 100644
--- a/pkgs/applications/graphics/animbar/default.nix
+++ b/pkgs/applications/graphics/animbar/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "animbar";
   version = "1.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9";
   };
 
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 0257a109568e645df36baf36f4a8f2b8be6cdd3e..7d800d57b631ab9bfdb633170d11976d122b31f4 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -9,7 +9,7 @@ let
   gitTag    = "0.9.3";
 in
   stdenv.mkDerivation rec {
-    name    = "antimony-${version}";
+    pname = "antimony";
     version = "2018-10-20";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index c98c323fc79cc2908bc9bc3bd347f0079b047ca0..5ce36f4f10e98e75c149619429773bc3b685ff54 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  name = "apitrace-${version}";
+  pname = "apitrace";
   version = "7.1-572-g${builtins.substring 0 8 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index cc08dce906c3aa838b62011a72b8d5dd7b7f43b4..57e95dfef106349fc913cf81366930893d8a5a8d 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -6,11 +6,11 @@
 # libpng16.so.16 rather than libpng12.
 
 stdenv.mkDerivation rec {
-  name = "autotrace-${version}";
+  pname = "autotrace";
   version = "0.31.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz";
+    url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz";
     sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js";
   };
 
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 552ca714476fa71817b95f39d5fe89ac65bcb86a..5e1cba31b7ec17ef251113a099f04f192b950baf 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "avocode-${version}";
+  pname = "avocode";
   version = "3.9.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index df742645e86b1d241476bf3cbcd8b573b8514a89..43f8f561e2f1f58c167013f60b252c360808751e 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -23,7 +23,8 @@ let
     '';
   };
 in stdenv.mkDerivation rec {
-  name = "awesomebump-${version}";
+  pname = "awesomebump";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index 7e1c6d7c8c4bcf0da3f3c0eeac0c793830e7b305..4e864d953dfde3488ebc44de523fbfa17933f092 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchgit, cmake, itk, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "c3d";
   version = "2018-10-04";
 
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index a32681c754caf84d53407ae7328f50e6a6f1df6b..d3c7691ccff93cb8a8798f608579f1ed60855bf0 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.2";
-  name = "darktable-${version}";
+  pname = "darktable";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix
index 71e2d82ea7cac2b88ef088c1bf3f1fc94618ddd3..c35aaa044aef7c3448568b93bbabd6bc6f917aa3 100644
--- a/pkgs/applications/graphics/deskew/default.nix
+++ b/pkgs/applications/graphics/deskew/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "deskew-${version}";
+  pname = "deskew";
   version = "1.25";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 0ce160242e56b50f8a6cef58f8a0f31ea9b1b9eb..b0e32678a141c0c86f4625d40bbaca4c1d731f92 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -4,7 +4,7 @@ libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-them
 gtk-mac-integration-gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "dia-${version}";
+  pname = "dia";
   version = "0.97.3.20170622";
 
   src = fetchgit {
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index d90fb41c03ba1ab0039b270f379fd01095b563fb..1917640fd2e59b002a8b3ff119bd1e8f9623a215 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -3,11 +3,11 @@
 , darwin }:
 
 stdenv.mkDerivation rec {
-  name = "djview-${version}";
+  pname = "djview";
   version = "4.10.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/djvu/${name}.tar.gz";
+    url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz";
     sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4";
   };
 
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index 30101bb947709d3aff7e8f14ce8d681bada18407..e59d14f7dd6eea7453c7c5e1676c47c8ea9842b5 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -6,7 +6,8 @@
 
 let version = "2018SP2"; in
 stdenv.mkDerivation {
-  name = "draftsight-${version}";
+  pname = "draftsight";
+  inherit version;
 
   nativeBuildInputs = [ dpkg makeWrapper ];
 
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index eca3740f9758a83ad71f39de11a72e76829ca7ea..5db104f031c47d96617cae50f26b51a641692f93 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -58,7 +58,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "drawpile-${version}";
+  pname = "drawpile";
   version = "2.1.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index 7980d09fed12b802556a74fa371b146f7d5ccba6..c8928540bb6564ac19126214079e41cce5595c99 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "exrtools-${version}";
+  pname = "exrtools";
   version = "0.4";
 
   src = fetchurl {
-    url =  "http://scanline.ca/exrtools/${name}.tar.gz";
+    url =  "http://scanline.ca/exrtools/${pname}-${version}.tar.gz";
     sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
   };
 
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fbc6cd2fafefe325b325f96c22fdf3d211630733..fef068eaf0ff837830f5a13c914e34fb48b79329 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "feh-${version}";
+  pname = "feh";
   version = "3.2.1";
 
   src = fetchurl {
-    url = "https://feh.finalrewind.org/${name}.tar.bz2";
+    url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
     sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg";
   };
 
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix
index 1e54152fff4d302ac8de03e1832407434676ed63..ae38730226a46e4d55516ac802b8ba881faa6406 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/pkgs/applications/graphics/fig2dev/default.nix
@@ -4,7 +4,8 @@ let
   version = "3.2.7a";
 
 in stdenv.mkDerivation {
-  name = "fig2dev-${version}";
+  pname = "fig2dev";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 8ca093b90c3eac984f853810e076d8a600657ba6..3b866297603270df7a21aae2a03fc5b1db337ffd 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "fontmatrix-${version}";
+  pname = "fontmatrix";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index b8f4d54450365dd88f8507d691fc61a3636aa1ed..5f866d00b3e1f28a1894d5219a121aa7e9c921b9 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -8,7 +8,7 @@ assert mpi != null;
 let
   pythonPackages = python3Packages;
 in mkDerivation rec {
-  name = "freecad-${version}";
+  pname = "freecad";
   version = "0.18.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index bdb1e87d70ecb2c43caf3cbb3ca040e29f1d38d7..1d712a63fbdf952ea927f76a0c4e66b92a362ee2 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }:
 
 mkDerivation rec {
-  name = "fstl-${version}";
+  pname = "fstl";
   version = "0.9.3";
 
   buildInputs = [qtbase mesa_glu];
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index 025b3ae65ecee0ef9fa3b63847b2ac4fcd51e00f..103f40fc9c704702dc39902382d72b49582814cd 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.4"; in
 stdenv.mkDerivation {
-  name = "gcolor2-${version}";
+  pname = "gcolor2";
+  inherit version;
   arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 5ad7cb88b03a52f435208946f9b950b869edae4a..c7555b612f7ba190e52e7e93d894ec99dc51840f 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -3,7 +3,8 @@
 let
   version = "2.3.1";
 in stdenv.mkDerivation {
-  name = "gcolor3-${version}";
+  pname = "gcolor3";
+  inherit version;
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 08b2757dd6e8e46cdf1d187a58c8de449b3be454..62e2ebfa4b1ef0717ad431a7a24bed76c8fb49a8 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "geeqie-${version}";
+  pname = "geeqie";
   version = "1.4";
 
   src = fetchurl {
-    url = "http://geeqie.org/${name}.tar.xz";
+    url = "http://geeqie.org/${pname}-${version}.tar.xz";
     sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
   };
 
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index ec708ad971a4833e7eb280578b49c04440ba184d..9ba7dbed37b3077f5dd9391f69e218e04f3cf8bd 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -2,7 +2,7 @@
 , pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
 
 stdenv.mkDerivation rec {
-  name = "giv-${version}";
+  pname = "giv";
   version = "0.9.26";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
index b3671ead377ab2c13a2f7c82bb675dae2d8cc252..eb48333997ca2446ee1cb8d14d937cd26ca05db6 100644
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -2,11 +2,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnuclad-${version}";
+  pname = "gnuclad";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${pname}-${version}.tar.gz";
     sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
   };
 
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index b25ba8f567dfe711fb7554c1d9ec794c3ae53172..e4ab5639ba6612a1716434ec4a1cffaa0e903643 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -2,7 +2,7 @@
 , glfw3, gtk3, libpng12 }:
 
 stdenv.mkDerivation rec {
-  name = "goxel-${version}";
+  pname = "goxel";
   version = "0.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index b1580d73b6417622284133f360584c103ed3ae08..039bb1917d37b2db79dd96abb6607a2d529d6414 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "2.4.2035";
-  name = "grafx2-${version}";
+  pname = "grafx2";
 
   src = fetchurl {
-    url = "https://grafx2.googlecode.com/files/${name}-src.tgz";
+    url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz";
     sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
   };
 
diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix
index fedcafc59788f4853a0378d464c816a513ea693a..be8885caff1fe55f9c6235667d3c312c5a3b34d4 100644
--- a/pkgs/applications/graphics/graphicsmagick/compat.nix
+++ b/pkgs/applications/graphics/graphicsmagick/compat.nix
@@ -1,7 +1,7 @@
 { stdenv, graphicsmagick }:
 
 stdenv.mkDerivation rec {
-  name = "graphicsmagick-imagemagick-compat-${version}";
+  pname = "graphicsmagick-imagemagick-compat";
   inherit (graphicsmagick) version;
 
   dontUnpack = true;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 84d1450da823f48cfd22bb2be07a1ef8d56a3307..403a5285e1501da6630f889b03b870432a4c3471 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -3,7 +3,7 @@
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  name = "graphicsmagick-${version}";
+  pname = "graphicsmagick";
   version = "1.3.32";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix
index 061dc2b69a61a8b60bae1db177fc2ad8fe4953b1..d7b96425968382a349f8df300acd8efb2682592a 100644
--- a/pkgs/applications/graphics/guetzli/default.nix
+++ b/pkgs/applications/graphics/guetzli/default.nix
@@ -3,7 +3,8 @@ let
   version = "1.0.1";
 in
 stdenv.mkDerivation {
-  name = "guetzli-${version}";
+  pname = "guetzli";
+  inherit version;
   src = fetchFromGitHub {
     owner = "google";
     repo = "guetzli";
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
index 0bbd543a307699df0c6a356458ed0441085c06c2..7d5a9013035945d1618c3e2d1b4d781220bda07b 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -8,7 +8,7 @@
 
 let
   imagej150 = stdenv.mkDerivation rec {
-    name = "imagej-${version}";
+    pname = "imagej";
     version = "150";
 
     src = fetchurl {
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index a881c0fc1f93176d6845f41e2ac9fd3fead59ac2..5fdd20825cd53483bed3f7f004e7ff4ef09cd901 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXinerama, imlib2 }:
 
 stdenv.mkDerivation rec {
-  name = "imlibsetroot-${version}";
+  pname = "imlibsetroot";
   version = "1.2";
   src = fetchurl {
     url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz";
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 89712d4d1f7ae61f368264a2ec75adb0fe036db9..38e536c70cbb83db595474fa1dfcd409bd9cb0bf 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "imv-${version}";
+  pname = "imv";
   version = "3.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 42ed667dee983ff2dee78ac11443b504a79fad51..4eb7518cc1027164854fce4d45e5602fb64caf48 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -3,7 +3,7 @@
 let
   inherit (pythonPackages) python;
 in pythonPackages.buildPythonApplication rec {
-  name = "jbrout-${version}";
+  pname = "jbrout";
   version = "338";
 
   src = fetchsvn {
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix
index ed583490c90d6de5afaf19bc73656af195a9b97d..b5664d51a1443ffb19a2ad92d1523cf988238110 100644
--- a/pkgs/applications/graphics/jpeg-archive/default.nix
+++ b/pkgs/applications/graphics/jpeg-archive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }:
 
 stdenv.mkDerivation rec {
-  name = "jpeg-archive-${version}";
+  pname = "jpeg-archive";
   version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15
 
   # update with
diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix
index f438bf6f7ed88004ac7c6d998816674b9238d83e..e15aedd77e1c809a0a541198c7cbf122e8835ef3 100644
--- a/pkgs/applications/graphics/jpeginfo/default.nix
+++ b/pkgs/applications/graphics/jpeginfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "jpeginfo-${version}";
+  pname = "jpeginfo";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
     sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2";
   };
 
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
index b24b14698e6ab56af8f06dd59322a0313409666e..cc1ca3a0ff2a26b915d454c01c8f0ead6f055a08 100644
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
-  name = "jpegoptim-${version}";
+  pname = "jpegoptim";
 
   src = fetchurl {
-    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
     sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8";
   };
 
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 301dc902dce912adcc9f0e84de497841c3e2f715..1487fb8adbac48ce9413a10d6cd66f0731afe956 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.0.6";
-  name = "k3d-${version}";
+  pname = "k3d";
   src = fetchFromGitHub {
     owner = "K-3D";
     repo = "k3d";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
   };
 
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index e70fafa24b60e252650f3339353eb16e9e3af48e..9b96b30c62b118c78c8ca547be70a7a75704bb51 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -5,11 +5,11 @@
 }:
 
 mkDerivation rec {
-  name = "kgraphviewer-${version}";
+  pname = "kgraphviewer";
   version = "2.4.3";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/kgraphviewer/${version}/${pname}-${version}.tar.xz";
     sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l";
   };
 
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
deleted file mode 100644
index de51422d1da6a7c6e0751d38401343a5623bd161..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  stdenv, fetchurl,
-  extra-cmake-modules,
-  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
-  libkipi, qtbase, qtsvg, qtxmlpatterns
-}:
-
-stdenv.mkDerivation rec {
-  pname    = "kipi-plugins";
-  version = "5.9.1";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0hjm05nkz0w926sn4lav5258rda6zkd6gfnqd8hh3fa2q0dd7cq4";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
-    qtbase qtsvg qtxmlpatterns
-  ];
-
-  meta = {
-    description = "Plugins for KDE-based image applications";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = https://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 4f86e5736899de0579bc23365f762c360b81514c..201a4fe113e3b28780843c517a507140d9a08f63 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -6,7 +6,7 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
 { stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "leocad-${version}";
+  pname = "leocad";
   version = "19.07.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix
index 2fddc39e0d0734dd6af412f4379e8ab3c000523b..5f8a0bb6eed37396008f2af66ab8d27adb6dc847 100644
--- a/pkgs/applications/graphics/meme/default.nix
+++ b/pkgs/applications/graphics/meme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "meme-unstable-${version}";
+  pname = "meme-unstable";
   version = "2017-09-10";
 
   owner = "nomad-software";
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index c06a79727094462651cfcea195123bc1e579eadf..fbe8f10c72f772d42ba751e57a4db5f8f2dc2836 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages, libX11, gettext }:
 
 pythonPackages.buildPythonApplication rec {
-    name = "mirage-${version}";
+    pname = "mirage";
     version = "0.9.5.2";
 
     src = fetchurl {
-      url = "mirror://sourceforge/mirageiv/${name}.tar.bz2";
+      url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2";
       sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
     };
 
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index b48fd891a6ac16622045981ef348d02110456fcf..63cc4a3a8d3591204d7fd8c0aa48aedf1af00830 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.3.1";
-  name = "mozjpeg-${version}";
+  pname = "mozjpeg";
 
   src = fetchFromGitHub {
     owner = "mozilla";
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 466ab3e26fb8022b7830814e526a2912737f9fbe..5ad5ab6acc61aadbe661e71132e700844fee85dd 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python2Packages) python pycairo pygobject3 numpy;
 in stdenv.mkDerivation rec {
-  name = "mypaint-${version}";
+  pname = "mypaint";
   version = "1.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index d0838070262a4941814e3d2debefb5bc28db538c..e4393726483662f5f897901c54997a1a64825d31 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -17,7 +17,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nomacs-${version}";
+  pname = "nomacs";
   version = "3.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index cf13c6fb05e9d010c403721d447e25c575298741..13a00991265f43c6648389d580f6fda2dc90e2a6 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -5,7 +5,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-${version}";
+  pname = "paraview";
   version = "5.6.0";
 
   # fetching from GitHub instead of taking an "official" source
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 3cc7166b4e46c8ad721417c43105cd7c6ee867f9..a0aaed49c9c0dc8ba2f87a8416800da5394da60b 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "2018-08-15";
-  name = "pbrt-v3-${version}";
+  pname = "pbrt-v3";
 
   src = fetchFromGitHub {
     rev = "86b5821308088deea70b207bc8c22219d0103d65";
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index f622d3f388e22f18c0e63b90d1a7cff0511f1f48..37857fc459ea9c2c682e3c8b188671b7a7fe81ab 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.4";
-  name = "pencil-${version}";
+  pname = "pencil";
 
   src = fetchurl {
     url    = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb";
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 7da1d4b612f9263f419e850fd7f8c9171e5dcd42..5e7fb5cf7a0a855276d57479ddc4910f8a89e6af 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
 
 stdenv.mkDerivation rec {
-  name = "phototonic-${version}";
+  pname = "phototonic";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 132136da658b761f9c11dda2ce5fbfe81bbf6cb4..f50af2925a3a65a1d2a0ee3fdd2146213cc5431d 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "potrace-${version}";
+  pname = "potrace";
   version = "1.15";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index ec4ce69d5e87e5a8c123a48308f6893944c6dbdb..1ad51e92d472e47da9b41ad3bc6a4a37945cf088 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation (rec {
-  name = "pqiv-${version}";
+  pname = "pqiv";
   version = "2.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index c37e21ec898ae16b25c00c1e17a094a4f1356fd2..4d416a7c106d23563fe041a8cf91985c9837a332 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "qcomicbook-${version}";
+  pname = "qcomicbook";
   version = "0.9.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index ce08e2b1be92199dfd75db8a46b7b169957df441..750217d99188c4f03f39f83220ddc479078ae193 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation (rec {
   version = "2.3.2";
-  name = "qiv-${version}";
+  pname = "qiv";
 
   src = fetchurl {
-    url = "https://spiegl.de/qiv/download/${name}.tgz";
+    url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz";
     sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28";
   };
 
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index b300c0071faead67312b53931ae0cf9ebc1c3fee..7e9547c1067cd3e3c9e0748808000ad1248c40ac 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.8";
-  name = "rapcad-${version}";
+  pname = "rapcad";
 
   src = fetchFromGitHub {
     owner = "gilesbathgate";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 3fd4521d7cd844cf22b6dc88de2c9cd74f3ab3cb..594429503a35009802f362205a6e529478787a7a 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -13,7 +13,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "renderdoc-${version}";
+  pname = "renderdoc";
 
   src = fetchFromGitHub {
     owner = "baldurk";
diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix
index 01c203b407c152042126bda14ba0db97105eda68..d4165be3784fd110cfac4d9f3ea4e886b559be5a 100644
--- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix
+++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, rpmextract }:
 
 stdenv.mkDerivation rec {
-  name = "libsane-dsseries-${version}";
+  pname = "libsane-dsseries";
   version = "1.0.5-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf100974/${name}.x86_64.rpm";
+    url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm";
     sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq";
   };
 
   nativeBuildInputs = [ rpmextract ];
 
   unpackCmd = ''
-    mkdir ${name} && pushd ${name}
+    mkdir ${pname}-${version} && pushd ${pname}-${version}
     rpmextract $curSrc
     popd
   '';
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index f6994db81e4b01940e777ce0c3ba8b329460265d..66473c4a155f1f1a5056dc9c90ed63b664bb896b 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sane-frontends-${version}";
+  pname = "sane-frontends";
   version = "1.0.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
+    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${pname}-${version}.tar.gz";
     sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
   };
 
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index d55441e39fa55fad5aa14127987d49d77dca251e..63f16f688acd3235c91661c0afb090ffbdb9641b 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -3,7 +3,7 @@
 , qtbase, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "scantailor-advanced-${version}";
+  pname = "scantailor-advanced";
   version = "1.0.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 292ae9c8faa875de4929bec6e859f0148c11d570..88bbbd9d86462e8b1c27ff2a8eff5f1d5eaacd61 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "screencloud-${version}";
+  pname = "screencloud";
   version = "1.2.0";
 
   # API Keys. According to the author of the AUR package, these are only used
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix
index d0f2a48c589d29e635b30355baf84492b339b8f1..f56646e5aedd9c1f74af606792aca07d6bf366e9 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "swingsane-${version}";
+  pname = "swingsane";
   version = "0.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index b399dd2d2284d7cfcbd9715acd8903a350191836..34294d2712923688167ace1f6a2932e847b08f02 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -22,7 +22,8 @@ let
   };
 
   synfig = stdenv.mkDerivation rec {
-    name = "synfig-${version}";
+    pname = "synfig";
+    inherit version;
 
     src = fetchFromGitHub {
        repo   = "synfig";
@@ -47,7 +48,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "synfigstudio-${version}";
+  pname = "synfigstudio";
+  inherit version;
 
   src = fetchFromGitHub {
      repo   = "synfig";
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
index 23713271c40981b24f9b0e9cb7dcb9600b0c3572..157c0b9742bfb6046bd529b4b10fb23e1663c6c5 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -2,7 +2,7 @@
 , leptonica, libpng, libtiff, icu, pango, opencl-headers }:
 
 stdenv.mkDerivation rec {
-  name = "tesseract-${version}";
+  pname = "tesseract";
   version = "3.05.00";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
index af0063301f1a5a7174f060036fd3929d73a33473..548f58a50fb1ba4d678f446f951855b2d00ea688 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -2,7 +2,7 @@
 , leptonica, libpng, libtiff, icu, pango, opencl-headers }:
 
 stdenv.mkDerivation rec {
-  name = "tesseract-${version}";
+  pname = "tesseract";
   version = "4.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix
index b4ddb1436856828d0af3345bd4a0d61832d2c0d1..8355545e8dd6df60f3b1e5bd13689ee38a9ad004 100644
--- a/pkgs/applications/graphics/timelapse-deflicker/default.nix
+++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "timelapse-deflicker-${version}";
+  pname = "timelapse-deflicker";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 3a139f3740ccdcbaa0591862eb0939cfbe8268f1..09abfc60a5282fe47e88a4e197cc84a4ef1db7cf 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -27,7 +27,8 @@ let
 
 in
   stdenv.mkDerivation rec {
-    name = "unigine-valley-${version}";
+    pname = "unigine-valley";
+    inherit version;
 
     src = fetchurl {
       url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 48930ccbbb960b1cd97fc57b5cc956d8a1be72e6..4f5fb12faa62f01310b4b455c2e30acb560a2b66 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -2,13 +2,13 @@
 , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
 
 stdenv.mkDerivation rec {
-  name = "viewnior-${version}";
+  pname = "viewnior";
   version = "1.6";
 
   src = fetchFromGitHub {
     owner = "xsisqox";
     repo = "Viewnior";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p";
   };
 
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index e11bc3dd5bb9b3c75ac3e2d4f625587a2122d6b3..232eeeb01153c44c7e610dbeba70f68929760437 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
 stdenv.mkDerivation rec {
-  name = "write_stylus-${version}";
+  pname = "write_stylus";
   version = "209";
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index 182f68f3112cc60c4daab0987a7bc3a87758b7cd..e80362c386b98208da2f8d16238728dcda42a620 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -2,11 +2,11 @@
 , libXt, zlib, gettext, intltool, perl }:
 
 stdenv.mkDerivation rec {
-  name = "xaos-${version}";
+  pname = "xaos";
   version = "3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xaos/${name}.tar.gz";
+    url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz";
     sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
   };
 
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 429af12b9bb336d89f4179019526cee213f8e35d..fe5a13703329aa3e386e1493015f2a6feba002ad 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -6,7 +6,8 @@ let
   version = "3.2.7a";
 
 in stdenv.mkDerivation {
-  name = "xfig-${version}";
+  pname = "xfig";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 2269f1c18f1456656c004afb9b874a6ac08dce8f..ae4765fc9e76909db1da94d68e76ce2561d8170f 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, libX11, libXft}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xfractint";
   version = "20.04p14";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 2487b093148a623cac29cc54404664e451f7980c..41539f32b071e8052d5d5754b4e9c324f9ed04a6 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -23,7 +23,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xournalpp-${version}";
+  pname = "xournalpp";
   version = "1.0.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index 69ab67dffb73d5d646d3478c6e47e4ae63abdb8f..de3f3a78988b17e525eb26d4608ee441b7efeae5 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "xzgv-${version}";
+  pname = "xzgv";
   version = "0.9.2";
   src = fetchurl {
     url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index 3cf42343658c8faa2b1be93885b2ee3ceb580287..e545dd5a72307bc344c078ca632fd4859ffa0f54 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yacreader-${version}";
+  pname = "yacreader";
   version = "9.5.0";
 
   src = fetchurl {
-    url = "https://github.com/YACReader/yacreader/releases/download/${version}/${name}-src.tar.xz";
+    url = "https://github.com/YACReader/yacreader/releases/download/${version}/${pname}-${version}-src.tar.xz";
     sha256 = "0cv5y76kjvsqsv4fp99j8np5pm4m76868i1nn40q6hy573dmxwm6";
   };
 
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 799ceef1beda7fa4aae373c9c74bee75ce37a636..0038d41475fbdf80afc02642fa61241ed3e588c7 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yEd-${version}";
+  pname = "yEd";
   version = "3.19";
 
   src = fetchzip {
-    url = "https://www.yworks.com/resources/yed/demo/${name}.zip";
+    url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
     sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33";
   };
 
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index ac3d303a7a60c8b1beed6178ebe60125bdc336ac..db07b9e1db4e32229b7f01ea332136f2b8cf8696 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -2,9 +2,8 @@
 stdenv.mkDerivation rec {
   version = "0.9.0";
   pname = "zgrviewer";
-  name="${pname}-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip";
+    url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
     sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
   };
   buildInputs = [jre unzip];
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index 7a49e5b2cb7f0d100298d8496b9c6fdf1f6343da..8ef705f7ef4b4c2cf3d0607e9a192a69f3280a6a 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation rec {
-  name = "zgv-${version}";
+  pname = "zgv";
   version = "5.9";
   src = fetchurl {
-    url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz";
+    url = "https://www.svgalib.org/rus/zgv/${pname}-${version}.tar.gz";
     sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
   };
 
diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
index 24ed20fd83fb11f6ff2e2462c83ed81506788fdd..c3964c5c05b5a063400b3f71c98f30fc5d0ccdbc 100644
--- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
+++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
@@ -9,11 +9,11 @@ This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
  KF5AkonadiConfig.cmake.in | 6 +++---
  2 files changed, 3 insertions(+), 6 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9788bea94..15bad00fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -285,9 +285,6 @@ configure_package_config_file(
+Index: akonadi-19.08.0/CMakeLists.txt
+===================================================================
+--- akonadi-19.08.0.orig/CMakeLists.txt
++++ akonadi-19.08.0/CMakeLists.txt
+@@ -306,9 +306,6 @@ configure_package_config_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
      "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
      INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@@ -23,13 +23,13 @@ index 9788bea94..15bad00fd 100644
  )
  
  install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
-index 75abede50..10f039376 100644
---- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
-@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
- find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
- find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
+Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
+===================================================================
+--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in
++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in
+@@ -26,8 +26,8 @@ if(BUILD_TESTING)
+     find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
+ endif()
  
 -set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
 -set_and_check(AKONADI_INCLUDE_DIR          "@PACKAGE_AKONADI_INCLUDE_DIR@")
@@ -38,15 +38,12 @@ index 75abede50..10f039376 100644
  
  find_dependency(Boost "@Boost_MINIMUM_VERSION@")
  
-@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
+@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako
  include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
  
  # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
 -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
 +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
-
+ 
  ####################################################################################
  # CMAKE_AUTOMOC
--- 
-2.15.1
-
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index fcbbbbb72eb3da233b361196f6eb2d2a6e6c904a..ba6bbedeeae73181b144178273910e4aee43cf34 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
-index d85c1a79b..8df02710c 100644
---- a/src/akonadicontrol/agentmanager.cpp
-+++ b/src/akonadicontrol/agentmanager.cpp
-@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
+Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp
++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
+@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose,
      mStorageController = new Akonadi::ProcessControl;
      mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
      connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
@@ -17,11 +17,11 @@ index d85c1a79b..8df02710c 100644
      }
  }
  
-diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
-index be1cc4afb..6d0c1d7e5 100644
---- a/src/akonadicontrol/agentprocessinstance.cpp
-+++ b/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
+Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp
++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
      } else {
          Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
          const QStringList arguments = QStringList() << executable << identifier();
@@ -30,11 +30,11 @@ index be1cc4afb..6d0c1d7e5 100644
          mController->start(agentLauncherExec, arguments);
      }
      return true;
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index dfff6fc29..419e54a5b 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings)
+Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett
      // determine default settings depending on the driver
      QString defaultHostName;
      QString defaultOptions;
@@ -42,7 +42,7 @@ index dfff6fc29..419e54a5b 100644
      QString defaultCleanShutdownCommand;
  
  #ifndef Q_OS_WIN
-@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
  
      const bool defaultInternalServer = true;
@@ -59,8 +59,8 @@ index dfff6fc29..419e54a5b 100644
 +    const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
      if (!mysqladminPath.isEmpty()) {
  #ifndef Q_OS_WIN
-         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings)
+         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
+@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
      }
  
@@ -73,7 +73,7 @@ index dfff6fc29..419e54a5b 100644
      qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
  
      mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -82,7 +82,7 @@ index dfff6fc29..419e54a5b 100644
      mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
      settings.endGroup();
  
-@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett
          // intentionally not namespaced as we are the only one in this db instance when using internal mode
          mDatabaseName = QStringLiteral("akonadi");
      }
@@ -92,7 +92,7 @@ index dfff6fc29..419e54a5b 100644
  
      qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
  
-@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett
      settings.setValue(QStringLiteral("Name"), mDatabaseName);
      settings.setValue(QStringLiteral("Host"), mHostName);
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -102,7 +102,7 @@ index dfff6fc29..419e54a5b 100644
      settings.setValue(QStringLiteral("StartServer"), mInternalServer);
      settings.endGroup();
      settings.sync();
-@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer(
  #endif
  
      // generate config file
@@ -111,56 +111,35 @@ index dfff6fc29..419e54a5b 100644
      const QString localConfig  = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
      const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
      if (globalConfig.isEmpty()) {
-diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 6b50ae50e..f94a8c5eb 100644
---- a/src/server/storage/dbconfigpostgresql.cpp
-+++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
+@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings
      // determine default settings depending on the driver
      QString defaultHostName;
      QString defaultOptions;
 -    QString defaultServerPath;
      QString defaultInitDbPath;
+-    QString defaultPgUpgradePath;
      QString defaultPgData;
  
-@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+ #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
+@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings
  
      mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
      if (mInternalServer) {
--        QStringList postgresSearchPath;
+-        const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql"));
 -
--#ifdef POSTGRES_PATH
--        const QString dir(QStringLiteral(POSTGRES_PATH));
--        if (QDir(dir).exists()) {
--            postgresSearchPath << QStringLiteral(POSTGRES_PATH);
--        }
--#endif
--        postgresSearchPath << QStringLiteral("/usr/bin")
--                           << QStringLiteral("/usr/sbin")
--                           << QStringLiteral("/usr/local/sbin");
--        // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
--        // sorted order, so we search from the newest one to the oldest.
--        QStringList postgresVersionedSearchPaths;
--        QDir versionedDir(QStringLiteral("/usr/lib/postgresql"));
--        if (versionedDir.exists()) {
--            const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
--            for (const auto &path : versionedDirs) {
--                // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed
--                if (path.fileName().startsWith(QLatin1String("10."))) {
--                    postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin"));
--                } else {
--                    postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin"));
--                }
--            }
--        }
--        postgresSearchPath.append(postgresVersionedSearchPaths);
--        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath);
--        defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath);
+-        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths);
+-        defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths);
 +        defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+-        defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths);
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
-@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+ 
+@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -172,7 +151,18 @@ index 6b50ae50e..f94a8c5eb 100644
      qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
      mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
      if (mInternalServer && mInitDbPath.isEmpty()) {
-@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+         mInitDbPath = defaultInitDbPath;
+     }
+     qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath;
+-    mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString();
+-    if (mInternalServer && mPgUpgradePath.isEmpty()) {
+-        mPgUpgradePath = defaultPgUpgradePath;
+-    }
++    mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE);
+     qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
+     mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
+     if (mPgData.isEmpty()) {
+@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings
          settings.setValue(QStringLiteral("Port"), mHostPort);
      }
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -180,6 +170,3 @@ index 6b50ae50e..f94a8c5eb 100644
      settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
      settings.setValue(QStringLiteral("StartServer"), mInternalServer);
      settings.endGroup();
--- 
-2.18.1
-
diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
index 25a835f5ba24365b22c368d531fc403a24276a98..e299a6991f053ab1c72e79ae0b3bfdfe4f1ca7fc 100644
--- a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
@@ -1,8 +1,8 @@
-Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
 ===================================================================
---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
-+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer(
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer(
      bool confUpdate = false;
      QFile actualFile(actualConfig);
      // update conf only if either global (or local) is newer than actual
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index cba0b1e59e3adb88435105650ddff01a82eacb77..b9a96394a6745463e1977d9cef0e52dd9fba3984 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -25,6 +25,7 @@ mkDerivation {
     ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"''
     ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"''
     ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
+    ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
     ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
   ];
   preConfigure = ''
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 01df2bd26316fc3d75b6ad891e16b98473cbc3b9..6027d8daa9d4189bf77b9868c9cbf98e17e50508 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -60,7 +60,7 @@ let
         inherit mkDerivation;
 
         # Team of maintainers assigned to the KDE PIM suite
-        kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
+        kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ];
       };
     in {
       akonadi = callPackage ./akonadi {};
@@ -116,6 +116,7 @@ let
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
       kimap = callPackage ./kimap.nix {};
+      kipi-plugins = callPackage ./kipi-plugins.nix {};
       kitinerary = callPackage ./kitinerary.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
@@ -171,6 +172,7 @@ let
       pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
+      yakuake = callPackage ./yakuake.nix {};
       # Okteta was removed from kde applications and will now be released independently
       # Lets keep an alias for compatibility reasons
       inherit okteta;
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index bd96cb966933bd0c00085d98b976d22cf42a9085..5c72e78c582021f200a418ab2a198e6e376b12be 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ )
+WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ )
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index ceb928acdf2f619a4292c7bdbd752a3063d89691..3d03d1dea3e72c0a28a8f5c373282fe47bb16a4e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   exiv2, lcms2,
   baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
-  phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch
+  phonon, qtimageformats, qtsvg, qtx11extras, kinit
 }:
 
 mkDerivation {
@@ -18,12 +18,4 @@ mkDerivation {
     qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
-
-  # Fixes build with exiv2-0.27.1. Drop in 19.04.2
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch";
-      sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq";
-    })
-  ];
 }
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index e6b4f6b6bdd435968b602d3e3cd982a358d4283d..95ff6cf198b2538eb2001bee855819586d1bab86 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -13,6 +13,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libgit2 ];
   propagatedBuildInputs = [
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 3cb89cb4daa64fd772d46c7866e35577baf9a19e..4e2a308b17f55412f22e897424706c02bcc04881 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit,
-  knotifications, kxmlgui,
+  knotifications, kxmlgui, mpfr,
 }:
 
 mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications
-    kxmlgui
+    kxmlgui mpfr
   ];
 }
diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5fb953acbd62e14b21c97aaca3c7a6dbb07865aa
--- /dev/null
+++ b/pkgs/applications/kde/kipi-plugins.nix
@@ -0,0 +1,23 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
+
+mkDerivation {
+  name    = "kipi-plugins";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];
+
+  meta = {
+    description = "Plugins for KDE-based image applications";
+    license = lib.licenses.gpl2;
+    homepage = https://cgit.kde.org/kipi-plugins.git;
+    maintainers = with lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix
index 64179f2e64dc9388e83fbdebfb2e2f2ea6b72374..7e300ea7157e79200761f1d593d4a471cbf2dcb5 100644
--- a/pkgs/applications/kde/ktouch.nix
+++ b/pkgs/applications/kde/ktouch.nix
@@ -3,7 +3,8 @@
 , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
 , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
 , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
-, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg
+, qtx11extras, qtgraphicaleffects, qtxmlpatterns, qtquickcontrols2
+, xorg
 }:
 
 
@@ -19,7 +20,7 @@
       kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
       kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
       kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
-      qtx11extras qtgraphicaleffects qtxmlpatterns
+      qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2
       xorg.libxkbfile xorg.libxcb
     ];
 
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index bbbcca13d9804fd855b8d97e437c78b2ce2999a1..cd9ff2528fac7a6bd2ec166d34087cc2cb2eb3c3 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -4,7 +4,7 @@
   akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
   kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
   kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
-  kwallet, kwindowsystem, libkdepim, qtwebengine
+  kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
 }:
 
 mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
   buildInputs = [
     akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
     kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
-    kwallet kwindowsystem libkdepim qtwebengine
+    kpurpose kwallet kwindowsystem libkdepim qtwebengine
   ];
   propagatedBuildInputs = [
     akonadi akonadi-contacts kconfig kcontacts kimap
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 43deb08c39f5a11d652f62f8f9de671a1700d756..fb0581cb3411e9c3bf6314527426979bcfb53f58 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1723 +3,1739 @@
 
 {
   akonadi = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz";
-      sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc";
-      name = "akonadi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-19.08.0.tar.xz";
+      sha256 = "ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831";
+      name = "akonadi-19.08.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz";
-      sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48";
-      name = "akonadi-calendar-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-19.08.0.tar.xz";
+      sha256 = "74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b";
+      name = "akonadi-calendar-19.08.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz";
-      sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531";
-      name = "akonadi-calendar-tools-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-tools-19.08.0.tar.xz";
+      sha256 = "9620a4418245a74334c6f57db4ba5558825879440aee5903f5614db08f61e976";
+      name = "akonadi-calendar-tools-19.08.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz";
-      sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262";
-      name = "akonadiconsole-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadiconsole-19.08.0.tar.xz";
+      sha256 = "a683b184109cddbc4d66c55ee3efa2c69092a72e2cd9e78903c4dcf7f442c055";
+      name = "akonadiconsole-19.08.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz";
-      sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc";
-      name = "akonadi-contacts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-contacts-19.08.0.tar.xz";
+      sha256 = "912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4";
+      name = "akonadi-contacts-19.08.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz";
-      sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7";
-      name = "akonadi-import-wizard-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-import-wizard-19.08.0.tar.xz";
+      sha256 = "e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915";
+      name = "akonadi-import-wizard-19.08.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz";
-      sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8";
-      name = "akonadi-mime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-mime-19.08.0.tar.xz";
+      sha256 = "32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4";
+      name = "akonadi-mime-19.08.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz";
-      sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277";
-      name = "akonadi-notes-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-notes-19.08.0.tar.xz";
+      sha256 = "26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3";
+      name = "akonadi-notes-19.08.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz";
-      sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6";
-      name = "akonadi-search-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akonadi-search-19.08.0.tar.xz";
+      sha256 = "fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0";
+      name = "akonadi-search-19.08.0.tar.xz";
     };
   };
   akregator = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz";
-      sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1";
-      name = "akregator-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/akregator-19.08.0.tar.xz";
+      sha256 = "d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820";
+      name = "akregator-19.08.0.tar.xz";
     };
   };
   analitza = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz";
-      sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381";
-      name = "analitza-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/analitza-19.08.0.tar.xz";
+      sha256 = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003";
+      name = "analitza-19.08.0.tar.xz";
     };
   };
   ark = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz";
-      sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6";
-      name = "ark-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ark-19.08.0.tar.xz";
+      sha256 = "0685285486ca933e3467f35c3d5d4e8633ae80f1e5529f8a4d8257d0b53d9512";
+      name = "ark-19.08.0.tar.xz";
     };
   };
   artikulate = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz";
-      sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432";
-      name = "artikulate-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/artikulate-19.08.0.tar.xz";
+      sha256 = "40f1ecb2e6d0d2e8bb1c86d64935c9f2411e0e72781e3211ed0014a02acd72ba";
+      name = "artikulate-19.08.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz";
-      sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98";
-      name = "audiocd-kio-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/audiocd-kio-19.08.0.tar.xz";
+      sha256 = "46013e95fa358004083c185d43afe48b96bd18acba1a33e5706f75b128a3e954";
+      name = "audiocd-kio-19.08.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz";
-      sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6";
-      name = "baloo-widgets-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/baloo-widgets-19.08.0.tar.xz";
+      sha256 = "3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008";
+      name = "baloo-widgets-19.08.0.tar.xz";
     };
   };
   blinken = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz";
-      sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca";
-      name = "blinken-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/blinken-19.08.0.tar.xz";
+      sha256 = "9b993586d8ddab3821b1b4f805cd8b6603822faca93402d42775bea2eb346971";
+      name = "blinken-19.08.0.tar.xz";
     };
   };
   bomber = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz";
-      sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe";
-      name = "bomber-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/bomber-19.08.0.tar.xz";
+      sha256 = "5274f8ef6cd94fcbd887220d6c7b08c1f71050c601d14cf53d847f41f254e043";
+      name = "bomber-19.08.0.tar.xz";
     };
   };
   bovo = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz";
-      sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763";
-      name = "bovo-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/bovo-19.08.0.tar.xz";
+      sha256 = "829ecfe3a46bc1c009fea14c5860aa17ea18f36ed33fdc9296c499992aeed466";
+      name = "bovo-19.08.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz";
-      sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535";
-      name = "calendarsupport-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/calendarsupport-19.08.0.tar.xz";
+      sha256 = "af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4";
+      name = "calendarsupport-19.08.0.tar.xz";
     };
   };
   cantor = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz";
-      sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1";
-      name = "cantor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/cantor-19.08.0.tar.xz";
+      sha256 = "b1d1a735e83ca03d51b79f1fc59612153e94b274d716d65ff3fa94ffdd2f3adc";
+      name = "cantor-19.08.0.tar.xz";
     };
   };
   cervisia = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz";
-      sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b";
-      name = "cervisia-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/cervisia-19.08.0.tar.xz";
+      sha256 = "a72c3a7bad3b30a466d6793318248329d7ddb1a0e00c832744b628a9eb8b8257";
+      name = "cervisia-19.08.0.tar.xz";
     };
   };
   dolphin = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz";
-      sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a";
-      name = "dolphin-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/dolphin-19.08.0.tar.xz";
+      sha256 = "fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0";
+      name = "dolphin-19.08.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz";
-      sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105";
-      name = "dolphin-plugins-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/dolphin-plugins-19.08.0.tar.xz";
+      sha256 = "f074aa7151f4b4d9202d90257952638652a1bf09d02699762f346d85b61c5f54";
+      name = "dolphin-plugins-19.08.0.tar.xz";
     };
   };
   dragon = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz";
-      sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8";
-      name = "dragon-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/dragon-19.08.0.tar.xz";
+      sha256 = "3d792f6dfd4a5d8ad7726fa942840ebed2b2bb6f25ec6f68883b83859c21cacc";
+      name = "dragon-19.08.0.tar.xz";
     };
   };
   eventviews = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz";
-      sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763";
-      name = "eventviews-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/eventviews-19.08.0.tar.xz";
+      sha256 = "2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295";
+      name = "eventviews-19.08.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz";
-      sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae";
-      name = "ffmpegthumbs-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ffmpegthumbs-19.08.0.tar.xz";
+      sha256 = "13f5f8b40c0f6146cdd4d1d9e6a7b7dd19cda9650fe08f9731c050e58f11efee";
+      name = "ffmpegthumbs-19.08.0.tar.xz";
     };
   };
   filelight = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz";
-      sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd";
-      name = "filelight-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/filelight-19.08.0.tar.xz";
+      sha256 = "bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6";
+      name = "filelight-19.08.0.tar.xz";
     };
   };
   granatier = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz";
-      sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22";
-      name = "granatier-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/granatier-19.08.0.tar.xz";
+      sha256 = "b61bf45df63dc3fb324e1a74ec84ae4f2d58371af88ccd28593b0716673dc00a";
+      name = "granatier-19.08.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz";
-      sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a";
-      name = "grantlee-editor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/grantlee-editor-19.08.0.tar.xz";
+      sha256 = "00a7d07aeffc35ac6e3dd39434194ba35c855a603cdc6eca0ece5b00ae1e0e30";
+      name = "grantlee-editor-19.08.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz";
-      sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b";
-      name = "grantleetheme-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/grantleetheme-19.08.0.tar.xz";
+      sha256 = "c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543";
+      name = "grantleetheme-19.08.0.tar.xz";
     };
   };
   gwenview = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz";
-      sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c";
-      name = "gwenview-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/gwenview-19.08.0.tar.xz";
+      sha256 = "1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3";
+      name = "gwenview-19.08.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz";
-      sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58";
-      name = "incidenceeditor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/incidenceeditor-19.08.0.tar.xz";
+      sha256 = "43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea";
+      name = "incidenceeditor-19.08.0.tar.xz";
     };
   };
   juk = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz";
-      sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51";
-      name = "juk-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/juk-19.08.0.tar.xz";
+      sha256 = "d2549c709f8934a5306a16e3a1e2b9e057ead54dc85efe17009e7aacd395edd0";
+      name = "juk-19.08.0.tar.xz";
     };
   };
   k3b = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz";
-      sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942";
-      name = "k3b-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/k3b-19.08.0.tar.xz";
+      sha256 = "6a740724945496395cea1b5850ea9567a9aa9cc8a28c5366c9709b4226dc4b10";
+      name = "k3b-19.08.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz";
-      sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433";
-      name = "kaccounts-integration-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kaccounts-integration-19.08.0.tar.xz";
+      sha256 = "b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a";
+      name = "kaccounts-integration-19.08.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz";
-      sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011";
-      name = "kaccounts-providers-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kaccounts-providers-19.08.0.tar.xz";
+      sha256 = "9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3";
+      name = "kaccounts-providers-19.08.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz";
-      sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd";
-      name = "kaddressbook-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kaddressbook-19.08.0.tar.xz";
+      sha256 = "9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf";
+      name = "kaddressbook-19.08.0.tar.xz";
     };
   };
   kajongg = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz";
-      sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475";
-      name = "kajongg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kajongg-19.08.0.tar.xz";
+      sha256 = "0f522477939de09d4d56d2947fb02b0f20ca0cbac4d21326a9477e11fc173244";
+      name = "kajongg-19.08.0.tar.xz";
     };
   };
   kalarm = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz";
-      sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd";
-      name = "kalarm-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalarm-19.08.0.tar.xz";
+      sha256 = "e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84";
+      name = "kalarm-19.08.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz";
-      sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646";
-      name = "kalarmcal-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalarmcal-19.08.0.tar.xz";
+      sha256 = "5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419";
+      name = "kalarmcal-19.08.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz";
-      sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f";
-      name = "kalgebra-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalgebra-19.08.0.tar.xz";
+      sha256 = "b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb";
+      name = "kalgebra-19.08.0.tar.xz";
     };
   };
   kalzium = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz";
-      sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5";
-      name = "kalzium-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kalzium-19.08.0.tar.xz";
+      sha256 = "0dac199871b8d01890b8959cd5c4776eb2f938f7fb4a558b23364f9dd8e15111";
+      name = "kalzium-19.08.0.tar.xz";
     };
   };
   kamera = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz";
-      sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f";
-      name = "kamera-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kamera-19.08.0.tar.xz";
+      sha256 = "f287f1db119946d2e62d4ccd52a66671343042563cc87da246f2692fa1b775c6";
+      name = "kamera-19.08.0.tar.xz";
     };
   };
   kamoso = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz";
-      sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796";
-      name = "kamoso-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kamoso-19.08.0.tar.xz";
+      sha256 = "2aa8765f71109e813836dced26994a953973ef6f4d517ab224691f2342d64129";
+      name = "kamoso-19.08.0.tar.xz";
     };
   };
   kanagram = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz";
-      sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38";
-      name = "kanagram-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kanagram-19.08.0.tar.xz";
+      sha256 = "4f4ccf9cf48711d8fe9a5966294ba16b43092b8df3fdb03b5c236d22157d275c";
+      name = "kanagram-19.08.0.tar.xz";
     };
   };
   kapman = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz";
-      sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400";
-      name = "kapman-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kapman-19.08.0.tar.xz";
+      sha256 = "e0e53e60e7af1f0002343969b2ce0ce47e0cd3d7318b44d2827478291c2a9cd4";
+      name = "kapman-19.08.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz";
-      sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3";
-      name = "kapptemplate-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kapptemplate-19.08.0.tar.xz";
+      sha256 = "a25170f3527e85bea9509fe5cb991544c0a1dab8f7025c71fd5b0d4c82d9e169";
+      name = "kapptemplate-19.08.0.tar.xz";
     };
   };
   kate = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz";
-      sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f";
-      name = "kate-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kate-19.08.0.tar.xz";
+      sha256 = "6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878";
+      name = "kate-19.08.0.tar.xz";
     };
   };
   katomic = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz";
-      sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5";
-      name = "katomic-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/katomic-19.08.0.tar.xz";
+      sha256 = "12b2a0e703312159a8a217ddb5e19c9a9bea1825d668dd4377fe8e52101f3c90";
+      name = "katomic-19.08.0.tar.xz";
     };
   };
   kbackup = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz";
-      sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f";
-      name = "kbackup-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbackup-19.08.0.tar.xz";
+      sha256 = "2cd447ef7d53e7ee55868086e7a894f550fd81515cf5d87d0561520f45145127";
+      name = "kbackup-19.08.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz";
-      sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431";
-      name = "kblackbox-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kblackbox-19.08.0.tar.xz";
+      sha256 = "44907aed2a2a24f57cb5ae0046a857645788d8d7aeb9383187b516c9f519a72c";
+      name = "kblackbox-19.08.0.tar.xz";
     };
   };
   kblocks = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz";
-      sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390";
-      name = "kblocks-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kblocks-19.08.0.tar.xz";
+      sha256 = "3337c6fb57fdb8439e6e6edc0186fec76641196714daa955465e009923573b84";
+      name = "kblocks-19.08.0.tar.xz";
     };
   };
   kblog = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz";
-      sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93";
-      name = "kblog-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kblog-19.08.0.tar.xz";
+      sha256 = "15abd5dfd0499633703273823ceddc8e64b52b0217b04bea3d86cb9ac54da189";
+      name = "kblog-19.08.0.tar.xz";
     };
   };
   kbounce = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz";
-      sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12";
-      name = "kbounce-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbounce-19.08.0.tar.xz";
+      sha256 = "3df779542c1d74d63e66a4db86210d75e37939f8f29947851b9c76c347856025";
+      name = "kbounce-19.08.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz";
-      sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad";
-      name = "kbreakout-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbreakout-19.08.0.tar.xz";
+      sha256 = "87748c5bda9b7563531e0b0701ec4a745cd95121b9bd426448e5ed476292fdd4";
+      name = "kbreakout-19.08.0.tar.xz";
     };
   };
   kbruch = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz";
-      sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00";
-      name = "kbruch-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kbruch-19.08.0.tar.xz";
+      sha256 = "29c83039af494703e9d665eca2acde30bb4b94666b3dfe9092833e35f83a9541";
+      name = "kbruch-19.08.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz";
-      sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2";
-      name = "kcachegrind-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcachegrind-19.08.0.tar.xz";
+      sha256 = "676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b";
+      name = "kcachegrind-19.08.0.tar.xz";
     };
   };
   kcalc = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz";
-      sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91";
-      name = "kcalc-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcalc-19.08.0.tar.xz";
+      sha256 = "58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103";
+      name = "kcalc-19.08.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz";
-      sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9";
-      name = "kcalcore-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcalcore-19.08.0.tar.xz";
+      sha256 = "7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85";
+      name = "kcalcore-19.08.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz";
-      sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec";
-      name = "kcalutils-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcalutils-19.08.0.tar.xz";
+      sha256 = "ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e";
+      name = "kcalutils-19.08.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz";
-      sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec";
-      name = "kcharselect-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcharselect-19.08.0.tar.xz";
+      sha256 = "31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020";
+      name = "kcharselect-19.08.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz";
-      sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a";
-      name = "kcolorchooser-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcolorchooser-19.08.0.tar.xz";
+      sha256 = "bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb";
+      name = "kcolorchooser-19.08.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz";
-      sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088";
-      name = "kcontacts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcontacts-19.08.0.tar.xz";
+      sha256 = "b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e";
+      name = "kcontacts-19.08.0.tar.xz";
     };
   };
   kcron = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz";
-      sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951";
-      name = "kcron-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kcron-19.08.0.tar.xz";
+      sha256 = "1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c";
+      name = "kcron-19.08.0.tar.xz";
     };
   };
   kdav = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz";
-      sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737";
-      name = "kdav-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdav-19.08.0.tar.xz";
+      sha256 = "8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6";
+      name = "kdav-19.08.0.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz";
-      sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2";
-      name = "kdebugsettings-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdebugsettings-19.08.0.tar.xz";
+      sha256 = "b47987cabffe464c21c96b31991643efafc24f77d31b768ed9dff075567aa361";
+      name = "kdebugsettings-19.08.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz";
-      sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2";
-      name = "kde-dev-scripts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kde-dev-scripts-19.08.0.tar.xz";
+      sha256 = "8028d1f5390f608974235123a7c14342fb0c247456e6088d4f16797875efdf18";
+      name = "kde-dev-scripts-19.08.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz";
-      sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b";
-      name = "kde-dev-utils-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kde-dev-utils-19.08.0.tar.xz";
+      sha256 = "fc95211b92fa76e53558111d5cd64227f194df15fb13f2d81c809facd796f2c5";
+      name = "kde-dev-utils-19.08.0.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz";
-      sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30";
-      name = "kdeedu-data-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdeedu-data-19.08.0.tar.xz";
+      sha256 = "658063227b9d4d7e4e238038ffa9c76e5c5f3015c923967477f514b063940eb0";
+      name = "kdeedu-data-19.08.0.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz";
-      sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821";
-      name = "kdegraphics-mobipocket-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-mobipocket-19.08.0.tar.xz";
+      sha256 = "28c6566f32855a43d10829070cc47d0f4c879ca89eb3228ea6274d0f32fa90fe";
+      name = "kdegraphics-mobipocket-19.08.0.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz";
-      sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e";
-      name = "kdegraphics-thumbnailers-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-thumbnailers-19.08.0.tar.xz";
+      sha256 = "127a99fffdaee3772b03a6c197357311ec56047caccce967f0d74b5489722ddf";
+      name = "kdegraphics-thumbnailers-19.08.0.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz";
-      sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd";
-      name = "kdenetwork-filesharing-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdenetwork-filesharing-19.08.0.tar.xz";
+      sha256 = "a7e2e7d79c7e6486e2d2efe8f85e2be2f6231ca5e4e49e2bd332befb9d6d4288";
+      name = "kdenetwork-filesharing-19.08.0.tar.xz";
     };
   };
   kdenlive = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz";
-      sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5";
-      name = "kdenlive-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdenlive-19.08.0.tar.xz";
+      sha256 = "01b60bf58f6818a5ca9aa6e7a79111965700e6948da0bc0edd1184c26fd872e4";
+      name = "kdenlive-19.08.0.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz";
-      sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882";
-      name = "kdepim-addons-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdepim-addons-19.08.0.tar.xz";
+      sha256 = "8eb692f9dcb86fec2ec207f719c774492df222fceab2ccc2bdf530cb57aa1c3e";
+      name = "kdepim-addons-19.08.0.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz";
-      sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d";
-      name = "kdepim-apps-libs-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdepim-apps-libs-19.08.0.tar.xz";
+      sha256 = "2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e";
+      name = "kdepim-apps-libs-19.08.0.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz";
-      sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744";
-      name = "kdepim-runtime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdepim-runtime-19.08.0.tar.xz";
+      sha256 = "634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef";
+      name = "kdepim-runtime-19.08.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz";
-      sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16";
-      name = "kdesdk-kioslaves-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdesdk-kioslaves-19.08.0.tar.xz";
+      sha256 = "cb49f23038d6841ea3a08f840328372aaee53dd915ab5a923753a4a899199ae0";
+      name = "kdesdk-kioslaves-19.08.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz";
-      sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442";
-      name = "kdesdk-thumbnailers-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdesdk-thumbnailers-19.08.0.tar.xz";
+      sha256 = "e640f1a484482f6dd4ba4ebda92832a027a20e64e1e12d2306bd7dd618b36356";
+      name = "kdesdk-thumbnailers-19.08.0.tar.xz";
     };
   };
   kdf = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz";
-      sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5";
-      name = "kdf-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdf-19.08.0.tar.xz";
+      sha256 = "e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe";
+      name = "kdf-19.08.0.tar.xz";
     };
   };
   kdialog = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz";
-      sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a";
-      name = "kdialog-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdialog-19.08.0.tar.xz";
+      sha256 = "dc60f9ea0c59435b0da37f4bc50716d43ebfb9b9d0b05955c96393e6d06ea687";
+      name = "kdialog-19.08.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz";
-      sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3";
-      name = "kdiamond-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kdiamond-19.08.0.tar.xz";
+      sha256 = "f37d526610fa0579d5be9de19325ed82e14763c997d9ea026dfcf1068bf2428a";
+      name = "kdiamond-19.08.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz";
-      sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db";
-      name = "keditbookmarks-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/keditbookmarks-19.08.0.tar.xz";
+      sha256 = "98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac";
+      name = "keditbookmarks-19.08.0.tar.xz";
     };
   };
   kfind = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz";
-      sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd";
-      name = "kfind-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kfind-19.08.0.tar.xz";
+      sha256 = "25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff";
+      name = "kfind-19.08.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz";
-      sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75";
-      name = "kfloppy-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kfloppy-19.08.0.tar.xz";
+      sha256 = "312345286fa1dba2cac782523d95c1e4ed0d7ef272c93c5d7bf2f9d8f635fa82";
+      name = "kfloppy-19.08.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz";
-      sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973";
-      name = "kfourinline-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kfourinline-19.08.0.tar.xz";
+      sha256 = "f84ad6a3e0b2ecbb8c8ab7f451e9534f47627d9d90ff21f188df23dfd23ce22e";
+      name = "kfourinline-19.08.0.tar.xz";
     };
   };
   kgeography = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz";
-      sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502";
-      name = "kgeography-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kgeography-19.08.0.tar.xz";
+      sha256 = "83eb429851360d848e3e028ef2748a9d66470b8f3dc3bf66fbbfd08b534a7a75";
+      name = "kgeography-19.08.0.tar.xz";
     };
   };
   kget = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz";
-      sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629";
-      name = "kget-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kget-19.08.0.tar.xz";
+      sha256 = "4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b";
+      name = "kget-19.08.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz";
-      sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760";
-      name = "kgoldrunner-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kgoldrunner-19.08.0.tar.xz";
+      sha256 = "db203add309e10902a0e2b770929bf002b22ab78668ea432ecbf4497dfdc06b6";
+      name = "kgoldrunner-19.08.0.tar.xz";
     };
   };
   kgpg = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz";
-      sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb";
-      name = "kgpg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kgpg-19.08.0.tar.xz";
+      sha256 = "3aa31f524c7f8ab50a86d83066590b98cd4ffbeb94b5a6fb7dadec9fe3072845";
+      name = "kgpg-19.08.0.tar.xz";
     };
   };
   khangman = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz";
-      sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27";
-      name = "khangman-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/khangman-19.08.0.tar.xz";
+      sha256 = "ff14cefbd78f047b6250ec3cf4d11e13484f30cc5610616c0a9270008b36f1a1";
+      name = "khangman-19.08.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz";
-      sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114";
-      name = "khelpcenter-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/khelpcenter-19.08.0.tar.xz";
+      sha256 = "36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f";
+      name = "khelpcenter-19.08.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz";
-      sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a";
-      name = "kidentitymanagement-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kidentitymanagement-19.08.0.tar.xz";
+      sha256 = "9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d";
+      name = "kidentitymanagement-19.08.0.tar.xz";
     };
   };
   kig = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz";
-      sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79";
-      name = "kig-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kig-19.08.0.tar.xz";
+      sha256 = "ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee";
+      name = "kig-19.08.0.tar.xz";
     };
   };
   kigo = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz";
-      sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad";
-      name = "kigo-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kigo-19.08.0.tar.xz";
+      sha256 = "0100195b3289b88b9813e453fc7ec6229a648718a6525bb3e6d0e0c0ead97595";
+      name = "kigo-19.08.0.tar.xz";
     };
   };
   killbots = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz";
-      sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938";
-      name = "killbots-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/killbots-19.08.0.tar.xz";
+      sha256 = "909ce7808251a5d0537e2d35fae944b932973c36035f1c08f3143227e2d5cf4f";
+      name = "killbots-19.08.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz";
-      sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533";
-      name = "kimagemapeditor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kimagemapeditor-19.08.0.tar.xz";
+      sha256 = "e2c0b75b65176a9ccbdccbae57be90ee8084593a64bee10b133787077affbde9";
+      name = "kimagemapeditor-19.08.0.tar.xz";
     };
   };
   kimap = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz";
-      sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f";
-      name = "kimap-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kimap-19.08.0.tar.xz";
+      sha256 = "d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060";
+      name = "kimap-19.08.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz";
-      sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd";
-      name = "kio-extras-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kio-extras-19.08.0.tar.xz";
+      sha256 = "792a6a6d1ea2457dda10aedc6cefd3518064c8f47c62f9c3c4a508442b83d3cd";
+      name = "kio-extras-19.08.0.tar.xz";
+    };
+  };
+  kipi-plugins = {
+    version = "19.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/19.08.0/src/kipi-plugins-19.08.0.tar.xz";
+      sha256 = "21fb6b997aeeeb462fd83ff90a36597b5c74b5711a837959f1e6cdc9a300c4e9";
+      name = "kipi-plugins-19.08.0.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz";
-      sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2";
-      name = "kirigami-gallery-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kirigami-gallery-19.08.0.tar.xz";
+      sha256 = "e32f596c188911336060838c071f7856aba02438b335f107bf057644948cf9d6";
+      name = "kirigami-gallery-19.08.0.tar.xz";
     };
   };
   kiriki = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz";
-      sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b";
-      name = "kiriki-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kiriki-19.08.0.tar.xz";
+      sha256 = "42f69734c0268f4c3c4ed0b915318d9570d599c6a0fd8a2a02597f1e31cd50d7";
+      name = "kiriki-19.08.0.tar.xz";
     };
   };
   kiten = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz";
-      sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4";
-      name = "kiten-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kiten-19.08.0.tar.xz";
+      sha256 = "891ccf6c610099c63045aedccee4d1ac87c5189066fd2763e0743a40b2538b53";
+      name = "kiten-19.08.0.tar.xz";
     };
   };
   kitinerary = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz";
-      sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318";
-      name = "kitinerary-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kitinerary-19.08.0.tar.xz";
+      sha256 = "76db853705b87015a934334985c216d11b48e853a3dd31429abb3bc6bd7f52e6";
+      name = "kitinerary-19.08.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz";
-      sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1";
-      name = "kjumpingcube-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kjumpingcube-19.08.0.tar.xz";
+      sha256 = "d72c1164777f27b7711a0b74575ba38a9e34fca45c22915e10e7e792f7c00b33";
+      name = "kjumpingcube-19.08.0.tar.xz";
     };
   };
   kldap = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz";
-      sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b";
-      name = "kldap-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kldap-19.08.0.tar.xz";
+      sha256 = "4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16";
+      name = "kldap-19.08.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz";
-      sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67";
-      name = "kleopatra-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kleopatra-19.08.0.tar.xz";
+      sha256 = "161e6f7cf39aadfc856446642bf4c95c97b21647ba90698b17ab557e9c9e70ef";
+      name = "kleopatra-19.08.0.tar.xz";
     };
   };
   klettres = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz";
-      sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847";
-      name = "klettres-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/klettres-19.08.0.tar.xz";
+      sha256 = "0a680ff0c2c3868a2478da0e2a5eb8db8579e5ba9165743c8a2c20704c062be4";
+      name = "klettres-19.08.0.tar.xz";
     };
   };
   klickety = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz";
-      sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af";
-      name = "klickety-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/klickety-19.08.0.tar.xz";
+      sha256 = "aad8c7b9e4c07ca8bd64beae71330e51d45dcaa9929a9ce56b7c675fc9e583f0";
+      name = "klickety-19.08.0.tar.xz";
     };
   };
   klines = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz";
-      sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962";
-      name = "klines-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/klines-19.08.0.tar.xz";
+      sha256 = "c49ff3c4bb1612d5699c4a3b0613c6599cf23c0baa79806b8616dbea757d48f8";
+      name = "klines-19.08.0.tar.xz";
     };
   };
   kmag = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz";
-      sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874";
-      name = "kmag-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmag-19.08.0.tar.xz";
+      sha256 = "7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4";
+      name = "kmag-19.08.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz";
-      sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99";
-      name = "kmahjongg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmahjongg-19.08.0.tar.xz";
+      sha256 = "f601963d0670639a11c4100ed1f53a0e308f79ddf98e1b4fc6a0a4674e117f22";
+      name = "kmahjongg-19.08.0.tar.xz";
     };
   };
   kmail = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz";
-      sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5";
-      name = "kmail-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmail-19.08.0.tar.xz";
+      sha256 = "052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28";
+      name = "kmail-19.08.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz";
-      sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8";
-      name = "kmail-account-wizard-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmail-account-wizard-19.08.0.tar.xz";
+      sha256 = "5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622";
+      name = "kmail-account-wizard-19.08.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz";
-      sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa";
-      name = "kmailtransport-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmailtransport-19.08.0.tar.xz";
+      sha256 = "cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd";
+      name = "kmailtransport-19.08.0.tar.xz";
     };
   };
   kmbox = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz";
-      sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0";
-      name = "kmbox-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmbox-19.08.0.tar.xz";
+      sha256 = "6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228";
+      name = "kmbox-19.08.0.tar.xz";
     };
   };
   kmime = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz";
-      sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775";
-      name = "kmime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmime-19.08.0.tar.xz";
+      sha256 = "1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75";
+      name = "kmime-19.08.0.tar.xz";
     };
   };
   kmines = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz";
-      sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12";
-      name = "kmines-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmines-19.08.0.tar.xz";
+      sha256 = "290efbc208d2fa6ad5552fe8c0679fd0669f4abf6dc31fafd267bd9444add981";
+      name = "kmines-19.08.0.tar.xz";
     };
   };
   kmix = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz";
-      sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea";
-      name = "kmix-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmix-19.08.0.tar.xz";
+      sha256 = "3d9cf6dcb35ded0091d16f5e9f4cb384ae21ea4065547b52d5f13f199d3d7b08";
+      name = "kmix-19.08.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz";
-      sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624";
-      name = "kmousetool-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmousetool-19.08.0.tar.xz";
+      sha256 = "3b2f5a4fcc3231c249923431059285e3f8371f7c8d53fcaea76dec3945a13b09";
+      name = "kmousetool-19.08.0.tar.xz";
     };
   };
   kmouth = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz";
-      sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068";
-      name = "kmouth-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmouth-19.08.0.tar.xz";
+      sha256 = "608479db4b2a98ecd17bdc1b1ef20203f492647b43311e903fb10338a59e0098";
+      name = "kmouth-19.08.0.tar.xz";
     };
   };
   kmplot = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz";
-      sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206";
-      name = "kmplot-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kmplot-19.08.0.tar.xz";
+      sha256 = "66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94";
+      name = "kmplot-19.08.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz";
-      sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc";
-      name = "knavalbattle-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knavalbattle-19.08.0.tar.xz";
+      sha256 = "7fbf132662e12f785390dbef7086dad5372ebaea8f8c3f55c24fe37bf17df35e";
+      name = "knavalbattle-19.08.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz";
-      sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b";
-      name = "knetwalk-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knetwalk-19.08.0.tar.xz";
+      sha256 = "135e8c3b0d46eda0eda2429c6fa89226cba184fb7357b86a3d3101797a7a8c96";
+      name = "knetwalk-19.08.0.tar.xz";
     };
   };
   knights = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz";
-      sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e";
-      name = "knights-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knights-19.08.0.tar.xz";
+      sha256 = "1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c";
+      name = "knights-19.08.0.tar.xz";
     };
   };
   knotes = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz";
-      sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9";
-      name = "knotes-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/knotes-19.08.0.tar.xz";
+      sha256 = "578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030";
+      name = "knotes-19.08.0.tar.xz";
     };
   };
   kolf = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz";
-      sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7";
-      name = "kolf-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kolf-19.08.0.tar.xz";
+      sha256 = "1a2a7e9809fd6551518d1393dcfd365976b06ddf17aaa1056a36e8f167e7db5a";
+      name = "kolf-19.08.0.tar.xz";
     };
   };
   kollision = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz";
-      sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9";
-      name = "kollision-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kollision-19.08.0.tar.xz";
+      sha256 = "24a8ae084443359d59c16cbbafc450bbc467bd8b2a2516572e70ef24823750fd";
+      name = "kollision-19.08.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz";
-      sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46";
-      name = "kolourpaint-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kolourpaint-19.08.0.tar.xz";
+      sha256 = "00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d";
+      name = "kolourpaint-19.08.0.tar.xz";
     };
   };
   kompare = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz";
-      sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261";
-      name = "kompare-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kompare-19.08.0.tar.xz";
+      sha256 = "695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212";
+      name = "kompare-19.08.0.tar.xz";
     };
   };
   konqueror = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz";
-      sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92";
-      name = "konqueror-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/konqueror-19.08.0.tar.xz";
+      sha256 = "cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971";
+      name = "konqueror-19.08.0.tar.xz";
     };
   };
   konquest = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz";
-      sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab";
-      name = "konquest-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/konquest-19.08.0.tar.xz";
+      sha256 = "94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60";
+      name = "konquest-19.08.0.tar.xz";
     };
   };
   konsole = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz";
-      sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8";
-      name = "konsole-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/konsole-19.08.0.tar.xz";
+      sha256 = "4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e";
+      name = "konsole-19.08.0.tar.xz";
     };
   };
   kontact = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz";
-      sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714";
-      name = "kontact-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kontact-19.08.0.tar.xz";
+      sha256 = "e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b";
+      name = "kontact-19.08.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz";
-      sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2";
-      name = "kontactinterface-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kontactinterface-19.08.0.tar.xz";
+      sha256 = "e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc";
+      name = "kontactinterface-19.08.0.tar.xz";
     };
   };
   kopete = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz";
-      sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85";
-      name = "kopete-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kopete-19.08.0.tar.xz";
+      sha256 = "ef777cc2840db7fc462c3b00a8a289be3db3786ff16ae51ac9a988621848d7b7";
+      name = "kopete-19.08.0.tar.xz";
     };
   };
   korganizer = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz";
-      sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67";
-      name = "korganizer-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/korganizer-19.08.0.tar.xz";
+      sha256 = "fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722";
+      name = "korganizer-19.08.0.tar.xz";
     };
   };
   kpat = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz";
-      sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896";
-      name = "kpat-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kpat-19.08.0.tar.xz";
+      sha256 = "1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328";
+      name = "kpat-19.08.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz";
-      sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1";
-      name = "kpimtextedit-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kpimtextedit-19.08.0.tar.xz";
+      sha256 = "45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb";
+      name = "kpimtextedit-19.08.0.tar.xz";
     };
   };
   kpkpass = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz";
-      sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7";
-      name = "kpkpass-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kpkpass-19.08.0.tar.xz";
+      sha256 = "1555856e987d3667eea8a210e3dd592742ca953dfa2d381e50bc9670183e7137";
+      name = "kpkpass-19.08.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz";
-      sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72";
-      name = "kqtquickcharts-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kqtquickcharts-19.08.0.tar.xz";
+      sha256 = "6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05";
+      name = "kqtquickcharts-19.08.0.tar.xz";
     };
   };
   krdc = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz";
-      sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19";
-      name = "krdc-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/krdc-19.08.0.tar.xz";
+      sha256 = "62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75";
+      name = "krdc-19.08.0.tar.xz";
     };
   };
   kreversi = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz";
-      sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9";
-      name = "kreversi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kreversi-19.08.0.tar.xz";
+      sha256 = "1dbfcce80813c238d5a9084ffcde828b0abeb7b370cfb1e82b55de75a5f02ba9";
+      name = "kreversi-19.08.0.tar.xz";
     };
   };
   krfb = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz";
-      sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b";
-      name = "krfb-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/krfb-19.08.0.tar.xz";
+      sha256 = "1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4";
+      name = "krfb-19.08.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz";
-      sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe";
-      name = "kross-interpreters-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kross-interpreters-19.08.0.tar.xz";
+      sha256 = "d0cda357a32d755d6eba373871c0903a5e6ee5f63289aa6f40c623e985453ecd";
+      name = "kross-interpreters-19.08.0.tar.xz";
     };
   };
   kruler = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz";
-      sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53";
-      name = "kruler-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kruler-19.08.0.tar.xz";
+      sha256 = "a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226";
+      name = "kruler-19.08.0.tar.xz";
     };
   };
   kshisen = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz";
-      sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6";
-      name = "kshisen-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kshisen-19.08.0.tar.xz";
+      sha256 = "f591834b26ff622c995be81acdb07b6d25cf2e25745688a7c162d0b92532066d";
+      name = "kshisen-19.08.0.tar.xz";
     };
   };
   ksirk = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz";
-      sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e";
-      name = "ksirk-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksirk-19.08.0.tar.xz";
+      sha256 = "a929c6b10a01d765c8702afc1fa8e77ada7357cf8064c45cff34623d23a2c94c";
+      name = "ksirk-19.08.0.tar.xz";
     };
   };
   ksmtp = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz";
-      sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb";
-      name = "ksmtp-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksmtp-19.08.0.tar.xz";
+      sha256 = "2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003";
+      name = "ksmtp-19.08.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz";
-      sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046";
-      name = "ksnakeduel-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksnakeduel-19.08.0.tar.xz";
+      sha256 = "51799e15ce35237cf410bfd69cca40eeea6ec75ac3b3b98686b44028e8fd2b0b";
+      name = "ksnakeduel-19.08.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz";
-      sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7";
-      name = "kspaceduel-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kspaceduel-19.08.0.tar.xz";
+      sha256 = "fcd3b90e5a61cb27753cbacf4699c156317cfe30d50732f1f89ac4973dfb39f2";
+      name = "kspaceduel-19.08.0.tar.xz";
     };
   };
   ksquares = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz";
-      sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773";
-      name = "ksquares-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksquares-19.08.0.tar.xz";
+      sha256 = "649a89da0a928c8977218a76023044205b20f07af9b3abda042e46bc450bd00f";
+      name = "ksquares-19.08.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz";
-      sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b";
-      name = "ksudoku-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksudoku-19.08.0.tar.xz";
+      sha256 = "0f773ce70fbc05f30285b7123c5e28fe241ff56677c5b80c1201238bdbc375f8";
+      name = "ksudoku-19.08.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz";
-      sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4";
-      name = "ksystemlog-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ksystemlog-19.08.0.tar.xz";
+      sha256 = "1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259";
+      name = "ksystemlog-19.08.0.tar.xz";
     };
   };
   kteatime = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz";
-      sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0";
-      name = "kteatime-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kteatime-19.08.0.tar.xz";
+      sha256 = "3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342";
+      name = "kteatime-19.08.0.tar.xz";
     };
   };
   ktimer = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz";
-      sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809";
-      name = "ktimer-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktimer-19.08.0.tar.xz";
+      sha256 = "c7f684b9c7f0c92638153fabdfdb1082c900a8da2f660eeebe4b8b3b669f8c8d";
+      name = "ktimer-19.08.0.tar.xz";
     };
   };
   ktnef = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz";
-      sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93";
-      name = "ktnef-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktnef-19.08.0.tar.xz";
+      sha256 = "54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f";
+      name = "ktnef-19.08.0.tar.xz";
     };
   };
   ktouch = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz";
-      sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2";
-      name = "ktouch-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktouch-19.08.0.tar.xz";
+      sha256 = "23ae45be76371fa40aac875551b5de8956a2d2b0980024bd788b8b7835b902ba";
+      name = "ktouch-19.08.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz";
-      sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045";
-      name = "ktp-accounts-kcm-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-accounts-kcm-19.08.0.tar.xz";
+      sha256 = "f849b7a9b2cee5b328e726dd254b1e606b740e5b75cdc59a1ea18601e131c0b5";
+      name = "ktp-accounts-kcm-19.08.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz";
-      sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd";
-      name = "ktp-approver-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-approver-19.08.0.tar.xz";
+      sha256 = "8662a7b3e4f67a5ed2faa12187faef9dd7e056ee9f2d4b69d68f7a381e258e85";
+      name = "ktp-approver-19.08.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz";
-      sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65";
-      name = "ktp-auth-handler-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-auth-handler-19.08.0.tar.xz";
+      sha256 = "5674ebf51565854262b5ae0a5fbf8d0837c87b016ea5b32f56f96aa8583a7e39";
+      name = "ktp-auth-handler-19.08.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz";
-      sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f";
-      name = "ktp-call-ui-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-call-ui-19.08.0.tar.xz";
+      sha256 = "1f7922a1920770decfd3e17aaf42e46db60b5c3660efc544a9be743d9a85d08f";
+      name = "ktp-call-ui-19.08.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz";
-      sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1";
-      name = "ktp-common-internals-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-common-internals-19.08.0.tar.xz";
+      sha256 = "bdbf20e4e0ad7ba7bdc76a0087ff7307cf813c711da6fba3acb0104756ef1559";
+      name = "ktp-common-internals-19.08.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz";
-      sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9";
-      name = "ktp-contact-list-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-list-19.08.0.tar.xz";
+      sha256 = "e6ba69a5a8a6b841e5babd8cb7ddb0a799d34b881ab4bdd0495062a23e59d3e1";
+      name = "ktp-contact-list-19.08.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz";
-      sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f";
-      name = "ktp-contact-runner-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-runner-19.08.0.tar.xz";
+      sha256 = "2a90784f7f266399c41a2b64cdb4ae748fca6739c026beed6bfef91b037c2b28";
+      name = "ktp-contact-runner-19.08.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz";
-      sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75";
-      name = "ktp-desktop-applets-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-desktop-applets-19.08.0.tar.xz";
+      sha256 = "56562f335767e1071b36e7e31474a371b862785babeb4f5181b48065f6513221";
+      name = "ktp-desktop-applets-19.08.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz";
-      sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189";
-      name = "ktp-filetransfer-handler-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-filetransfer-handler-19.08.0.tar.xz";
+      sha256 = "a3a298058e5f6d135abac474a4cd788cea16ccfb4763948f007b6f769fd47de4";
+      name = "ktp-filetransfer-handler-19.08.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz";
-      sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66";
-      name = "ktp-kded-module-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-kded-module-19.08.0.tar.xz";
+      sha256 = "a225a4e16cb18b19c5750d27c7a3834bbbe362c40c7cad8a9e500488682d67cc";
+      name = "ktp-kded-module-19.08.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz";
-      sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a";
-      name = "ktp-send-file-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-send-file-19.08.0.tar.xz";
+      sha256 = "d69e48d1f69e04618c97f8e83e8909e97d3f1793fff41277bb883885a8c9da8f";
+      name = "ktp-send-file-19.08.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz";
-      sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5";
-      name = "ktp-text-ui-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktp-text-ui-19.08.0.tar.xz";
+      sha256 = "1858215d519efdcf4a0e4ef771e0d0a33f7c918ce2b70fbc95a56b61d240855a";
+      name = "ktp-text-ui-19.08.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz";
-      sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb";
-      name = "ktuberling-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/ktuberling-19.08.0.tar.xz";
+      sha256 = "ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f";
+      name = "ktuberling-19.08.0.tar.xz";
     };
   };
   kturtle = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz";
-      sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d";
-      name = "kturtle-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kturtle-19.08.0.tar.xz";
+      sha256 = "0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8";
+      name = "kturtle-19.08.0.tar.xz";
     };
   };
   kubrick = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz";
-      sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7";
-      name = "kubrick-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kubrick-19.08.0.tar.xz";
+      sha256 = "3a69a6d9a519db9fd25793d532da561a77e7033d71cd3dc67d0ee48c332b71c3";
+      name = "kubrick-19.08.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz";
-      sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d";
-      name = "kwalletmanager-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kwalletmanager-19.08.0.tar.xz";
+      sha256 = "aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471";
+      name = "kwalletmanager-19.08.0.tar.xz";
     };
   };
   kwave = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz";
-      sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6";
-      name = "kwave-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kwave-19.08.0.tar.xz";
+      sha256 = "60f5408e9a67e934c67332b9a9643513f35946796d1ccf70369e411f804b1043";
+      name = "kwave-19.08.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz";
-      sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158";
-      name = "kwordquiz-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/kwordquiz-19.08.0.tar.xz";
+      sha256 = "ed4278c1ca0e6e7da548e563a4248fa9e0ff0707b67e06e53ae26dbc2069fc71";
+      name = "kwordquiz-19.08.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz";
-      sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522";
-      name = "libgravatar-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libgravatar-19.08.0.tar.xz";
+      sha256 = "f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9";
+      name = "libgravatar-19.08.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz";
-      sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51";
-      name = "libkcddb-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkcddb-19.08.0.tar.xz";
+      sha256 = "f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151";
+      name = "libkcddb-19.08.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz";
-      sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee";
-      name = "libkcompactdisc-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkcompactdisc-19.08.0.tar.xz";
+      sha256 = "cc940df2a1e499965fe05b466c60014082d205f0ae606562980e6088d714eac5";
+      name = "libkcompactdisc-19.08.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz";
-      sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c";
-      name = "libkdcraw-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkdcraw-19.08.0.tar.xz";
+      sha256 = "5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1";
+      name = "libkdcraw-19.08.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz";
-      sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c";
-      name = "libkdegames-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkdegames-19.08.0.tar.xz";
+      sha256 = "cb1135a86b373543410f3eb0677aed033bad2b8ef60130753c699338e0c22d1b";
+      name = "libkdegames-19.08.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz";
-      sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45";
-      name = "libkdepim-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkdepim-19.08.0.tar.xz";
+      sha256 = "4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab";
+      name = "libkdepim-19.08.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz";
-      sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59";
-      name = "libkeduvocdocument-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkeduvocdocument-19.08.0.tar.xz";
+      sha256 = "7b0314bc1f06a4ea4cbb4b4b203a9a0f4a0370f355f8def4398dc452075f6fcf";
+      name = "libkeduvocdocument-19.08.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz";
-      sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae";
-      name = "libkexiv2-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkexiv2-19.08.0.tar.xz";
+      sha256 = "42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15";
+      name = "libkexiv2-19.08.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz";
-      sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e";
-      name = "libkgapi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkgapi-19.08.0.tar.xz";
+      sha256 = "bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6";
+      name = "libkgapi-19.08.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz";
-      sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a";
-      name = "libkgeomap-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkgeomap-19.08.0.tar.xz";
+      sha256 = "267c3bb6d033dcbcfabb6822eebc69410de2d13b792ce62af47034bbcf3a5e54";
+      name = "libkgeomap-19.08.0.tar.xz";
     };
   };
   libkipi = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz";
-      sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020";
-      name = "libkipi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkipi-19.08.0.tar.xz";
+      sha256 = "94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989";
+      name = "libkipi-19.08.0.tar.xz";
     };
   };
   libkleo = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz";
-      sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529";
-      name = "libkleo-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkleo-19.08.0.tar.xz";
+      sha256 = "a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6";
+      name = "libkleo-19.08.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz";
-      sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb";
-      name = "libkmahjongg-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkmahjongg-19.08.0.tar.xz";
+      sha256 = "b51aea6773b609cc1c3a297e72e15b7b504c2877938030e1afac86319e855694";
+      name = "libkmahjongg-19.08.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz";
-      sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3";
-      name = "libkomparediff2-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libkomparediff2-19.08.0.tar.xz";
+      sha256 = "d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe";
+      name = "libkomparediff2-19.08.0.tar.xz";
     };
   };
   libksane = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz";
-      sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417";
-      name = "libksane-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libksane-19.08.0.tar.xz";
+      sha256 = "62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329";
+      name = "libksane-19.08.0.tar.xz";
     };
   };
   libksieve = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz";
-      sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff";
-      name = "libksieve-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/libksieve-19.08.0.tar.xz";
+      sha256 = "48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966";
+      name = "libksieve-19.08.0.tar.xz";
     };
   };
   lokalize = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz";
-      sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1";
-      name = "lokalize-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/lokalize-19.08.0.tar.xz";
+      sha256 = "bb51159c803890af82a38e5a4bd4df0895cc34ed68fa8ed3a4c66adafc9ea6b6";
+      name = "lokalize-19.08.0.tar.xz";
     };
   };
   lskat = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz";
-      sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf";
-      name = "lskat-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/lskat-19.08.0.tar.xz";
+      sha256 = "b321f58772eab7f569c76ff4afb56b1e3324dc5febf45bf5ed90993cf38696b5";
+      name = "lskat-19.08.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz";
-      sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f";
-      name = "mailcommon-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/mailcommon-19.08.0.tar.xz";
+      sha256 = "6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3";
+      name = "mailcommon-19.08.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz";
-      sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696";
-      name = "mailimporter-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/mailimporter-19.08.0.tar.xz";
+      sha256 = "242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7";
+      name = "mailimporter-19.08.0.tar.xz";
     };
   };
   marble = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz";
-      sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61";
-      name = "marble-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/marble-19.08.0.tar.xz";
+      sha256 = "c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1";
+      name = "marble-19.08.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz";
-      sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a";
-      name = "mbox-importer-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/mbox-importer-19.08.0.tar.xz";
+      sha256 = "e03fd814c70b15fca3b5dd2cde1dcece436b831ceb04323d7ffcca66daf3ce1c";
+      name = "mbox-importer-19.08.0.tar.xz";
     };
   };
   messagelib = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz";
-      sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad";
-      name = "messagelib-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/messagelib-19.08.0.tar.xz";
+      sha256 = "0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d";
+      name = "messagelib-19.08.0.tar.xz";
     };
   };
   minuet = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz";
-      sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0";
-      name = "minuet-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/minuet-19.08.0.tar.xz";
+      sha256 = "3827a7e8dd3c48e12521fd0aa76eccbeaf9f2627935f19647f2147e87db63554";
+      name = "minuet-19.08.0.tar.xz";
     };
   };
   okular = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz";
-      sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e";
-      name = "okular-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/okular-19.08.0.tar.xz";
+      sha256 = "721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec";
+      name = "okular-19.08.0.tar.xz";
     };
   };
   palapeli = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz";
-      sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b";
-      name = "palapeli-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/palapeli-19.08.0.tar.xz";
+      sha256 = "fcdefb41685728cd9e01cc3249d2676a589f61a611e32c2e1a2e3d4d30721dde";
+      name = "palapeli-19.08.0.tar.xz";
     };
   };
   parley = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz";
-      sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f";
-      name = "parley-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/parley-19.08.0.tar.xz";
+      sha256 = "d3c8f8e7ceee62ffa9b95dbf539a509260b5f759fadd136a966d90a67e8a94a4";
+      name = "parley-19.08.0.tar.xz";
     };
   };
   picmi = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz";
-      sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c";
-      name = "picmi-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/picmi-19.08.0.tar.xz";
+      sha256 = "1d7a6152b05ad22f98762a5a6cd96edbc03ae63bdbc0154f387dc5cce31243eb";
+      name = "picmi-19.08.0.tar.xz";
     };
   };
   pimcommon = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz";
-      sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72";
-      name = "pimcommon-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/pimcommon-19.08.0.tar.xz";
+      sha256 = "23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a";
+      name = "pimcommon-19.08.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz";
-      sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd";
-      name = "pim-data-exporter-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/pim-data-exporter-19.08.0.tar.xz";
+      sha256 = "f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8";
+      name = "pim-data-exporter-19.08.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz";
-      sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10";
-      name = "pim-sieve-editor-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/pim-sieve-editor-19.08.0.tar.xz";
+      sha256 = "1ea0cc219d6776968d81ff1a606a9a11e1714f864fda9f00a13a5d7c84b45b46";
+      name = "pim-sieve-editor-19.08.0.tar.xz";
     };
   };
   poxml = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz";
-      sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9";
-      name = "poxml-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/poxml-19.08.0.tar.xz";
+      sha256 = "82393645a5f97890bba866554c0e05d7b216f0ed7eafea00fe1c2708ac12e0b2";
+      name = "poxml-19.08.0.tar.xz";
     };
   };
   print-manager = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz";
-      sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa";
-      name = "print-manager-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/print-manager-19.08.0.tar.xz";
+      sha256 = "56fe89f6bc3be64848adee20a22c712ba8f72602e28fb3288cd5328797e32c7b";
+      name = "print-manager-19.08.0.tar.xz";
     };
   };
   rocs = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz";
-      sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61";
-      name = "rocs-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/rocs-19.08.0.tar.xz";
+      sha256 = "2e9346781bb6198a3fb3c3357ef796c0e86fdd104146de87a481619d3cbe78fe";
+      name = "rocs-19.08.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz";
-      sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38";
-      name = "signon-kwallet-extension-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/signon-kwallet-extension-19.08.0.tar.xz";
+      sha256 = "f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f";
+      name = "signon-kwallet-extension-19.08.0.tar.xz";
     };
   };
   spectacle = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz";
-      sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c";
-      name = "spectacle-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/spectacle-19.08.0.tar.xz";
+      sha256 = "8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4";
+      name = "spectacle-19.08.0.tar.xz";
     };
   };
   step = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz";
-      sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05";
-      name = "step-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/step-19.08.0.tar.xz";
+      sha256 = "7a2dc38617822c8118c721ccaaa9907ec3e109eacf57e46b599c6731b325a993";
+      name = "step-19.08.0.tar.xz";
     };
   };
   svgpart = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz";
-      sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624";
-      name = "svgpart-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/svgpart-19.08.0.tar.xz";
+      sha256 = "7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d";
+      name = "svgpart-19.08.0.tar.xz";
     };
   };
   sweeper = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz";
-      sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637";
-      name = "sweeper-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/sweeper-19.08.0.tar.xz";
+      sha256 = "3cab8817b5c52bd0064e49e6062d3295328604d96e355779a766075d5ae10764";
+      name = "sweeper-19.08.0.tar.xz";
     };
   };
   umbrello = {
-    version = "19.04.1";
+    version = "19.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/19.08.0/src/umbrello-19.08.0.tar.xz";
+      sha256 = "8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2";
+      name = "umbrello-19.08.0.tar.xz";
+    };
+  };
+  yakuake = {
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz";
-      sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2";
-      name = "umbrello-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/yakuake-19.08.0.tar.xz";
+      sha256 = "f0931fffbcd6f17687f13ab766e628961c6caf6dcf8cad79f6e311a0b5692a49";
+      name = "yakuake-19.08.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "19.04.1";
+    version = "19.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz";
-      sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87";
-      name = "zeroconf-ioslave-19.04.1.tar.xz";
+      url = "${mirror}/stable/applications/19.08.0/src/zeroconf-ioslave-19.08.0.tar.xz";
+      sha256 = "0fbe1e0d1c30cc570d96e6a5aa12692bd8e5d11bfd4b9af5077f4c5e80c8f183";
+      name = "zeroconf-ioslave-19.08.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6f9c8df30012658af53e619094c7b9cae1866ea7
--- /dev/null
+++ b/pkgs/applications/kde/yakuake.nix
@@ -0,0 +1,32 @@
+{
+  mkDerivation, lib, kdoctools, extra-cmake-modules,
+  karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
+  knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
+}:
+
+mkDerivation {
+  name = "yakuake";
+
+  buildInputs = [
+    karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
+    knotifyconfig kparts kwindowsystem qtx11extras
+  ];
+
+  propagatedBuildInputs = [
+    karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
+    knotifyconfig kparts kwindowsystem
+  ];
+
+  propagatedUserEnvPkgs = [ konsole ];
+
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools
+  ];
+
+  meta = {
+    homepage = https://yakuake.kde.org;
+    description = "Quad-style terminal emulator for KDE";
+    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 50582d94ff4ab2f08102b4691eb24e3b63a284e0..465c72d73f5cc1af7ae5739cfd028d99bbc9f334 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -14,7 +14,6 @@ let libPath = lib.makeLibraryPath [
 in stdenv.mkDerivation rec {
   pname = "airtame";
   version = "3.3.0";
-  name = "${pname}-${version}";
   longName = "${pname}-application";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index 8cb014bb02145c3c74a9c80a774a9b093a702ee1..8c5aded5ed9ba494ab4ae4ca3fce4419919df548 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildGoPackage rec {
-  name = "aminal-${version}";
+  pname = "aminal";
   version = "0.8.6";
 
   goPackagePath = "github.com/liamg/aminal";
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 37d140e19ba309c8337c9d0ee56915fea896b9a8..c680ffe967834ef6a9b16f4b30dc3a2774c32551 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "attempto-clex-${version}";
+  pname = "attempto-clex";
   version = "5133afe";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 2da0de9ead8c3ef990851ae47792efa266fc343b..b5af1af91f36c5241d6ed3e4c66931a43ad49584 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.1.5";
-  name = "apvlv-${version}";
+  pname = "apvlv";
 
   src = fetchFromGitHub {
     owner = "naihe2010";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 202c1669f85851d6d482027ee3ab76c68f889441..791e2d0f52e824f1b983b8b28f7042e80a1e0aca 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
 
 stdenv.mkDerivation rec {
-  name = "artha-${version}";
+  pname = "artha";
   version = "1.0.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix
index 3c18d70d6c264b85df42764196726eeb1e322495..0e524ede0912e9e51162a4bffcca31efb76878af 100644
--- a/pkgs/applications/misc/asciiquarium/default.nix
+++ b/pkgs/applications/misc/asciiquarium/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.1";
 in stdenv.mkDerivation {
-  name = "asciiquarium-${version}";
+  pname = "asciiquarium";
+  inherit version;
   src = fetchurl {
     url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz";
     sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v";
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 2dd151c1a6c1f08bd436b4ff1e5d0004a9724017..444a8da7036d47ef967292e1cd034118dcc406c4 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "autospotting-${version}";
+  pname = "autospotting";
   version = "unstable-2018-11-17";
   goPackagePath = "github.com/AutoSpotting/AutoSpotting";
 
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index fc5fa4d030062251cbf6e4f1bed92c6102e699e8..b0af34ec7606bb99696cf6e75699f403c68efda4 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -12,7 +12,8 @@ let
   ];
 in
 stdenv.mkDerivation {
-  name = "bashSnippets-${version}";
+  pname = "bashSnippets";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "alexanderepstein";
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
index abb3eb33536ef579352235bb17193e80a559946e..8b994c55de3f8c255646c88f6c82611eb84044c6 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -7,11 +7,11 @@ let
   inherit (pythonPackages) dbus-python pygtk python;
 in stdenv.mkDerivation rec {
 
-  name = "batti-${version}";
+  pname = "batti";
   version = "0.3.8";
 
   src = fetchurl {
-    url = "https://batti-gtk.googlecode.com/files/${name}.tar.gz";
+    url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz";
     sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6";
   };
 
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index f085e4bd7dd52589d08c67cb303e59d2e494495e..06df1df9f769aae165283f95b0f05b1b9f8f7524 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
 
 stdenv.mkDerivation rec {
-  name    = "bb-${version}";
+  pname = "bb";
   version = "1.3rc1";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz";
+    url    = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz";
     sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
   };
 
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 41184d6e9492014ebaf0fd1c01c2b2f9dbbf3f8b..a3f0a3b84f230c4a42b892003f73efdf4182a1f0 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
 
   version = "2.10.1";
 
-  name = "bibletime-${version}";
+  pname = "bibletime";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bibletime/${name}.tar.xz";
+    url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz";
     sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6";
   };
 
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index 9c99dcee2b3cb22c669d2f7e56c71a6f3dbbec9d..090cb2f519e151a48340b4632429dd38ae00eee6 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -10,7 +10,8 @@ let
 
 in buildPythonApplication {
 
-  name = "bitcoinarmory-${version}";
+  pname = "bitcoinarmory";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "goatpig";
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index a1581408201424afed720ab83ec4fb01ee8ed0f9..402198a97322d781beb9721908a99e05d0478585 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "calcurse-${version}";
+  pname = "calcurse";
   version = "4.5.0";
 
   src = fetchurl {
-    url = "https://calcurse.org/files/${name}.tar.gz";
+    url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
     sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3";
   };
 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c82b00e66e803f87850d9d1327b2fc046a0cf051..39fdc8e5e1cfcb196b259ed88ddc82f22953189c 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 mkDerivation rec {
-  name = "calibre-${version}";
+  pname = "calibre";
   version = "3.46.0";
 
   src = fetchurl {
-    url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
+    url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
     sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9";
   };
 
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix
index 35aa681df4ba9688d9f8af0f0d661b2ced236648..77cabc409c74486e3195faf350e4286b2f9baf5f 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/pkgs/applications/misc/candle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "candle-${version}";
+  pname = "candle";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix
index a0e5c8149968863f98c91bba0126cd49e120ba33..40dbfea9801bc1826666c16d96b06e38c90cba46 100644
--- a/pkgs/applications/misc/cardpeek/default.nix
+++ b/pkgs/applications/misc/cardpeek/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.8.4";
 in
   stdenv.mkDerivation {
-    name = "cardpeek-${version}";
+    pname = "cardpeek";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "L1L1";
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index e48b32a783d729a62a811b404cccda50ffa9dc95..dae6e404a9dd3112ccff3e61e9fd7895f389a973 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "cataract-${version}";
+  pname = "cataract";
 
   src = fetchgit {
     url = "git://git.bzatek.net/cataract";
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 1bbb7d61b01f6d77b46415ea8212e997c9207063..20bfe727f6d3ebfe77b94c352a299232d2b39308 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, acl, libcap, Carbon, IOKit }:
 
 stdenv.mkDerivation rec {
-  name = "cdrtools-${version}";
+  pname = "cdrtools";
   version = "3.02a06";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
+    url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2";
     sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
   };
 
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 9d63b5aedcb7b9dbf5dd09a911f06e286aa6710f..04f32a67b84c72381ccdad41b068e24fb54c7c61 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.2";
-  name = "cgminer-${version}";
+  pname = "cgminer";
 
   src = fetchgit {
     url = "https://github.com/ckolivas/cgminer.git";
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 41660bc7f2b07a05b767527864ab5049580fb59f..357dd9bcb8a74b47e210ee468e8447001d9ccd89 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -2,7 +2,6 @@
 
 with python3.pkgs;
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "cheat";
   version = "2.5.1";
 
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 0578393dfca09f3f96bdfadbef0b4cbcb20a1d82..856853e3b1cb8705ca43d6fd56fa43803a0025d4 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "cherrytree-${version}";
+  pname = "cherrytree";
   version = "0.38.8";
 
   src = fetchurl {
-    url = "https://www.giuspen.com/software/${name}.tar.xz";
+    url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
     sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg";
   };
 
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 6602adb2f2abaab11038c25dd9cbca4d1566b2b1..4986661e2f638f683d4328a749e626b1ac5dd4f0 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.8";
-  name = "cli-visualizer-${version}";
+  pname = "cli-visualizer";
 
   src = fetchFromGitHub {
     owner = "dpayne";
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 4477cbbcc06a9d6300eac131550b67046af76154..693ce84c97ac827631be7ffe9c9d14fdd6717c2c 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "clipit-${version}";
+  pname = "clipit";
   version = "1.4.2";
 
   src = fetchurl {
-    url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz";
+    url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz";
     sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
   };
 
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index e6e4ede6ac141292006f90ac06f7642da3444b64..7577c0a3db99f0f790f804103cd7e6952a7e9619 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -3,7 +3,7 @@ let
   runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
 in
 stdenv.mkDerivation rec {
-  name = "clipmenu-${version}";
+  pname = "clipmenu";
   version = "5.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index 3851730c4596d0302d150f2312c2a25c09c766d5..b07e0fb8c5208cef4ebfedc0bc2a26da56a5fde8 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.6.4"; in
 stdenv.mkDerivation {
-  name = "confclerk-${version}";
+  pname = "confclerk";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index bd49323b03f145c2f91bfd651342be5c8abb4a63..c9dcc97d5cd14642c47bff807ff808b53833051f 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -3,7 +3,7 @@
 
 mkDerivation rec {
   version = "1.1.1";
-  name = "cool-retro-term-${version}";
+  pname = "cool-retro-term";
 
   src = fetchFromGitHub {
     owner = "Swordfish90";
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 3ee357ce151b6cde8e2bc02c4d30580afcbcf69f..2aad4d352c97eaec0e9a9bdd3efbbfc274fbe072 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "CopyQ-${version}";
+  pname = "CopyQ";
   version = "3.9.0";
 
   src  = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 4d99751924619d14927d357134e98104abd8c8b9..0e9ff40cffa41907afa069aae04862646e5a079f 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -17,7 +17,7 @@
 , extraCmakeFlags ? []
 }:
 stdenv.mkDerivation rec {
-  name = "cpp-ethereum-${version}";
+  pname = "cpp-ethereum";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 0123e0c38d74a6f493deedc137cbf73b6f0899fd..72918a40733ba74b61c3c4f85e18ee093ab751c9 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchurl, ncurses, readline }:
 
 stdenv.mkDerivation rec {
-  name = "ctodo-${version}";
+  pname = "ctodo";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
index e44f43d22bfefeba1586086958ac897db89ae8dc..90f5f307d85372552aa727ecdc64a3bf35a3fa25 100644
--- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
 
 stdenv.mkDerivation rec {
-  name = "curaengine-lulzBot-${version}";
+  pname = "curaengine-lulzBot";
   version = "3.6.18";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix
index a53b001b0e98c873b4bbcbac7714acf5788cd0d7..1972042f805e61437b085b61f7d9eb79b9bb94b8 100644
--- a/pkgs/applications/misc/cura/stable.nix
+++ b/pkgs/applications/misc/cura/stable.nix
@@ -4,7 +4,8 @@ let
   version = "15.04";
 in
 stdenv.mkDerivation rec {
-  name = "cura-${version}";
+  pname = "cura";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
index 4e620425d5c34f9abccc02b9a925186a0d8d3ce6..a367efaaef383fa2c697babaf74172b72c2ee4e4 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/pkgs/applications/misc/curabydagoma/default.nix
@@ -14,7 +14,7 @@
 # If, however, someone needs it, we certainly can find a solution.
 
 stdenv.mkDerivation rec {
-  name = "curabydagoma-${version}";
+  pname = "curabydagoma";
   # Version is the date, UNIX format
   version = "1520506579";
   # Hash of the user's choice: os, arch, package type...
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 823e6d6e2e9983e92fb5de80b92193d15810d26e..3e4c77aafc6a05e181d0c9e809d9c6b11dc5becd 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }:
 
 stdenv.mkDerivation rec {
-  name = "curaengine-${version}";
+  pname = "curaengine";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index ce743a008798b92a8723ce53bcc2861a1d5aa9ce..41f110e9ee102b1b2a4ea41d1f1c074e731eaa78 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -3,7 +3,8 @@ let
   version = "15.04.6";
 in
 stdenv.mkDerivation {
-  name = "curaengine-${version}";
+  pname = "curaengine";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 82d77b65f668b8b163ba40c829eeb60ccdbdaad3..d8cf86461acf2f6b4c031755b8bfea514fc14942 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -6,7 +6,7 @@
 # See `pkgs/applications/editors/eclipse/*.nix`
 
 stdenv.mkDerivation rec {
-  name = "dbeaver-ce-${version}";
+  pname = "dbeaver-ce";
   version = "6.1.4";
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index b010e5401b80a578b958097db6449e7052f19658..3cbb091a4e215d077dd4c5a66ab704a3c2bcb046 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "ddgr-${version}";
+  pname = "ddgr";
 
   src = fetchFromGitHub {
     owner = "jarun";
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix
index 7f4629100d5d71ab17275d5c935b9babc41d5565..a1fdabd8ccb128889589e9386348389e617197ee 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/pkgs/applications/misc/deco/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "deco";
   version = "0.0.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 4fb9ca5fa713c1ce04396a4d2f1802dc8b9fef04..5699396a0840362587feb8848f457bb5012dda4e 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }:
 
 stdenv.mkDerivation rec {
-  name = "devilspie2-${version}";
+  pname = "devilspie2";
   version = "0.43";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index eeb7a8ccf526471cb1fea901e6647cec84201fd5..5df7c0b0672739f595ea2895c8ce7fd9ce0d0c8b 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -4,7 +4,8 @@ let
   version = "git-2016-01-10";
 in
 stdenv.mkDerivation {
-  name = "dfilemanager-${version}";
+  pname = "dfilemanager";
+  inherit version;
   src = fetchgit {
     url = "git://git.code.sf.net/p/dfilemanager/code";
     rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 467c2b3c2d59dd79418b8b274de4df2ce7dd7468..283b66318ea56d429fff99f0cb706ecc434597b6 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -8,7 +8,7 @@ let
       [ wxGTK ];
 in
 stdenv.mkDerivation rec {
-  name = "diff-pdf-${version}";
+  pname = "diff-pdf";
   version = "2017-12-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index daea20835c8a2859f8789bb080f06254a5d31717..37ed8eb23fb609d0b419478e2c845ac6fd2496a6 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
-  name = "diffpdf-${version}";
+  pname = "diffpdf";
 
   src = fetchurl {
-    url = "http://www.qtrac.eu/${name}.tar.gz";
+    url = "http://www.qtrac.eu/${pname}-${version}.tar.gz";
     sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
   };
 
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
     install -Dpm755 -D diffpdf $out/bin/diffpdf
     install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
 
-    install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications
-    install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
-    install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
+    install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
+    install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
+    install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
     install -Dpm644 images/icon.png $out/share/icons/diffpdf.png
     install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 58bc483d43f34bfd402a867bd32960b1c7f87205..13539169dece331dba4e4769cca53eac6fa6ff51 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -47,7 +47,7 @@ let
   copyUdevRuleToOutput = name: rule:
     "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
 in stdenv.mkDerivation rec {
-  name = "digitalbitbox-${version}";
+  pname = "digitalbitbox";
   version = "2.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index f1e33ea53571faee25764af26e714374f37f2fe3..8f7dbd2d2edab721cb038a8327fc689929807314 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "direwolf-${version}";
+  pname = "direwolf";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index fd08ed9c391662f1d07c9657ec2cf3903322b725..8cfadd77ece94a4d91d07ea75410ae1d4b9c2818 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
 
 stdenv.mkDerivation rec {
-  name = "doomseeker-${version}";
+  pname = "doomseeker";
   version = "2018-03-05";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix
index 1d3c405b7038e953088437ac8a53130ed50ffb37..5150f13fb80ce8a528fa1e569d0eb7434014e09f 100644
--- a/pkgs/applications/misc/dotfiles/default.nix
+++ b/pkgs/applications/misc/dotfiles/default.nix
@@ -2,7 +2,6 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "dotfiles";
-  name = "${pname}-${version}";
   version = "0.6.4";
 
   src = pythonPackages.fetchPypi {
diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix
index b5ae9fb567ca273e0ad59199a9975d6f90c78a93..226bdea03013cd6e9176af67193cd114897466da 100644
--- a/pkgs/applications/misc/dozenal/default.nix
+++ b/pkgs/applications/misc/dozenal/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "12010904";
-  name = "dozenal-${version}";
+  pname = "dozenal";
   src = fetchFromGitHub {
     owner = "dgoodmaniii";
     repo = "dozenal";
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 6c802e683ce983b489ffd591fc85a1dae816769a..ae83802a7b4433a0938915a73e06edc8a231adda 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -2,11 +2,11 @@
 librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "eaglemode-${version}";
+  pname = "eaglemode";
   version = "0.94.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
+    url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
     sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89";
   };
 
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index d447e7f50d527f341ba6a155c668b967ea1a1c9f..62358d41cc53ad0939df66b8660a0bad32283e3d 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "emem";
   version = "0.2.50";
-  name = "${pname}-${version}";
 
   inherit jdk;
 
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
index b6c10dbebcadc91ac142bd8be05f7720bee24db0..1a87b7f5c8be836fbf0e6166abfe1f78235a476f 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "epdfview-${version}";
+  pname = "epdfview";
   version = "0.1.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index bf1ae3037fc42ff2e367145865abb43d82d89535..d0d3c2b424d37104db51b8f52eac8de7f623deb3 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "et-${version}";
+  pname = "et";
   version = "0.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 98b47990314db386f0e568da641d4dbbe0df0b46..56cac7ca9185cca90ddd814e68093a799f30976a 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, imlib2, libast }:
 
 stdenv.mkDerivation rec {
-  name = "eterm-${version}";
+  pname = "eterm";
   version = "0.9.6";
   srcName = "Eterm-${version}";
 
diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix
index b8bd0a59bea26d7c9ff2416e7783901b52e9905e..e9d1317390ed9a870b532817ba80b4765d5b62df 100644
--- a/pkgs/applications/misc/eureka-editor/default.nix
+++ b/pkgs/applications/misc/eureka-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }:
 
 stdenv.mkDerivation rec {
-  name = "eureka-editor-${version}";
+  pname = "eureka-editor";
   version = "1.21";
   shortver = "121";
 
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index 4746f4ead1bbb35adfb5e2aa1dce825dcd5d8898..d1161aa68226b34f6851ad28f960243ee8c5fc7f 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "evilvte-${version}";
+  pname = "evilvte";
   version = "0.5.2-20140827";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 21fed2e28def91521481210ec5bcd2b88bed00f6..6d04cef76ce7e2fadbb4e3098af4e0d72228e5e2 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name    = "exercism-${version}";
+  pname = "exercism";
   version = "3.0.11";
 
   goPackagePath = "github.com/exercism/cli";
diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix
index 2b7888c9cd049cf31e435fe6ac41b84ccd0ecc81..f96d3f0f57c7bc09cb75d22b6addcd89fa66301b 100644
--- a/pkgs/applications/misc/extract_url/default.nix
+++ b/pkgs/applications/misc/extract_url/default.nix
@@ -10,7 +10,7 @@ let
     ++ lib.optional uriFindSupport perlPackages.URIFind;
 
 in stdenv.mkDerivation rec {
-  name = "extract_url-${version}";
+  pname = "extract_url";
   version = "1.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index e9d1946660944b1a661b390f7613c64bf801e871..bbbf1a0aff9b373f2b2d9c1ab93769c4c1c95edb 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -4,7 +4,8 @@ let
   version = "6.3.26";
 in
 stdenv.mkDerivation {
-  name="fetchmail-${version}";
+  pname = "fetchmail";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
index f70042884a8afe307988c2fbc1cfdd69b785f317..06cf3c06ffa6e8a80c3581af96d2db522b8f40d0 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.3.1";
-  name = "flamerobin-${version}";
+  pname = "flamerobin";
 
   src = fetchFromGitHub {
     owner = "mariuz";
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 4e786bfb36f858d6cb14744c24feab8fd009ca86..2ca059820ef0f04abcdf3823815eac45d1bd5817 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec{
 
-  name = "fme-${version}";
+  pname = "fme";
   version = "1.1.3";
   
   src = fetchurl {
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index 5152c8aa3f7c018b3dbe75e92c6c60fdcfefbb7e..aee3937689b3ab4999590b3ed7dcf5a7a1daf308 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jdk, jre, ant }:
 
 stdenv.mkDerivation rec {
-  name = "freemind-${version}";
+  pname = "freemind";
   version = "1.0.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 9a34694e2f254feab72e8db7a7b5792618fe9447..67d4bd65a9f9fe6d27bbab4aec1498dfcc945b93 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -15,7 +15,7 @@ let
   pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] );
 in
 stdenv.mkDerivation rec {
-  name = "gImageReader-${version}";
+  pname = "gImageReader";
   version = "3.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 44071b32875869484ae856fee860b1a7bc9ca044..ecf8ae9da8d4b750478f08abb8596415e07e8b31 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -3,7 +3,7 @@
 , gtk, pkgconfig, flex }:
 
 stdenv.mkDerivation rec {
-  name = "galculator-${version}";
+  pname = "galculator";
   version = "2.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 739df59b31c5674519d654eceabafcbe94e601ce..fb6902634da8b18f0959ce40849820bf96a51b45 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gammu-${version}";
+  pname = "gammu";
   version = "1.40.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix
index dd0a5c9a4f60d789cb2443061f1c7e3a9dc4787f..96d3d34046e1bcf925ce4823f6ddee9c054f3e1f 100644
--- a/pkgs/applications/misc/ganttproject-bin/default.nix
+++ b/pkgs/applications/misc/ganttproject-bin/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ganttproject-bin-${version}";
+  pname = "ganttproject-bin";
   version = "2.8.10";
 
   src = let build = "r2364"; in fetchzip {
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index a3aebf227339db2715a90695c05053ed0240e66e..f5eb6e188b7aba026b064df1b18c5d71ad376e3c 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses  }:
 
 stdenv.mkDerivation rec {
-  name = "gcal-${version}";
+  pname = "gcal";
   version = "4.1";
 
   src = fetchurl {
-    url = "mirror://gnu/gcal/${name}.tar.xz";
+    url = "mirror://gnu/gcal/${pname}-${version}.tar.xz";
     sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
   };
 
diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix
index 2fadc89c48d982d4b8f63e3a86a3cb5b2bcf822d..265181d7db3a13f988ea41d40453e8e249d16fbe 100644
--- a/pkgs/applications/misc/getxbook/default.nix
+++ b/pkgs/applications/misc/getxbook/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name    = "getxbook-${version}";
+  pname = "getxbook";
   version = "1.2";
 
   src = fetchurl {
-    url    = "https://njw.me.uk/getxbook/${name}.tar.xz";
+    url    = "https://njw.me.uk/getxbook/${pname}-${version}.tar.xz";
     sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
   };
 
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 4af776674e6379f806ec733ff70c7e5d3a67c440..b5d008579ac7d478201e7b3de61f903d32bb7f86 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -5,10 +5,9 @@
 stdenv.mkDerivation rec {
   version = "2.0.2";
   pname = "gksu";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+    url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
     sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
   };
 
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index 3831780c79191bb9abf6a84d2f0ed7826e373a76..6f5146161a6da07681325b98e24c0a1dbeb5090b 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -21,7 +21,7 @@ let
   '';
 in
   stdenv.mkDerivation rec {
-    name = "glava-${version}";
+    pname = "glava";
     version = "1.6.3";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 47fb50242c1de343e789bed62c866b2dbe9c6db9..8a54cefaab045f06fde97c2ce89cc66bcfbe1b61 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -5,10 +5,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gmrun-${version}";
+  pname = "gmrun";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/gmrun/${name}.tar.gz";
+    url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz";
     sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
   };
 
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index bb1556c7c4dc43807a207c5c82401f184d5be0fd..c8bbcf2aa7f3c3f345e00521980c8e50bb173ca7 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -5,7 +5,8 @@
 let version = "1.3.11"; in
 
 stdenv.mkDerivation {
-  name = "gmtp-${version}";
+  pname = "gmtp";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index b80ddb8f303f01819101c18b1d197b82a74b5e39..f8da250dbc793a0919827089efd9a4069340a77f 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-jira-${version}";
+  pname = "go-jira";
   version = "1.0.17";
 
   goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 0af84365158e5b783c6b2fcf2f545d920db7dcdf..7fba1d49d7476ac254a863bacedaea5216ecf181 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -15,7 +15,7 @@ let
     categories = "Application;Utility;";
   };
 in mkDerivation rec {
-  name = "golden-cheetah-${version}";
+  pname = "golden-cheetah";
   version = "3.5-DEV1903";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 62f2d7a069d90de478ed22425deec7ae0d0e2b90..e9a177ee19374b3956c4600a3177dd097a0347f0 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -2,7 +2,6 @@
 , git }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "gollum";
   # nix-shell -p bundix icu zlib
   version = (import ./gemset.nix).gollum.version;
@@ -10,7 +9,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
     inherit pname ruby;
     gemdir = ./.;
   };
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 0fccf83acf76d1a226f82d972b59dadd268431da..961efe4b057665e7d277394d0d23906a12ee8d87 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -40,7 +40,8 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "googleearth-${version}";
+  pname = "googleearth";
+  inherit version;
   src = fetchurl {
     url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
     inherit sha256;
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 3dcbcaf38b87159c7e6f93f974c98e8b1c03a403..12eb8839b8a86a0f2af94d28dba141f52ad824cb 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.9";
-  name = "googler-${version}";
+  pname = "googler";
 
   src = fetchFromGitHub {
     owner = "jarun";
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index 4143f6fde55937c8f9411bc41b9a5b210a4c8746..9954ff660adcd26c3a218970c5cb93ec09bf712e 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -3,7 +3,8 @@
 let version = "0.7.4";
 in stdenv.mkDerivation {
   # mdp renamed to gpg-mdp because there is a mdp package already.
-  name = "gpg-mdp-${version}";
+  pname = "gpg-mdp";
+  inherit version;
   meta = {
     homepage = https://tamentis.com/projects/mdp/;
     license = [stdenv.lib.licenses.isc];
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 7b23fca2121e8e317f356e591c0233834dafc840..c1c2a44bd7f29a46980d248d9e2410af6ea73096 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2fs-${version}";
+  pname = "gphoto2fs";
   version = "0.5.0";
   src = fetchurl {
     url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index aa0ed5f646320f6ec592ab4b4f231d3932091a4b..9d244ca18f323e226996e366f7e40587366ccba5 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "gpsbabel-${version}";
+  pname = "gpsbabel";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 4f0c1864677c9847d5f1d54c2382fc84d9cb97e8..9c0dc48d42eecaa40fa7bc1ad263d9071a02a076 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
 
 stdenv.mkDerivation rec {
-  name = "gpsprune-${version}";
+  pname = "gpsprune";
   version = "19.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
index 735818171e805f7ed0df5c46501dadb848ef9c5a..04ab062c1a1b1c091e2968954466ff74ce3f7402 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpx-viewer-${version}";
+  pname = "gpx-viewer";
   version = "0.4.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
   };
 
diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix
index 9fef9381949239adf6336ddce92bc15b3bd9580a..a341a212a37f6b4bab34abea8587fdf5807a3d10 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/pkgs/applications/misc/gpx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpx-${version}";
+  pname = "gpx";
   version = "2.5.2";
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index e9026ded47023a0ab46a901fc12d64d421f74307..84be50ccb5e506c4867d2a9f2e3a695c7e4009da 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -10,7 +10,7 @@ let
   inherit (pythonPackages) python buildPythonApplication;
 in buildPythonApplication rec {
   version = "5.0.1";
-  name = "gramps-${version}";
+  pname = "gramps";
 
   nativeBuildInputs = [ wrapGAppsHook gettext ];
   buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] 
@@ -48,7 +48,7 @@ in buildPythonApplication rec {
     eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
     if [ -e "$eapth" ]; then
         # move colliding easy_install.pth to specifically named one
-        mv "$eapth" $(dirname "$eapth")/${name}.pth
+        mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth
     fi
 
     rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index cb4f4748eec104a606083d544933291406eb03e0..308f084bd5864c236491b9eadb28e8b8c78ea886 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "green-pdfviewer-${version}";
+  pname = "green-pdfviewer";
   version = "nightly-2014-04-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index 9274c2d05216efb26f3b4113cd3a89311165857b..87e636b9c030fc9bc1ed2e02889a9e99473769aa 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -1,7 +1,7 @@
 { fetchzip, stdenv, makeWrapper, openjdk }:
 
 stdenv.mkDerivation rec {
-  name = "gremlin-console-${version}";
+  pname = "gremlin-console";
   version = "3.3.4";
   src = fetchzip {
     url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 7f3b3a8d6dc547c92418be09a00ec7c8aff49bb2..ea78331e47640dfee6f814ae33c7151ffc4c6795 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "gsimplecal-${version}";
+  pname = "gsimplecal";
   version = "2.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index 8f683272e12063d0f3edfd607a9afa910fe895e9..204624f243900f29f1b4a0f1ccd840cd37926d57 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.1";
-  name = "gtk2fontsel-${version}";
+  pname = "gtk2fontsel";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz";
+    url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz";
     sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
   };
 
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 1e237923d0542676615cb1a5a89c4be4808446de..f0026cac52e0e128c2a395770815e264176e3a74 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.6";
-  name = "gummi-${version}";
+  pname = "gummi";
 
   src = pkgs.fetchFromGitHub {
     owner = "alexandervdm";
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index a9e6d905c284060d548b2f0b2d95055807b9b162..a7313e7c969b37738bbc4c0fcee2468f7d71cada 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gxmessage-${version}";
+  pname = "gxmessage";
   version = "3.4.3";
 
   src = fetchurl {
-    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz";
+    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz";
     sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
   };
 
diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix
index e2f5f653d47ceb3874cee1e70400d39bd591a2d2..989dfb886ec340e3ab3f09fab3f212363b450171 100644
--- a/pkgs/applications/misc/hdate/default.nix
+++ b/pkgs/applications/misc/hdate/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.02";
-  name = "hdate-${version}";
+  pname = "hdate";
   src = fetchurl {
     url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2";
     sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762";
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
index 1647a09edfd660104a1769949f5cb64e3fb32b79..a2d2e8ad735c2d7108c8347ba3b04b12e6d5fe34 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "example-unfree-package-${version}";
+  pname = "example-unfree-package";
   version = "1.0";
 
   phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 63a8af99f7cf7133ba5e05c03b3491298cb326c1..8bae8ce373c7868f2038a52d779c6a2ee10a5a7c 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hello-${version}";
+  pname = "hello";
   version = "2.10";
 
   src = fetchurl {
-    url = "mirror://gnu/hello/${name}.tar.gz";
+    url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
     sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
   };
 
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
index 0431f35057bed9c4ad502cf7565116789cb3df82..84f5bad24d2136209f0d8c5c6ba33e8e3b5932ab 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "hivemind-${version}";
+  pname = "hivemind";
   version = "1.0.4";
   goPackagePath = "github.com/DarthSim/hivemind";
 
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 500f1df36a0c51d0762fbde547195121c0e8bce4..88c87eaca87126370eefbfb95b8d226488ab9eb5 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -30,7 +30,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "17.0.352";
-  name = "houdini-runtime-${version}";
+  pname = "houdini-runtime";
   src = requireFile rec {
     name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
     sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg";
diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
index 2fd56e3c55529ea549f0e7818175ad783bb62517..437c42b03317db6c0e91abfd35cd88c6a3fcd206 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/pkgs/applications/misc/hr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "hr-${version}";
+  pname = "hr";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 7cdf1a319f69a22c43e217e892e017c16884233e..0d25d3d686c9908f34db769d0fa7223895ada2ca 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, pkgconfig, gettext }:
 
 stdenv.mkDerivation rec {
-  name    = "hstr-${version}";
+  pname = "hstr";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index acdeec10d300dc8d360aa9caf0fb79af5de12c76..b2997ece5d566083e13d1a4c305e236d4bd8ab25 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -17,7 +17,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hubstaff-${version}";
+  pname = "hubstaff";
+  inherit version;
 
   src = fetchurl { inherit sha256 url; };
 
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 2b49a5ae9a971f81b5a3a9841ccf84c5821f60b2..034b9c79201abfc93713d50f0592e98fab591362 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "hugo-${version}";
+  pname = "hugo";
   version = "0.57.2";
 
   goPackagePath = "github.com/gohugoio/hugo";
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index f8d808a49c295ea25aab8f9cb372cb662fdd65c5..f21675e60b2d8676e24a87f7406d403e64b3a97f 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2.1.2";
-  name = "hyper-${version}";
+  pname = "hyper";
   src = fetchurl {
     url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
     sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm";
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index c0c1faef09d24da853fc1f0efbeed7a58260d4d4..c197e1a8fd3801f5790225da857413aa69a6b893 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -3,7 +3,7 @@ let
   lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
 in
 stdenv.mkDerivation rec {
-  name = "iceSL-${version}";
+  pname = "iceSL";
   version = "2.1.10";
 
   src =  if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip {
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index d9bccee889abe7c428da85a7bc258ddb3b3b3ffb..7daa2704e22b6f09a67131e3df9da371d0805468 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "ipmicfg-${version}";
+  pname = "ipmicfg";
   version = "1.29.0";
   buildVersion = "181029";
 
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index b5fa9143ddbb9cea5ba94e544998cfbc96dcd542..64e0f0d325b5f3c20fdec93e58db350f891fe9a0 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
 
 stdenv.mkDerivation rec {
-   name = "IPMIView-${version}";
+   pname = "IPMIView";
    version = "2.14.0";
    buildVersion = "180213";
 
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index e493226be60a52d64341b8a2e5deed07f8fb56db..d63576d5cbd0f5e35cef3bf3546d1890c45f9890 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "iterm2-${version}";
+  pname = "iterm2";
   version = "3.0.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 5939d7789b4e82a61acd3ae9ddc89aba75860df0..c8951059d4c84f2ec217be0d20fb140d2abcff7d 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "jbidwatcher";
   version = "2.5.6";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
     url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
     sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 8838de9ac961d8c8552bfc0d49bf95934b656409..56b28dbc8db9bdc699da18e00c75bdc1a52fdb16 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:
 
 stdenv.mkDerivation rec {
-  name = "josm-${version}";
+  pname = "josm";
   version = "15238";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
index 138ee397d3fd979c2f6f8e1b01389ea8e3e048cb..2a9e162e7ea9f80d477b21b806f370549c302977 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.7";
-  name = "jp2a-${version}";
+  pname = "jp2a";
 
   src = fetchFromGitHub {
     owner = "cslarsen";
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 7c5845b354197d67551c7450a79b02c10c00a48c..9391fe88c5eaaee8d3da23ef4eb043e676101d16 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "k2pdfopt-${version}";
+  pname = "k2pdfopt";
   version = "2.51a";
 
   src = (fetchzip {
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index ecfcc77172819d6bf52175b41974d17e36c36c04..0a42d5e4f289c3312ab09ddbd4938aa908833578 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "kanboard-${version}";
+  pname = "kanboard";
   version = "1.2.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index b518481e29addcb1a02b60a096babb6ae4b0df14..2af091b0df38768d6ba6e53b1c899fac41581beb 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -7,7 +7,7 @@ let
     [ stdenv.cc.libc stdenv.cc.cc ];
 in
 stdenv.mkDerivation rec {
-  name    = "kdbplus-${version}";
+  pname = "kdbplus";
   version = "3.3";
 
   src = requireFile {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip ];
 
   phases = "unpackPhase installPhase";
-  unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}";
+  unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
   installPhase = ''
     mkdir -p $out/bin $out/libexec
 
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
index 80bf5deceb160d1a2bc1b8e543dd5652d4150987..c3d2607744352537c1e5d29c37ee699828cfc55e 100644
--- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.10.1";
   drv = stdenv.mkDerivation {
-    name = "keeagent-${version}";
+    pname = "keeagent";
+    inherit version;
 
     src = fetchzip {
       url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip";
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index e64632d529b1b65b13f5727ba16d8288b865afbe..76ea9df78c25e429cf0244130828a216bd2557b1 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.8.4.2";
   drv = stdenv.mkDerivation {
-    name = "keepasshttp-${version}";
+    pname = "keepasshttp";
+    inherit version;
     src = fetchFromGitHub {
       owner = "pfn";
       repo = "keepasshttp";
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index b45cb24b1b51956b5450f47bee2605b1fde1af5a..562835159eb3865b8020b1516590d710eabb8a3e 100644
--- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.8.0";
   drv = stdenv.mkDerivation {
-    name = "keepassrpc-${version}";
+    pname = "keepassrpc";
+    inherit version;
     src = fetchurl {
       url    = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
       sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 8a3aaf202a70cf8821f3afa6f83ebdacff8422b3..36734a97516b9c1f302d1cd4ce4aa6ded8d8c113 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx2-${version}";
+  pname = "keepassx2";
   version = "2.0.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 594bf1eb75aebe7b5e04efe956a1796bac99bc9c..b1c849b6bcee4337f76d4b7e36fbd5de719e3d3e 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -31,7 +31,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "keepassxc-${version}";
+  pname = "keepassxc";
   version = "2.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index 05ad9b05abb02317dea249b522aa23a7da12da87..7adbcb86c501aab6b6756b3b47d3fbc9d41f0dbc 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx-${version}";
+  pname = "keepassx";
   version = "0.4.4";
 
   src = fetchurl {
-    url = "https://www.keepassx.org/releases/${version}/${name}.tar.gz";
+    url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
   };
 
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 4fb2227ee2023f8e59ffdb932b6d63f883588202..99b9c38d53f87c8cb2a60327cac1ec33e4c2e9b6 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -18,7 +18,7 @@ let
 
 in with python.pkgs; buildPythonApplication rec {
   version = "0.14.0";
-  name = "khard-${version}";
+  pname = "khard";
   namePrefix = "";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 01aef93e5e5f7c15442e3f48296a33e12067f32f..89778f670ff3f17b319a2689efe14f2e65b3b305 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -31,10 +31,10 @@ let
 
   pugixml = stdenv.mkDerivation rec {
     version = "1.2";
-    name = "pugixml-${version}";
+    pname = "pugixml";
 
     src = fetchurl {
-      url = "http://download.kiwix.org/dev/${name}.tar.gz";
+      url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz";
       sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
     };
 
@@ -42,8 +42,8 @@ let
 
     unpackPhase = ''
       # not a nice src archive: all the files are in the root :(
-      mkdir ${name}
-      cd ${name}
+      mkdir ${pname}-${version}
+      cd ${pname}-${version}
       tar -xf ${src}
 
       # and the build scripts are in there :'(
@@ -54,7 +54,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "kiwix-${version}";
+  pname = "kiwix";
   version = "0.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 70915ca870737d2ed8ac881e45500c948040ddbe..cf81d572c61120a68ed184652b1d4a0fbda1c45d 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -8,10 +8,11 @@ let
   pname = "krusader";
   version = "2.7.1";
 in mkDerivation rec {
-  name = "krusader-${version}";
+  pname = "krusader";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
     sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
   };
 
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index bdbdef45fe7be60ce77abb29fa4ca784241b98f1..0bd919944185b4d397c498e97d91bcba7747a87a 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -4,12 +4,11 @@
 mkDerivation rec {
   pname = "latte-dock";
   version = "0.8.9";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
+    url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
-    name = "${name}.tar.xz";
+    name = "${pname}-${version}.tar.xz";
   };
 
   buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index 9018a5926424d929b5db7e9fc1c48632b3c49e1a..76abe7c9b4b34245bc6ea0996cadc449fc1c3150 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lenmus-${version}";
+  pname = "lenmus";
   version = "5.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 999665bf6bb504900629c0ed76b65b0695379739..846ce30984250269cd9beb73495b2aeab8193fda 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libosmocore-${version}";
+  pname = "libosmocore";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index c049ed2374fd4503783580eeb220e51bf71cb4ac..09089a072b3c1a03c41f98fd41fdba621205369d 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
-  name = "librecad-${version}";
+  pname = "librecad";
 
   src = fetchurl {
     url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
-    name = name + ".tar.gz";
+    name = "${pname}-${version}" + ".tar.gz";
     sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
   };
 
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 948ae7b14a118e2c4b0b164011fb4e65a6a0da42..38078d11931b336394cae91f503c36bf66d600d1 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -30,7 +30,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "lilyterm-${version}";
+  pname = "lilyterm";
 
   inherit (stuff) src version;
 
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 5ae652d750d123bd61fc6c5f3205d0b45ae5c897..c66ef21416be256c4b0bf4b1d84e25cb7f0c8d88 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,7 +4,7 @@ libGLU_combined, freetype, xclip, inotify-tools, procps }:
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
 
 stdenv.mkDerivation rec {
-  name = "llpp-${version}";
+  pname = "llpp";
   version = "30";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 4972aa28e5892eb7b5eb7912612ddd055b8726b5..42905fa3cb41d92e3808eb5dcf2ef0d00a8d7eab 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "ltwheelconf";
   version = "0.2.7";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "thk";
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 7ccd4d6e5e9099cc39b67d32b733f8c9e57e0f3f..5435080e8318c7b1685bcd002ab9cb3c51b8c494 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -30,7 +30,7 @@ let
   ];
 
 in buildPythonApplication rec {
-  name = "lutris-original-${version}";
+  pname = "lutris-original";
   version = "0.5.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 4fd86a5a4f5207e079f0f30cfbcfc006c1f4a2c0..8ce353e85b91d4a8bb162cda44de10e6debcb01f 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -5,7 +5,8 @@
 let version = "0.3.2"; in
 
 stdenv.mkDerivation rec {
-  name = "lxterminal-${version}";
+  pname = "lxterminal";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index ad3bd499cde9c6e13f67f4a2a8ff1a355f5005cd..744d124f84d58452a3fae8d12d1a9c9aadaf8e4f 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.3.0";
-  name = "lyx-${version}";
+  pname = "lyx";
 
   src = fetchurl {
-    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz";
+    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
     sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri";
   };
 
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index f2dacb7890f051c7f9e14b6abd470217b112283e..9a134343d296b922753914893f8b9ce2c0540568 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "madonctl-${version}";
+  pname = "madonctl";
   version = "1.1.0";
 
   goPackagePath = "github.com/McKael/madonctl";
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index a6af1762e289a7f0acb81c5bb271e89849705030..f2585f7814656cf9759bb19d34850a3bacd79e73 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
-  name = "makeself-${version}";
+  pname = "makeself";
 
   src = fetchFromGitHub {
     owner = "megastep";
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
   patches = [ ./Use-rm-from-PATH.patch ];
 
   postPatch = ''
-    sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
+    sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,share/{${name},man/man1}}
-    cp makeself.lsm README.md $out/share/${name}
+    mkdir -p $out/{bin,share/{${pname}-${version},man/man1}}
+    cp makeself.lsm README.md $out/share/${pname}-${version}
     cp makeself.sh $out/bin/makeself
     cp makeself.1  $out/share/man/man1/
-    cp makeself-header.sh $out/share/${name}
+    cp makeself-header.sh $out/share/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index eb0e61ba6d73f0d68a9851f0caba9a3cd901eefe..1474ea2fc4f25fdf4b3dc2bb880a547f4c2303bf 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -4,7 +4,8 @@ let
   version = "5.4.10";
 
 in stdenv.mkDerivation {
-  name = "masterpdfeditor-${version}";
+  pname = "masterpdfeditor";
+  inherit version;
 
   src = fetchurl {
     url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 6c58dde00d36bf44734703b48c30c8f6fd7206af..03f30d64fb2decd04fe7f2c47f33c974dfee81e4 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.15";
-  name = "mdp-${version}";
+  pname = "mdp";
 
   src = fetchFromGitHub {
     owner = "visit1985";
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 8e6965bfc4fe5cf6ce875baccb7c9419bd956207..9eb4a0897d4fc061e7505f7dfd40d5abc0e276b5 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.07";
-  name = "mediainfo-gui-${version}";
+  pname = "mediainfo-gui";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
     sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 601e8c611e4ba128810e07f570f4f8e62c1f283c..98d5ef72b224718f46471e40274c77674d95ef42 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.07";
-  name = "mediainfo-${version}";
+  pname = "mediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
     sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index bcfd1adb4b441f3165a478a37c4284f040fc2131..bc753c5a7a9acee1704f399df719fc652f8b49eb 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -26,7 +26,7 @@
 }:
 
 mkDerivation rec {
-  name = "megasync-${version}";
+  pname = "megasync";
   version = "4.2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index 0b802bedf8d7b7369f06845e3f2c969fd2678d31..ed0bbc4cb4883375369e31192e57a12b40f055ba 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -7,7 +7,7 @@ assert pandocSupport -> pandoc != null;
 
 stdenv.mkDerivation rec {
 
-  name = "memo-${version}";
+  pname = "memo";
 
   version = "0.8";
 
diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix
index 718f2e46fa00e4bc602dcc211b9abee8d21897a6..e06f2a88ade4c4021562a82b7abd6820913848b6 100644
--- a/pkgs/applications/misc/menumaker/default.nix
+++ b/pkgs/applications/misc/menumaker/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "menumaker-${version}";
+  pname = "menumaker";
   version = "0.99.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/menumaker/${name}.tar.gz";
+    url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
     sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx";
   };
 
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index dec55e9c1e5c861a8595aaf292df30aa7480b52b..3023a5b5930ca6046d460b09f77bf510d8e95433 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -2,7 +2,7 @@
 , qtbase, qtsvg, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  name = "merkaartor-${version}";
+  pname = "merkaartor";
   version = "0.18.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 602d4a032efda266c789808040add8e8480621dd..318c7c2524271705407524f5adade6e9c99debf9 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "metamorphose2-${version}";
+  pname = "metamorphose2";
   version = "0.9.0beta";
 
   # exif-py vendored via submodule
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 09c4d1db2904f3353007086975b560daa31c32ea..6c1dcd5e150584f60aec6405383abf36658dbf2d 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
 
 stdenv.mkDerivation rec {
-  name = "milu-nightly-${version}";
+  pname = "milu-nightly";
   version = "2016-05-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
index 6aa7eea3d7e9105e1d44cebc006d9edfd1a44859..95ceaddb4f03e75083500c7fc55e687ed4105a57 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.2";
-  name = "minergate-cli-${version}";
+  pname = "minergate-cli";
   src = fetchurl {
     url = "https://minergate.com/download/ubuntu-cli";
     sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index d11e889e932c8912e82be4c7418a795c7522c2c7..fdd1238d87002a9807154342f884a7438f5d6873 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.1";
-  name = "minergate-${version}";
+  pname = "minergate";
   src = fetchurl {
     url = "https://minergate.com/download/ubuntu";
     sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 46ba9d450c8fe5e2d364ca517a45ab9c9335cbed..d3e7f9e8cd46716dae6abc2dc02e3ddadfa8642c 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mlterm-${version}";
+  pname = "mlterm";
   version = "3.8.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k";
   };
 
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 920c1c3f095bfdf51778d5a052e21933d98acf5c..08f510a2840e25fca4dde4d622cc6bdf1f10e6bb 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "moonlight-embedded-${version}";
+  pname = "moonlight-embedded";
   version = "2.4.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index b9179bbe5463e07836cf0fa4b6dbd3783a28e1f1..c0d41cda02dd49e14fb05b3a07ac4854aaf4e809 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "mop-${version}";
+  pname = "mop";
   version = "0.2.0";
   rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
 
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix
index eea166d8df7596f7a2b69fb918e4e98222fb726b..0e8cc2ebcea982e8f8e1864db5631d472039a346 100644
--- a/pkgs/applications/misc/mqtt-bench/default.nix
+++ b/pkgs/applications/misc/mqtt-bench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
-  name = "mqtt-bench-${version}";
+  pname = "mqtt-bench";
   version = "0.3.0";
   rev = "v${version}";
 
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 38f5075d10f20ab0e3631a8399a5681bab867632..9219c4e2e4238f563e229c555412482f1efd71af 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -15,10 +15,10 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.14.0";
-  name = "mupdf-${version}";
+  pname = "mupdf";
 
   src = fetchurl {
-    url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
+    url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
     sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
   };
 
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index c08a21e8797845a96b00edf6b819a4a026366cbd..249d9ff1d4007ac6f1bdd4aac24ea82374cf5299 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.7";
-  name = "mwic-${version}";
+  pname = "mwic";
 
   src = fetchurl {
-    url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad";
   };
 
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index cccd36d7ead8a9a2c9ce80d2251c47900e730504..172f999223a88a12905e543de3f7dd7aa9ead9ea 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -14,7 +14,6 @@ let
 in stdenv.mkDerivation rec {
   pname = "mysql-workbench";
   version = "8.0.15";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix
index 45b83b7274850f7e72a397876a3db64e110556b2..deecc92d99345aa95939f0f4a1e1048df03f5030 100644
--- a/pkgs/applications/misc/mystem/default.nix
+++ b/pkgs/applications/misc/mystem/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mystem-${version}";
+  pname = "mystem";
   version = "3.1";
 
   src = fetchurl {
-    url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz";
+    url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz";
     sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
   };
 
diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix
index 022829040b81dd134bbc07f81e1619c82a8fe79e..b4d97c368ea219e6d0ebd912c87c4e35fadc52d6 100644
--- a/pkgs/applications/misc/nanoblogger/default.nix
+++ b/pkgs/applications/misc/nanoblogger/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.5-rc1";
-  name = "nanoblogger-${version}";
+  pname = "nanoblogger";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nanoblogger/${name}.tar.gz";
+    url = "mirror://sourceforge/nanoblogger/${pname}-${version}.tar.gz";
     sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq";
   };
 
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index e8497dbc7bda38524e4889fd780f631bb8fdc6b8..4d95f0b523888e5eff2d7a87f62a663b244355f7 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -17,7 +17,7 @@ assert speechdSupport -> speechd != null;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "navit-${version}";
+  pname = "navit";
   version = "0.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix
index 21a5ab0cd0f6c35d094488e6944d3a9b6cd1eb79..4104d35cf10c3bbf220aaf4b8c3e4764df6d082f 100644
--- a/pkgs/applications/misc/neap/default.nix
+++ b/pkgs/applications/misc/neap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "neap-${version}";
+  pname = "neap";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 0bb86fdca95549de64f836872ffaae68e1146577..c1ba5ba23b1e47dec84620fd67bbc2f59e19a42f 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -30,7 +30,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  name = "netsurf-${version}";
+  pname = "netsurf";
   version = "3.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index adba36329359d17fd430706890928cef82b3846c..36d5a70735a78fd11133cbd3fd27dbc19954c19b 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "netsurf-buildsystem-${version}";
+  pname = "netsurf-buildsystem";
   version = "1.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index f343a886283b01a07ad033c717de2cec394363fa..88ac4f0c3eb9a3b5ecf1785941b63c0defce3a5d 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "netsurf-nsgenbind-${version}";
+  pname = "netsurf-nsgenbind";
   version = "0.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index 1cc7f419aa2e3364307e1744dd4e4f0ca4bb77de..31afed3061a36dd812eb890837944a0943c59c58 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, electron, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "nix-tour-${version}";
+  pname = "nix-tour";
   version = "0.0.1";
 
   buildInputs = [ electron ];
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 145abfba5d5c11b4a28653d7f0e7925066e5a821..dec8b4ba0a7c3c4f3d65060c8cfdc91786c36ef8 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -2,7 +2,7 @@
 , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
 
 mkDerivation rec {
-  name = "nixnote2-${version}";
+  pname = "nixnote2";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix
index bcf2edd8f2f6ad6a1c06be1436f43205e42d6656..db8139122bab2b26516994f3ce7df80c634557ab 100644
--- a/pkgs/applications/misc/noice/default.nix
+++ b/pkgs/applications/misc/noice/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "noice-${version}";
+  pname = "noice";
   version = "0.6";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix
index d4f3db4ca6f91c4ceb855a65ed4a980b6f97e6e7..4568c3e8acc189f6d659ebe093191cd4366e4442 100644
--- a/pkgs/applications/misc/notify-osd-customizable/default.nix
+++ b/pkgs/applications/misc/notify-osd-customizable/default.nix
@@ -13,7 +13,7 @@
 
 let baseURI = "https://launchpad.net/~leolik/+archive/leolik";
 in stdenv.mkDerivation rec {
-  name = "notify-osd-${version}";
+  pname = "notify-osd";
   version = "0.9.35+16.04.20160415";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix
index 5c60c7412c4a20bbf667ce43b8776979e4c1c374..484ff62e9e685c26d91b055b1098ee304fb9e7ed 100644
--- a/pkgs/applications/misc/notify-osd/default.nix
+++ b/pkgs/applications/misc/notify-osd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "notify-osd-${version}";
+  pname = "notify-osd";
   version = "0.9.34";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix
index 69f74d66dd019ce3b2ef0e4471976b9fb14d3284..3ad83776842186a65e935abb141ad4f320670429 100644
--- a/pkgs/applications/misc/nrsc5/default.nix
+++ b/pkgs/applications/misc/nrsc5/default.nix
@@ -13,7 +13,8 @@ let
   version = "1.0";
 
 in stdenv.mkDerivation {
-  name = "nrsc5-${version}";
+  pname = "nrsc5";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "theori-io";
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index e16d9354bb43c8d4c8739c76db3d9995a7ff8e72..b9529981c7ca35b5b143a5df5233c88ec3caa9d0 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ola-${version}";
+  pname = "ola";
   version = "0.10.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index b87f11d7b05dad8ed9205649ad9eacd2670f10da..3a0a548be0b9405c9ec6d9d79cf7d4232a82d5fd 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version_name = "1.2.sakura.5";
   version = "1.2.5";
-  name = "oneko-${version}";
+  pname = "oneko";
   src = fetchurl {
     url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";
     sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 8ff9a2f44d55a018f77f1cf53c837638902f3836..8f7f74f712321cee6918d595ff97141d49aef2ce 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-menu-${version}";
+  pname = "openbox-menu";
   version = "0.8.0";
 
   src = fetchurl {
-    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
   };
 
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index e4f2fd7ce8b9bd8bc9ae811ed614c6b3ce955e01..5c7e7355c662b8fdd92c543f8781726e309922a9 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -2,7 +2,7 @@
   gettext, glib, portaudio }:
 
 stdenv.mkDerivation rec {
-  name = "opencpn-${version}";
+  pname = "opencpn";
   version = "5.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index cd9a86e7fac72f759d41b2e65200666f617fd00b..585c85cbd2c51e537b17328374d60ef6c22cea06 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -10,7 +10,8 @@ let
 
 in stdenv.mkDerivation {
 
-  name = "opentx-${version}";
+  pname = "opentx";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "opentx";
diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix
index bc6aa242f33807837285854c3ace45cf8a676a9c..e404da974c46f4f61a2cd8f311fcb4b0a31eb831 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/pkgs/applications/misc/orpie/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocamlPackages, ncurses, gsl }:
 
 stdenv.mkDerivation rec {
-  name = "orpie-${version}";
+  pname = "orpie";
   version = "1.5.2";
 
   src = fetchurl {
-    url = "http://pessimization.com/software/orpie/${name}.tar.gz";
+    url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz";
     sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy";
   };
 
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 9d0fb3fdeb7c7eb9cd059685424c908be51e9a5a..8ffc8ec69fecf711158949c13e1b444c4ea28596 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
 
 stdenv.mkDerivation rec {
-  name = "osm2xmap-${version}";
+  pname = "osm2xmap";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index bb53782fb7d217c92faf7a0ac291905f16fa19b2..4cbd7cb71190162a8170c0339fc52361b1e3f854 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -17,7 +17,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "osmctools-${version}";
+  pname = "osmctools";
   version = "0.8.5plus1.4.0";
 
   buildInputs = [ zlib ];
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 2b35cb7703896a942d929cbb2f3d4f7e6d3aef89..616949af8836d461dda8583d4e52947abf9afce1 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }:
 
 stdenv.mkDerivation rec {
-  name = "osmium-tool-${version}";
+  pname = "osmium-tool";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 7fdfbd84d2f68e2a303240839033ff264a18a1da..482ac7ad0667609d46ea97881a39e9a6e29615a7 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "pcmanx-gtk2-${version}";
+  pname = "pcmanx-gtk2";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index f604684b19a12269cfcf9e4f776d8d3ccfdfcb08..bc6f5965e89b26818c04bd0f80e08fb5506fcbac 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
 
 pythonPackages.buildPythonApplication rec {
-  name = "pdf-quench-${version}";
+  pname = "pdf-quench";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index d55c7a2af12bbf20a7aca3d0d9a3fa22a2b31f88..fc4e5229c9c015716e5a3c7a9abde5e9217b95ba 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "pell";
   version = "0.0.4";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 7e7850668b846a942fa07ac7ded63a33cfd562f4..86e10ae0943ea8c2fba9b7955303f9477f9b0adf 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "pgadmin3-${version}";
+  pname = "pgadmin3";
   version = "1.22.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 113a63f7fe189e623d98ccff8471a90093f3cb74..241d5786468e2def49d9ff416505f28231e09de6 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, openssl } :
 
 stdenv.mkDerivation rec {
-  name = "pgmanage-${version}";
+  pname = "pgmanage";
   version = "11.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index 0cee74522ab291576fcb43b68879640d65db2b2e..e8ddec91e62a4725e5a81d80d2194a1a7cf10330 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "phwmon-${version}";
+  pname = "phwmon";
   version = "2017-04-10";
 
   src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index b44169adea8dd1984184d819bc893099a1321bf2..3ecace18f9246db5adeb28ed951c64e67bc9c8d7 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "plasma-applet-volumewin7mixer-${version}";
+  pname = "plasma-applet-volumewin7mixer";
   version = "24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index e5c096fd2ae5a6d80f39a317d7df37fe37a0568f..48188574ad4be7e6d003e5d156ea548510cc1e36 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -55,7 +55,8 @@ let
   libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
 
 in stdenv.mkDerivation {
-  name = "playonlinux-${version}";
+  pname = "playonlinux";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 0bd28811d55b9acb293995510e4d73efd1dac1e6..8021ffdc8f513a853cb39d7337ff51f25ae29353 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -2,7 +2,7 @@
 
 {
   stable = with python27Packages; buildPythonPackage rec {
-    name    = "plover-${version}";
+    pname = "plover";
     version = "3.1.1";
 
     meta = with stdenv.lib; {
@@ -24,7 +24,7 @@
   };
 
   dev = with python36Packages; buildPythonPackage rec {
-    name    = "plover-${version}";
+    pname = "plover";
     version = "4.0.0.dev8";
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 4b39e9291a8a73e910198bac940200c6e7b150b7..16c49d5f946c6ed190e3580150c9e5fe13b95cc2 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
 
 stdenv.mkDerivation rec {
-  name = "pmenu-${version}";
+  pname = "pmenu";
   version = "2018-01-01";
 
   src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 81e3d80f5167855b0aab29a12283b29aacc677c6..8413f8c8f1023a23d573b625bd58cfe1e6007f4a 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -9,7 +9,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "polar-bookshelf-${version}";
+  pname = "polar-bookshelf";
   version = "1.13.10";
 
   # fetching a .deb because there's no easy way to package this Electron app
diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
index 5ba8e1b6e3134dc723ddd436a38d1e509adc1b42..344c3d7168ac5159538ebba08e27627c41523845 100644
--- a/pkgs/applications/misc/projectlibre/default.nix
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
 
 stdenv.mkDerivation rec {
-  name = "projectlibre-${version}";
+  pname = "projectlibre";
   version = "1.7.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index cc6f63c0960ba2d86b9f0dcce5e74fd83c3c8048..e5d73672eb75d589943ba7fda7305e2885b3bca2 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -8,7 +8,7 @@ let
                  else "2.4";
 in
 stdenv.mkDerivation rec {
-  name = "prusa-slicer-${version}";
+  pname = "prusa-slicer";
   version = "2.0.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 4d20402124725db1d410d390a9919e18ac3b3c16..48a05091ca85c0d7b0b989546a0b79112ece35cb 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -5,7 +5,8 @@
 let
   version = "1.6";
 in mkDerivation rec {
-  name = "qdirstat-${version}";
+  pname = "qdirstat";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "shundhammer";
diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix
index ae0fd61c33dd13f74232763bd74f07ee87937832..aae38f7d0f17b86c38c7747ee435b0abf5a2fecb 100644
--- a/pkgs/applications/misc/qlandkartegt/default.nix
+++ b/pkgs/applications/misc/qlandkartegt/default.nix
@@ -3,11 +3,11 @@
 , garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }:
 
 mkDerivation rec {
-  name = "qlandkartegt-${version}";
+  pname = "qlandkartegt";
   version = "1.8.1";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
     sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly";
   };
 
diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix
index f12a3021a19ad43a2e8010dd93531dcceebcae27..a679a4f1112faacc48b6ad739386eb0d869516be 100644
--- a/pkgs/applications/misc/qlandkartegt/garmindev.nix
+++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, libusb }:
 
 stdenv.mkDerivation rec {
-  name = "garmindev-${version}";
+  pname = "garmindev";
   version = "0.3.4";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
     sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6";
   };
 
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index df5f35102e0188e589fa80a717aa58b80e28c5fa..8fc890f42439d100100c6510f87d2bc77eb26f82 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation rec {
-  name = "qlcplus-${version}";
+  pname = "qlcplus";
   version = "4.12.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 99a0acbcc8c62bbdf40a0771c6646b3fd9ff153b..335c583998fc901913ced3e765bb226cb3d75062 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,11 +1,11 @@
 { mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
 
 mkDerivation rec {
-  name = "qmapshack-${version}";
+  pname = "qmapshack";
   version = "1.13.1";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz";
     sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9";
   };
 
diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index e395ae9c070debb352a9c4c1bc1796a3a76a2e72..ecc372dc674ccf5fa3951790ae3ae1526cca67f1 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -2,7 +2,7 @@
 , qtmultimedia, qttools, qtwebengine }:
 
 stdenv.mkDerivation rec {
-  name = "qolibri-${version}";
+  pname = "qolibri";
   version = "2018-11-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 6ae8f380fe28bacd574e40dbd24b48631aa15b77..71a433bded79f68f9f3310a975f0e599eb494a84 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -7,7 +7,7 @@
 
 mkDerivation rec {
   version = "0.5.8";
-  name = "qsyncthingtray-${version}";
+  pname = "qsyncthingtray";
 
   src = fetchFromGitHub {
     owner  = "sieren";
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 7586669218dad2dfc91c401e945b2c747834df48..d942f999f69719aecea7c6907d9ab509c87dfad0 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.40.41";
 in
 stdenv.mkDerivation {
-  name = "qtbitcointrader-${version}";
+  pname = "qtbitcointrader";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index b2616bf7b778549809cd01833e093b085a43d1f0..948bcf33d378fff643ac9b2453ce545dd96dd334 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, gtk2, synergy}:
 
 stdenv.mkDerivation rec {
-  name = "quicksynergy-${version}";
+  pname = "quicksynergy";
   version = "0.9.0";
   src = fetchurl {
     url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index bf4559e911780e2c699976aacdf88c51492f4074..25f9c6ed4c7a6f314e1b17e8582a09b08e1e773e 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "redis-desktop-manager-${version}";
+  pname = "redis-desktop-manager";
   version = "0.9.1";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 03b8d709fce2d11575a1e19277bee6c7a9d19c81..2eebe67c46da3bbe0bd4240fee57a8abc5c74ce3 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.18"; in
 
 stdenv.mkDerivation {
-  name = "redshift-plasma-applet-${version}";
+  pname = "redshift-plasma-applet";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "kotelnik";
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 3a288a81c37f0dd972b932affca324692d01280d..ad27c9b13a616195312553b7be005f2ede27c08a 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -12,7 +12,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "redshift-${version}";
+  pname = "redshift";
   version = "1.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index 703d786212494b0a95b112c03c83c9a0d6080a3a..ca362bab2ec9f7322c6ecf0392913b8014c54de5 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -14,7 +14,7 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "regextester-${version}";
+  pname = "regextester";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index cfafd239b603e8090311d231985297c4540c47ca..00640be6c74a6dc1a0828255e5741280636a87c8 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -2,7 +2,7 @@
   freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "robo3t-${version}";
+  pname = "robo3t";
   version = "1.3.1";
   rev = "7419c406";
 
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 76593eba5fc4e3314e7f98e9b6343af67da48ee5..8df4e960c180ef51055fb3d585986b2198b731ae 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -2,7 +2,7 @@
   freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "robomongo-${version}";
+  pname = "robomongo";
   version = "0.9.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index aa0ebc29a5574acc6bf64742cca16c3b0f6bfab8..1cff3635bf9ddc0951e297cea430c444c59c98f2 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -11,10 +11,11 @@
 
 let version = "3.3.2";
 in stdenv.mkDerivation rec {
-  name = "roxterm-${version}";
+  pname = "roxterm";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/roxterm/${name}.tar.xz";
+    url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz";
     sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
   };
 
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 8e63cdb6d16cb16c640ea17052700610d8b645d1..acdd21a1c219444a7b9a0df993d7f8c056653088 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -3,11 +3,11 @@
 , libX11, libXt, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "rxvt-${version}";
+  pname = "rxvt";
   version = "2.7.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rxvt/${name}.tar.gz";
+    url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz";
     sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1";
   };
 
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index f872e80083632db397e709ece71d15ed31209dfa..a4e03fa347f0edfc642e2e3fe7918cfe88b4f2ca 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "urxvt-autocomplete-all-the-things-${version}";
+  pname = "urxvt-autocomplete-all-the-things";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 544789e865b5e5e4dc1236fcdb7a2e15dca4807b..b976388ae2c463dd15ca766dfbba3545e9560d9f 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "urxvt-perls-${version}";
+  pname = "urxvt-perls";
   version = "2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index e8e5c524a35c20c5be6204b44b66064330a1d1fe..2982c02cce9aea56e38896ce50760b559f0af430 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "urxvt-tabbedex-${version}";
+  pname = "urxvt-tabbedex";
   version = "19.21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index 30f54cdee7e9d989f9318f75667c41613cabd13f..125170d36c27625befd4d0f9c5b6944f82f4913c 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -4,7 +4,6 @@
 let inherit (python3Packages) python buildPythonApplication fetchPypi;
 
 in buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "safeeyes";
   version = "2.0.9";
   namePrefix = "";
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 33df8e8f0a277b192edd13a08ed856bd25d9e082..8510d50194249f2c5007819ab5a689d8cbf747d6 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sakura-${version}";
+  pname = "sakura";
   version = "3.6.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1";
   };
 
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 280a42fde14c097c54fd5239b6e9bc060a80121f..c95eba48bdfb441b46a9c71d57e0c2f5d438da66 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.0";
-  name = "sc-im-${version}";
+  pname = "sc-im";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index cc8c30043b2931cc12e9a42cb574211b2d80d876..3cebcc0101f87f6c2366a90526ac9b6f1d6a9af0 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
 
 stdenv.mkDerivation rec {
-  name = "sdcv-${version}";
+  pname = "sdcv";
   version = "0.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index fc63745ebb848e2467f92c10ef7f67f81ec65209..114404c2597dc4df6ef0bbb464f0db24404c82c8 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, undmg }:
 
 stdenv.mkDerivation rec {
-  name = "sequel-pro-${version}";
+  pname = "sequel-pro";
   version = "1.1.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index fc6be074a079e726d1b46944d447bbd21ad1e443..d2d5e9548a0c341b3b1934b934da0d1077ab0feb 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
 
 stdenv.mkDerivation rec {
-  name = "slade-${version}";
+  pname = "slade";
   version = "3.1.1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index e012c3763b34c6bb3889eba2a89e5c03c3401fd9..cf9e93b87b39bbedb15b57110b278793d615db47 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.0";
-  name = "slic3r-${version}";
+  pname = "slic3r";
 
   src = fetchgit {
     url = "git://github.com/alexrj/Slic3r";
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index f4a2e889cd434f7ba926a31159272aebdb2416ad..bfb3d010a3c7cc5415614c412ac1f2d8560ccd29 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "slstatus-${version}";
+  pname = "slstatus";
   version = "unstable-2018-04-16";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 9f20b20f7f3a3ffbc40e96bcf8f5e977fe4f558d..c116b5874069ed6b94ce440e38c68043954e890d 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -3,7 +3,7 @@
 , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }:
 
 stdenv.mkDerivation rec {
-  name = "spacefm-${version}";
+  pname = "spacefm";
   version = "1.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix
index a1d5ef153bbddeec4c2ccfcd8607fbf878bdfb02..103075024dd5fb3bb7f7e37c014f91cc73c7ea11 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/pkgs/applications/misc/sqliteman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
 
 stdenv.mkDerivation rec {
-  name = "sqliteman-${version}";
+  pname = "sqliteman";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix
index aee486ddf0c2290ca823d3b591e4109172d1d236..eb408eaf6ee3ed3f40d2a5726fd7d441bd2986f5 100644
--- a/pkgs/applications/misc/ssocr/default.nix
+++ b/pkgs/applications/misc/ssocr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, imlib2, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "ssocr-${version}";
+  pname = "ssocr";
   version = "unstable-2018-08-11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index d3cd81f7f13a8a137784bde7c3199a30e5dcf767..8c47de3afac03b87b8367960b56ea7b121b96390 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "stog-${version}";
+  pname = "stog";
   version = "0.18.0";
   src = fetchFromGitLab {
     domain = "framagit.org";
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index d545447cb130660cf012db1214576a791cb4cbb0..340b59d5ff23adecd9baa318c15b687f0175b4fb 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -3,7 +3,7 @@
 , perlPackages, python27 }:
 
 stdenv.mkDerivation rec {
-  name    = "styx-${version}";
+  pname = "styx";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 7bac1db813f4388eeb8c2681e876073b00b98ef1..a29dad2c4447980f82a5a237b4cc12d03355cc6e 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -7,7 +7,8 @@ let
   version = "4.8.2";
 
   libdc = stdenv.mkDerivation rec {
-    name = "libdivecomputer-ssrf-${version}";
+    pname = "libdivecomputer-ssrf";
+    inherit version;
 
     src = fetchurl {
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
@@ -30,7 +31,7 @@ let
   };
 
   googlemaps = stdenv.mkDerivation rec {
-    name = "googlemaps-${version}";
+    pname = "googlemaps";
 
     version = "2017-12-18";
 
@@ -66,7 +67,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "subsurface-${version}";
+  pname = "subsurface";
+  inherit version;
 
   src = fetchurl {
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 3e7983c667f2a3fa6d40e6ece6a0ec5ac11be5d7..c314e8ffe5acdecf5598f6103574a0d1251d7627 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -5,10 +5,11 @@
 let
   version = "0.2.99.4";
 in stdenv.mkDerivation rec {
-  name = "synapse-${version}";
+  pname = "synapse";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
+    url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz";
     sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j";
   };
 
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index f16a0d29c40d915d2ffbdfc91fae4792dc1555c4..a07fe0c75103bcfb3ec659c2b781dea370e67335 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }:
 
 buildGoPackage rec {
-  name = "syncthing-tray-${version}";
+  pname = "syncthing-tray";
   version = "0.7";
 
   goPackagePath = "github.com/alex2108/syncthing-tray";
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 5f12bdb4dfcdbd00ff236ab7219f2c3d8f548c04..377d83e596272f44a19a62ed396734b5a5590237 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -3,7 +3,7 @@
 , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "synergy-${version}";
+  pname = "synergy";
   version = "1.8.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix
index 52e39b98a3b6430c927d75b78ca70e31e47eb09c..fbb1832735beaa1007dca29644300cdde2617ec2 100644
--- a/pkgs/applications/misc/tabula/default.nix
+++ b/pkgs/applications/misc/tabula/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "tabula-${version}";
+  pname = "tabula";
   version = "1.2.1";
 
 
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index 7ca421b49a35b456f4c531b21aaeef635386c4f7..0450cb40a555b763314d860b9851ba40a003abcc 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-05-15";
-  name = "tasknc-${version}";
+  pname = "tasknc";
 
   src = fetchFromGitHub {
     owner = "lharding";
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 6a30adb23da252c629690ff3bfd077291018aa20..feb06368de4128ce667c5d59de1eb3d22c2e3f42 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, readline }:
 
 stdenv.mkDerivation rec {
-  name = "tasksh-${version}";
+  pname = "tasksh";
   version = "1.2.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "https://taskwarrior.org/download/${name}.tar.gz";
+    url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz";
     sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
   };
 
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index dc632f3ed757a8252950e4d63c52f97ce2cfedbc..ba919fbc626743dca3b3bc10be2d7e1331a2e7c7 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libuuid, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "taskwarrior-${version}";
+  pname = "taskwarrior";
   version = "2.5.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index 7edb8dd5d1ef5d7c4783e4d1c03903c84baf59d9..94eacb1fe0671e6f37179af79b97c1e4fd82d166 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 
 buildPythonApplication rec {
 
-  name    = "termdown-${version}";
+  pname = "termdown";
   version = "1.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 3599bd0030b9b5600ef746edd097aa2b99aeb6e0..00300e65abb45053b2eaad8ef11f4accf8a20dd8 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -1,7 +1,7 @@
 { stdenv, runtimeShell, lib, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "terminal-notifier-${version}";
+  pname = "terminal-notifier";
 
   version = "2.0.0";
 
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
index bdbea571790e8c51aa395bf918bb7678b1cf9387..6cacb621517901414896310446e2c5b080f51559 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "terminal-parrot-${version}";
+  pname = "terminal-parrot";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index 8518b72bc95fef1ec3124f09cab4266b3f0bdeff..fce46d120de56d74f76d336765d0372a8360278d 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -13,7 +13,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.0.0-alpha.42";
-  name = "terminus-${version}";
+  pname = "terminus";
   src = fetchurl {
     url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";
     sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index d4191a875bdded7d70c62fc9d3fbb83134ac4e3b..6a9de3644469ab43953a2dc2f248bdec521442d5 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "termite-${version}";
+  pname = "termite";
   version = "15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix
index 9502b3a0abe7461a2fc128cd954a9cb8646a1d42..b176459198242968ef45a9675823eebe7029ff78 100644
--- a/pkgs/applications/misc/teseq/default.nix
+++ b/pkgs/applications/misc/teseq/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.1.1";
 in
 stdenv.mkDerivation {
-  name = "teseq-${version}";
+  pname = "teseq";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/teseq/teseq-${version}.tar.gz";
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 4172660182dfe6ecbbe5064d04c5a9b6cb9684e3..39f54156fef8f37d819e954c5813de18124ef97d 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "tilda-${version}";
+  pname = "tilda";
   version = "1.4.1";
 
   src = fetchzip {
-    url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
+    url = "https://github.com/lanoxx/tilda/archive/${pname}-${version}.tar.gz";
     sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj";
   };
 
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index ca049ba04c9180cec57a9e58d164023a3724fb96..d0419c414d7ace0299f93170341a9a32451d5ca3 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "timewarrior-${version}";
+  pname = "timewarrior";
   version = "1.1.1";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 63bb7f4bb4a4eebfe772389875ed9564c9128407..e612fb10ff8c291c4a3773607cd4b0105360a56f 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tint2-${version}";
+  pname = "tint2";
   version = "16.7";
 
   src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 6cf1f27a104b074e3c52b5a12508db3235788573..cb70d57869c04b116e627f9351bdb1f50e9d28a6 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.17";
-  name = "tnef-${version}";
+  pname = "tnef";
 
   src = fetchFromGitHub {
     owner  = "verdammelt";
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index d4735c0baf5fb329ad156ef64b46931199c5027f..d9dcee762cf385710d6f9d3fad8857fbccfff40d 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "todoist-${version}";
+  pname = "todoist";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix
index 122567de2e1e605f42b2c1191efe2e8fb2c75c0c..240ad6e5fca4ad0b6f53b145fc83695023dd6a06 100644
--- a/pkgs/applications/misc/todolist/default.nix
+++ b/pkgs/applications/misc/todolist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "todolist-${version}";
+  pname = "todolist";
   version = "v0.8.1";
 
   goPackagePath = "github.com/gammons/todolist";
diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix
index b268bdd0962ee3d182eec3ae3ffd028d0906743b..bf22cb0181da287526bc3014121ea502b8100d1a 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/pkgs/applications/misc/toggldesktop/default.nix
@@ -12,7 +12,7 @@ let
   };
 
   bugsnag-qt = stdenv.mkDerivation rec {
-    name = "bugsnag-qt-${version}";
+    pname = "bugsnag-qt";
     version = "20180522.005732";
 
     src = fetchzip {
@@ -25,7 +25,7 @@ let
   };
 
   qxtglobalshortcut = stdenv.mkDerivation rec {
-    name = "qxtglobalshortcut-${version}";
+    pname = "qxtglobalshortcut";
     version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
 
     src = fetchzip {
@@ -38,7 +38,7 @@ let
   };
 
   qt-oauth-lib = stdenv.mkDerivation rec {
-    name = "qt-oauth-lib-${version}";
+    pname = "qt-oauth-lib";
     version = "20190125.190943";
 
     src = fetchzip {
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index ba6e97d61fb3ca5724c26b280f99159f98887e77..d8a6f86f104b62f9d629bbadfef003b1935bef79 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "tomboy-${version}";
+  pname = "tomboy";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz";
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
index 34952b9c0f4dcae789db4edde46559cd08ef79db..eb3894c7b47d22855274d07b6a952b94d7d69b25 100644
--- a/pkgs/applications/misc/topydo/default.nix
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -5,7 +5,6 @@ with python3Packages;
 buildPythonApplication rec {
   pname = "topydo";
   version = "0.13";
-  name  = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "bram85";
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index 09322b47506b9cba93e1104f43fc3de83f7b68ac..b955711d0030f1bfa6b3c350dd159a366928569d 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.1";
-  name = "tpmmanager-${version}";
+  pname = "tpmmanager";
 
   src = fetchgit {
     url = "https://github.com/Sirrix-AG/TPMManager";
diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix
index dbac56abaa1d3c365d908653e9a3efc7e6ffc4f3..76ac3f75b2660a6861738e3c083202a1b524c402 100644
--- a/pkgs/applications/misc/tthsum/default.nix
+++ b/pkgs/applications/misc/tthsum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tthsum-${version}";
+  pname = "tthsum";
   version = "1.3.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix
index d12120ca2f11e6856a849d9509d78135a6879992..344c07d845be1ae23d76c77338061bb42681bad5 100644
--- a/pkgs/applications/misc/usync/default.nix
+++ b/pkgs/applications/misc/usync/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "usync";
   version = "0.0.3";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ebzzry";
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 6752b0182fead0610803aea0f8cc6c5af47e8dde..5a12465c4c494d27dd14ffec31d7b7425cdf6b96 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "valentina-${version}";
+  pname = "valentina";
   version = "0.6.1";
 
   src = fetchhg {
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 5cd8de43729bc4189b9bf2f8c3cff08254fcf18d..b25e7f76cefed08fdc3dc44a0135c99837788736 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "vcal-${version}";
+  pname = "vcal";
   version = "2.8";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 8b64bcca667d48e9ae4a23bbfd00b24ca4955429..f0900a99e5d1b0ade2c43f144aa7c02040ae41b1 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -4,7 +4,6 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "veracrypt";
-  name = "${pname}-${version}";
   version = "1.23";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index 0586244455617a970349a0a81dd86c4f14df3c70..b6a8b567a5032cbfcf2a7a76a621700f61d52a3d 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "verbiste-${version}";
+  pname = "verbiste";
 
   version = "0.1.46";
 
   src = fetchurl {
-    url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
+    url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
     sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0";
   };
 
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 50f2012d34ab35f50bb75cc9ca688b85efbe5049..cda3b1a6f8503f7b9411a08888ade6704a2fbdc2 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -4,7 +4,7 @@
 , geoclue2, liboauth }:
 
 stdenv.mkDerivation rec {
-  name = "viking-${version}";
+  pname = "viking";
   version = "1.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 5ebc98b5712303a08475095a7a62156312deab0e..64645e00bd852a7ba30cffaf919ca625eb93784a 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -2,7 +2,6 @@
 , dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
 }:
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "visidata";
   version = "1.5.2";
 
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 47b0385be687a279592fb73f83feb5989444f913..e482e7e7c02dd750e902cb27fd4dea223bc86588 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -3,7 +3,7 @@
 , dbus-glib, autoreconfHook, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "volnoti-unstable-${version}";
+  pname = "volnoti-unstable";
   version = "2013-09-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix
index e794b82e2f6ea2fb939bf586aed3294019c4dd1e..a59a25a144e9233cf6f5ed1ddc770f996f23ebc0 100644
--- a/pkgs/applications/misc/vp/default.nix
+++ b/pkgs/applications/misc/vp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:
 
 stdenv.mkDerivation rec {
-  name = "vp-${version}";
+  pname = "vp";
   version = "1.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 1feec9e45509823bceea90179e510837fd930cd2..d6404ca6596581bdbd3195f1d1b32d951650ed4e 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "vue-${version}";
+  pname = "vue";
   version = "3.3.0";
   src = fetchurl {
     url = "http://releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 48818ca3b8b11bc666d5a70c39e478e818dd46f3..6dfe8e713c633fbb0622cda8b50378a80ce73173 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
 
 stdenv.mkDerivation rec {
-  name = "vym-${version}";
+  pname = "vym";
   version = "2.6.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/vym/2.6.0/${pname}-${version}.tar.bz2";
     sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
   };
 
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix
index 1c6dc8f63c23bd4f6fa2c5fc9750d1694cc4b6f1..ff770f516bc55ec9afd476fb63f683a2a5c5d521 100644
--- a/pkgs/applications/misc/wcalc/default.nix
+++ b/pkgs/applications/misc/wcalc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, mpfr, readline }:
 
 stdenv.mkDerivation rec {
-  name = "wcalc-${version}";
+  pname = "wcalc";
   version = "2.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/w-calc/${name}.tar.bz2";
+    url = "mirror://sourceforge/w-calc/${pname}-${version}.tar.bz2";
     sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f";
   };
 
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 90fa016615430919ff03eab4f9c5ccfa918f7949..2748d576c692fab7e6c688baa13f42fdb3cd4563 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
     version = "2.3";
-    name = "weather-${version}";
+    pname = "weather";
 
     src = fetchurl {
-        url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
+        url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";
         sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
     };
 
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index a3d3ace009e1bab5930fa6175d8c433a616d3a24..03f3caa4c1515fe3ac7e3f318a632da08d8b1571 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "wego-${version}";
+  pname = "wego";
   version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
   
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index d8628b794d7161a730a7c485bfae986781d19ae9..d38383c30ecb782969def6b445143e4e3a1a8aec 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.4";
-  name = "wikicurses-${version}";
+  pname = "wikicurses";
 
   src = fetchFromGitHub {
     owner = "ids1024";
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 5d153a0e417fd71c33996ed80c6b875076162135..5a1093b47797bb82dccc0e6f7d9304a441f0dd13 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0";
-  name = "wordnet-${version}";
+  pname = "wordnet";
   src = fetchurl {
     url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";
     sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index daae279ccc7941f91c181a3cd18ae03b3647bfa0..e5b89ff43b5bf778b5f2a0f737d376af897e1eca 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -1,11 +1,11 @@
 { stdenv, libX11, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "worker-${version}";
+  pname = "worker";
   version = "4.0.1";
 
   src = fetchurl {
-    url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
+    url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
     sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh";
   };
 
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 1547d29621166e95b726736096ec1c73ecc0e887..a3c9d735ff8d6ec54b3adf58069c7acc34197905 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -6,7 +6,7 @@
 , gst-plugins-good, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  name = "workrave-${version}";
+  pname = "workrave";
   version = "1.10.31";
 
   src = let
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index bf3d9b737a9ebdc7210400125c427bd7a9cba94b..9040bb4318d5bd457b651e939f3f949cf7e1e0e1 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.31";
-  name = "xautoclick-${version}";
+  pname = "xautoclick";
   src = fetchurl {
     url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
     sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 280b30128727d13bb0826ed15cda0b0a704d73fb..8c5a2e3d2db9041542301d5275e5a7ba2e31c8e1 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -2,7 +2,7 @@
 , libtool, openssl, qtbase, qttools }:
 
 mkDerivation rec {
-  name = "xca-${version}";
+  pname = "xca";
   version = "2.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index ed7f2b27c381cea924d97e2b27fbcf189d8ecc84..b7f8cfce2fb65bea8b3d9fe1b588331de4f649b9 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, txt2tags, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "xdgmenumaker-${version}";
+  pname = "xdgmenumaker";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 88ab52313b067cd664334b31695fb32194996eec..b7c6f938b19e48c043113ce6369df41de77384a7 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xiphos-${version}";
+  pname = "xiphos";
   version = "4.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
index 3023e830dc79190171789113ad35150e96b062b9..d6709ecc1a62402a2a405a49b23b93eadb9661ee 100644
--- a/pkgs/applications/misc/xkbd/default.nix
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbd-${version}";
+  pname = "xkbd";
   version = "0.8.18";
 
   src = fetchFromGitHub {
     owner = "mahatma-kaganovich";
     repo = "xkbd";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9";
   };
 
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
index 3f3865d7688a3e6feeae862981c269c487fc72d9..abc808477a39e5b991ab6f61595733e2fa3f22ac 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xkblayout-state";
   version = "1b";
 
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix
index 4fa1c833df53a21c1beaf9fe93e8bff3bd24caa9..dc618e4561e6e54a636805eef6178744031dd7a7 100644
--- a/pkgs/applications/misc/xkbmon/default.nix
+++ b/pkgs/applications/misc/xkbmon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbmon-${version}";
+  pname = "xkbmon";
   version = "0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix
index 433f6c6147740eb7c1665f25cef10292e0a0bbbd..c673002fb511040f5809e55d4cf900777158d950 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/pkgs/applications/misc/xmind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "xmind-${version}";
+  pname = "xmind";
   version = "8-update8";
 
   src = fetchzip {
-    url = "https://xmind.net/xmind/downloads/${name}-linux.zip";
+    url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip";
     stripRoot = false;
     sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn";
   };
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 6e421be93022cee4bbd0418989954664c2decb9c..8a46336c9de28deb37fe885511b972288127524e 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xmrig-${version}";
+  pname = "xmrig";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 18eb2189f2c0548dea8417749bb1e9c53dd3857f..7d9ebca0086c4b88e4b9cc47a6558e4e299a5cda 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xmrig-proxy-${version}";
+  pname = "xmrig-proxy";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 1cce7b155fde080f4972f0781c94077ce20e3b5b..0661a625e97f9d12d085206c154a573c1bd36ce8 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -2,7 +2,7 @@
 , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
-   name = "xneur-${version}";
+   pname = "xneur";
    version = "0.20.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
index 5db4a2508399b7a490eaab219031c04fcb7dc7d1..bc91083892dbf805737c57d2c461c23acc854166 100644
--- a/pkgs/applications/misc/xpad/default.nix
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -3,7 +3,7 @@
 , glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "xpad-${version}";
+  pname = "xpad";
   version = "5.4.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix
index bb3385ad016a68627ca906a8c00327ef73d3ceac..41071012ae9f651f1a72269a9765cfe0c6f46469 100644
--- a/pkgs/applications/misc/xrandr-invert-colors/default.nix
+++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.01";
-  name = "xrandr-invert-colors-${version}";
+  pname = "xrandr-invert-colors";
   src = fetchurl {
     url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz";
     sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75";
diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix
index 28ce4a0d500d1969dcd44157ee1f588097aea68e..517105d7e1fd63abc251c4694028b02e57d300f2 100644
--- a/pkgs/applications/misc/xscope/default.nix
+++ b/pkgs/applications/misc/xscope/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xscope";
   version = "1.4.1";
 
   src = fetchurl {
-    url = "mirror://xorg/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${pname}-${version}.tar.bz2";
     sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k";
   };
 
diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix
index ef9ce33936199c3dc574d4940b70af96444a8d07..55ecd358c6cd41af3c0d11e8d5b750bd8b2f3d8d 100644
--- a/pkgs/applications/misc/xsuspender/default.nix
+++ b/pkgs/applications/misc/xsuspender/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "xsuspender-${version}";
+  pname = "xsuspender";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index 3e8acff00f893d70375d1214cc453e553b7d2cfe..aa851e14ab5fdde660ff47de394fd137db092e80 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -4,7 +4,7 @@ let
   makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
 
 in stdenv.mkDerivation rec {
-  name = "xsw-${version}";
+  pname = "xsw";
   version = "0.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix
index 6bc492833cc1265aa37a3d077b0286a525e6541e..856ddb8ff50c93a9659a44c84c9d01e8c60ce664 100644
--- a/pkgs/applications/misc/xteddy/default.nix
+++ b/pkgs/applications/misc/xteddy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xteddy-${version}";
+  pname = "xteddy";
   version = "2.2-5";
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
index 21f95c65fa56687e9cd4877b5b6723dc776eb10a..51575d62ed501442eda9e6a66655ea1b8feb9d70 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.7";
-  name = "xtermcontrol-${version}";
+  pname = "xtermcontrol";
 
   src = fetchurl {
     url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix
index d273d27944a85324dcbbca8c24f76965707f6a4a..2135c7fd617423f244d9e54cecbb911fa60aa5b1 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/pkgs/applications/misc/yaft/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.9";
-  name = "yaft-${version}";
+  pname = "yaft";
 
   src = fetchFromGitHub {
     owner = "uobikiemukot";
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
deleted file mode 100644
index 8f8494ac45b5166b68895d8da4c998ed6b8d41c0..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/yakuake/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ mkDerivation
-, lib
-, fetchurl
-, kdoctools
-, wrapGAppsHook
-, extra-cmake-modules
-, karchive
-, kcrash
-, kdbusaddons
-, ki18n
-, kiconthemes
-, knewstuff
-, knotifications
-, knotifyconfig
-, konsole
-, kparts
-, kwindowsystem
-, qtx11extras
-}:
-
-mkDerivation rec {
-  pname = "yakuake";
-  version = "3.0.5";
-  name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8";
-    };
-
-    buildInputs = [
-      karchive
-      kcrash
-      kdbusaddons
-      ki18n
-      kiconthemes
-      knewstuff
-      knotifications
-      knotifyconfig
-      kparts
-      kwindowsystem
-      qtx11extras
-    ];
-
-  propagatedBuildInputs = [
-    karchive
-    kcrash
-    kdbusaddons
-    ki18n
-    kiconthemes
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kwindowsystem
-  ];
-
-  propagatedUserEnvPkgs = [ konsole ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools wrapGAppsHook
-  ];
-
-  meta = {
-    homepage = https://yakuake.kde.org;
-    description = "Quad-style terminal emulator for KDE";
-    maintainers = with lib.maintainers; [ fridh ];
-    license = lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index a47fb93512db7c1154b5aee95f119223d7a9d39b..06e12416baa019890dfe0410b9f0947f06b4e927 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -25,7 +25,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "git-2017-12-01";
-  name = "yarssr-${version}";
+  pname = "yarssr";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 294229d08a939cd3c6da7bd8870073dc81c302dc..09a6cc4a3c0a4ae1250ba2fa5533c6f2b88b942f 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib, qt4, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "yate-${version}";
+  pname = "yate";
   version = "6.1.0-1";
 
   src = fetchurl {
-    url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz";
+    url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
     sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d";
   };
 
diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix
index eb2a0f1c1e14801015352239feb540bd6c6915a8..7c2c8fb31cab2b4fefec1105a96f8f94680653aa 100644
--- a/pkgs/applications/misc/zathura/cb/default.nix
+++ b/pkgs/applications/misc/zathura/cb/default.nix
@@ -2,11 +2,11 @@
 , girara, gettext, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-cb-${version}";
+  pname = "zathura-cb";
   version = "0.1.8";
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz";
     sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5";
   };
 
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index fe4ecf225aae6b968ef74d0af2e6b25c9ad58ada..8afba9353ce1fe40b6a16f357233863927b71ebe 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -9,7 +9,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "zathura-core-${version}";
+  pname = "zathura-core";
   version = "0.4.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index f3cacd21236e22357cea32fd22023726d505200e..2ebc640d683da3119c043dc8f09c51a62bb96a90 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.4";
-  name = "zathura-pdf-mupdf-${version}";
+  pname = "zathura-pdf-mupdf";
 
   # pwmt.org server was down at the time of last update
   # src = fetchurl {
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 30ab053f923df76bc41969135ae68cf3c636d74f..5b38555eda1a6ac9b87354d813ef54ceef557e1d 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.9";
-  name = "zathura-pdf-poppler-${version}";
+  pname = "zathura-pdf-poppler";
 
   src = fetchurl {
-    url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${name}.tar.gz";
+    url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz";
     sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l";
   };
 
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index 05dee5b6154cde983ba5f91abc96d801d8908020..ce5c7fb41f1f79ad28f24d7358a78aab8dc8527e 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -17,7 +17,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "apache-directory-studio-${version}";
+  pname = "apache-directory-studio";
   version = "2.0.0.v20170904-M13";
 
   src =
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix
index 8b7bc0bb899afa7d42a7d2b1484a1e94d31866ba..31eb4dd7378ac2ca3262f3183e37ec751c33ddee 100644
--- a/pkgs/applications/networking/brig/default.nix
+++ b/pkgs/applications/networking/brig/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "brig-${version}";
+  pname = "brig";
   version = "0.4.1";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index 32de4871186f6f2aa4c558ba1d6219607a2e6a24..57db827169eca55c4b11e1a441c225c5ff9f0c98 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "arora-${version}";
+  pname = "arora";
   version = "0.11.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index 0797eea6f3b5654de7798a07d609955b3cd1cdb6..c3f5cb131645297cf1bc943dd551fad47665aa8e 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -14,7 +14,7 @@ let
 in buildGoPackage rec {
   inherit version;
 
-  name = "browsh-${version}";
+  pname = "browsh";
 
   goPackagePath = "browsh";
 
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 664f9343eabdc0396eb18fe3c64c58548bae568c..a0ea67133c6fc9c1f421f5254be9f80f4ef885f9 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -99,7 +99,7 @@ let
   };
 
   flash = stdenv.mkDerivation rec {
-    name = "flashplayer-ppapi-${version}";
+    pname = "flashplayer-ppapi";
     version = "32.0.0.238";
 
     src = fetchzip {
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 671ab03a2e2996e0062114058c85048a8854a086..8d6c99d2468c9ff689115712ee6f14bfbcc43d69 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.5";
-  name = "dillo-${version}";
+  pname = "dillo";
 
   src = fetchurl {
-    url = "https://www.dillo.org/download/${name}.tar.bz2";
+    url = "https://www.dillo.org/download/${pname}-${version}.tar.bz2";
     sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";
   };
 
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index f464972a9df28a6ee27bb7fb5600661416e71dc8..e6f143c9762984a322d7062287ffe05854ceaa8e 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -314,6 +314,9 @@ stdenv.mkDerivation rec {
   ]
   ++ extraMakeFlags;
 
+  RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/)
+    then null else "--cap-lints warn";
+
   enableParallelBuilding = true;
   doCheck = false; # "--disable-tests" above
 
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 59ba69c1c4da3e049f2e585e34a88237670d493b..f2cc277f3dac5b08a2f6a692b2e8c8ce1bdf43b2 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.19";
-  name = "links2-${version}";
+  pname = "links2";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index d6b775107d06d400a553a013aadd6411cf1be8e6..3f4f96d33efb6401b96e08d5c1fddda1aeb7af27 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -7,7 +7,7 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "lynx-${version}";
+  pname = "lynx";
   version = "2.8.9rel.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 32e4366a4e46eb24ae3a61fa4ac3bfc3b6ac76e3..e8841a0ab6fbec1fa9f4fcaf5fd35e63b3bb72e1 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "bluejeans-${version}";
+  pname = "bluejeans";
 
   version = "2.180.71.8";
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index e8ffa71446842475cc9f85ded519e059e17fa1ab..772ca926cd7565bbb3cfba6663f1105d05c94ed2 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
       "";
 in
 stdenv.mkDerivation rec {
-  name = "flashplayer-${version}";
+  pname = "flashplayer";
   version = "32.0.0.238";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 29a01840555d27a4a4e88a6d016aba9cf1f0130f..2d2d2a6910069da38fc91a2e4b0398c8b3468c38 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,7 +49,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flashplayer-standalone-${version}";
+  pname = "flashplayer-standalone";
   version = "32.0.0.238";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 30bae8792c2e053a0914a4b7dbed9ab8e17cebfc..101ae99d6659bea3c3a454a3c99e0cae592052b6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "fribid-${version}";
+  pname = "fribid";
   version = "1.0.4";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "https://fribid.se/releases/source/${name}.tar.bz2";
+    url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2";
     sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
   };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 8a25036c70a323bf7a0ea95f7b7ebd9ba3265387..bde4ce15d7c0cd3cb7e8403c3e0ecfa825aa9f9a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -46,7 +46,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "google-talk-plugin-${version}";
+  pname = "google-talk-plugin";
 
   # You can get the upstream version and SHA-1 hash from the following URLs:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index c6c1d6a334cde76c86e4cd9889f9bd9de7a5bf0c..fd956f62327e255e0323d96105f5512dacdeb7dd 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, firefox, libX11, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "mozplugger-${version}";
+  pname = "mozplugger";
   version = "2.1.6";
 
   src = fetchurl {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     cp mozplugger.so "$out/lib/mozilla/plugins"
     cp mozplugger.7 "$out/share/man/man7"
 
-    mkdir -p "$out/share/${name}/plugin"
-    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
+    mkdir -p "$out/share/${pname}-${version}/plugin"
+    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index b7118b49dae63a7b3f0bd575c86ba1cf6f58fa9b..d41f8440420122dbf399dbc79a1e8d496e6a1bbb 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -4,7 +4,8 @@
 , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb"
 }:
 stdenv.mkDerivation {
-  name = "otter-browser-${version}";
+  pname = "otter-browser";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "OtterBrowser";
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 3a7612bb0fbc470befc8bf2b1b0bcfd6bf323842..a4979d3bcf2cdc5c944ac2dfceb465ebb6e55f87 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "surf-${version}";
+  pname = "surf";
   version = "2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 1afe4dcea02e3a31cba220ed446f3e9bf126447e..fc3cc2e89a91b2f259f8a628aacb2ec1a30ae410 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -113,7 +113,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "tor-browser-bundle-bin-${version}";
+  pname = "tor-browser-bundle-bin";
   inherit version;
 
   src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index dbe4ddca10f450358a2d8ceb54bc78daf6548320..f15bf165e826e654f99a10af1c25c06d5203b2cf 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -72,7 +72,7 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "tor-browser-bundle-${version}";
+  pname = "tor-browser-bundle";
   version = tor-browser-unwrapped.version;
 
   buildInputs = [ tor-browser-unwrapped tor ];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
index bddac77d1d693d108833a507209fc81a3265ab2e..7356768f3973e35915a5c447fd1c2ed77514ff93 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
@@ -15,7 +15,7 @@
 
 {
   https-everywhere = stdenv.mkDerivation rec {
-    name = "https-everywhere-${version}";
+    pname = "https-everywhere";
     version = "2017.10.4";
 
     extid = "https-everywhere-eff@eff.org";
@@ -46,7 +46,7 @@
   };
 
   noscript = stdenv.mkDerivation rec {
-    name = "noscript-${version}";
+    pname = "noscript";
     version = "5.1.2";
 
     extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
@@ -64,7 +64,7 @@
   };
 
   torbutton = stdenv.mkDerivation rec {
-    name = "torbutton-${version}";
+    pname = "torbutton";
     version = "1.9.8.1";
 
     extid = "torbutton@torproject.org";
@@ -87,7 +87,7 @@
   };
 
   tor-launcher = stdenv.mkDerivation rec {
-    name = "tor-launcher-${version}";
+    pname = "tor-launcher";
     version = "0.2.13";
 
     extid = "tor-launcher@torproject.org";
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 1d08895f1b01221f4da5ec972d3b53f899bca669..f86c4a84e58c30b7b992c34cb1fa7d30e5cae6b6 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -5,7 +5,7 @@
 # but Python 2 + packages during runtime.
 
 stdenv.mkDerivation rec {
-  name = "uzbl-${version}";
+  pname = "uzbl";
   version = "0.9.0";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 1deaa33ee84081280eddeed84e6a2dcab1118b0c..0a72099e653ccad87fe2e85f5723a0041791263d 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vimb-${version}";
+  pname = "vimb";
   version = "3.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 678f226816a89de4686d1e54c4461db50cc5d29a..8a2e164b363996f4e8c0fbe3aef2beb5571bb66f 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "vimprobable2-${version}";
+  pname = "vimprobable2";
   src = fetchurl {
     url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
     sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index 242abc2ece79745635092296938c1083b0215046..4495fc0957965d03f17d2e2b583e979612ae47c5 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "c14-cli-${version}";
+  pname = "c14-cli";
   version = "0.3";
 
   goPackagePath = "github.com/online-net/c14-cli";
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 3946bf88625067577c5d1b9b57d8823006c496a2..09be379b2409fed75dce492ea869fe061daa19a1 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -21,7 +21,7 @@ let
     };
 
   in stdenv.mkDerivation rec {
-      name = "charles-${version}";
+      pname = "charles";
       inherit version;
 
       src = fetchurl {
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 1bc7cea54ebae476aeeb1521e724f51f1b6655bb..6712dcd486bc9540bb08049f4ab4e41ceeb45ec0 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name    = "cloudflared-${version}";
+  pname = "cloudflared";
   version = "2019.7.0";
 
   goPackagePath = "github.com/cloudflare/cloudflared";
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 647261a138f28e11e101c8d9b11ecda8beb054c8..92db34417f47fc55840239e56d5f7cb4c3568238 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "argo-${version}";
+  pname = "argo";
   version = "2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
index bc9023a222f64a95ea474bb6c6672e61ae075216..78be19cd81e5d8c240479d74788380d76a6b4fa7 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/pkgs/applications/networking/cluster/chronos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }:
 
 stdenv.mkDerivation rec {
-  name = "chronos-${version}";
+  pname = "chronos";
   version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22";
 
   src = fetchgit {
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,libexec/chronos}
-    cp target/chronos*.jar $out/libexec/chronos/${name}.jar
+    cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \
-      --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \
+      --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \
       --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY"
   '';
 
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 876630c559a5c9b4dd6f2f8574d442ac3ea38526..115dc3835fc55a972fd1454bdae1870a5cc3a4e3 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "machine-${version}";
+  pname = "machine";
   version = "0.16.1";
 
   goPackagePath = "github.com/docker/machine";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 181663513d3efdd2cf0c6fe814d58732d73c62d4..de122dd2a5a24d0db8bd4aa36f18f5b9ecb45203 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
 
 buildGoPackage rec {
-  name = "docker-machine-kvm-${version}";
+  pname = "docker-machine-kvm";
   version = "0.10.0";
 
   goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index b8b9fa035d18dd980fa42817ed08d7402d67dfb0..eb2946cec7718a97dd0a556ce2fe5166fd3ea64b 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -2,7 +2,6 @@
 
 buildGoModule rec {
   pname = "docker-machine-kvm2";
-  name = "${pname}-${version}";
   version = minikube.version;
 
   goPackagePath = "k8s.io/minikube";
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
index 6b0440eb84aec57fe5b7065c8943a96b7e17dc90..1c2caff50d5368521192b1c0e04d366325ca2edc 100644
--- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }:
 
 buildGoPackage rec {
-  name = "docker-machine-xhyve-${version}";
+  pname = "docker-machine-xhyve";
   version = "0.3.3";
 
   goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 376f8113b23af585808818171f8783cdb31bb0c2..438fdfb2ebac83aa3f09dcac2f0b82f73afc6ddf 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -66,7 +66,8 @@ let
       };
     in
       stdenv.mkDerivation rec {
-        name = "hadoop-${version}";
+        pname = "hadoop";
+        inherit version;
 
         src = binary-distributon;
 
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index c116e46684cd1638926c6edff32b19b0f9f4bbd1..b32862bb4d67526bd9d7d0c2b572871dfb9018dc 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "2.14.2";
-  name = "helm-${version}";
+  pname = "helm";
 
   src = fetchFromGitHub {
     owner = "helm";
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index cd0ef728f83e22002eb97756077637a5b65f4d84..b9413577b10445fc3efe2c244dbd77c858f4c5f3 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "heptio-ark-${version}";
+  pname = "heptio-ark";
   version = "0.10.0";
 
   goPackagePath = "github.com/heptio/ark";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 5eaf1d13d6183d1e967002cc213be50afafddc30..7938265d1b8da82933624d3d41e4ca1437eacf63 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "hetzner-kube-${version}";
+  pname = "hetzner-kube";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index 6274168b3da7fab4b7b48ad49f6290ac4134f421..52abc3189903da488b6218c217124f0d4aba90cf 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.2";
-  name = "kanif-${version}";
+  pname = "kanif";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/26773/${pname}-${version}.tar.gz";
     sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
   };
 
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 19194c2d0873a2be1c5429b767cc8ab8ba4874b3..1a14e1ed273ee301705019a7caa4f6ef6be8cef3 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kompose-${version}";
+  pname = "kompose";
   version = "1.18.0";
 
   goPackagePath = "github.com/kubernetes/kompose";
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index 1e03efddc062848922e0e7dbde44f911dcb44247..e38dc355d2464660502e57d9a3a096ed4ebbb6d2 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name          = "kontemplate-${version}";
+  pname = "kontemplate";
   version       = "1.7.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 6a721ef14c1fca19b95219c5334513b7dc32bf29..c8b95baf2f39562e5b3f2bc4dda01848b7efc34b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -6,7 +6,8 @@ let
   generic = { version, sha256, ...}@attrs:
     let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
       buildGoPackage {
-        name = "kops-${version}";
+        pname = "kops";
+        inherit version;
 
         inherit goPackagePath;
 
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index cf0116ba8569d6873e2b88b7318fbe3fecffc2d8..e1b5a4425d517a6de6b3c0aaf77fbd80223cd62e 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -3,7 +3,8 @@
 let version = "0.12.0"; in
 
 buildGoPackage {
-  name = "kubecfg-${version}";
+  pname = "kubecfg";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bitnami";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 190711e3096bd7c07614e8198180d9fa8541f1df..e4adabd7581348c172fe3cfb14934bf00d7fc027 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -14,7 +14,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "kubernetes-${version}";
+  pname = "kubernetes";
   version = "1.14.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 171ce3d3a54dd8e6d9b94a6ab98f29521717c493..ab8b7deae72d6a13e1e7c4e8e817a725475ae040 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib, ... }:
 
 stdenv.mkDerivation rec {
-  name = "kubetail-${version}";
+  pname = "kubetail";
   version = "1.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 55a827f9cf920e0685241e7b8a89d165b08e8918..982f36def691024774c0392a95ab59dca98ea0db 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 buildGoPackage rec {
-  name = "kubeval-${version}";
+  pname = "kubeval";
   version = "0.7.3";
 
   goPackagePath = "github.com/garethr/kubeval";
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 49cac6d50635e2df67e4b650d1259742100a3da3..72bd82be6c16eed21ac54ab288a715feb362e055 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, jdk, mesos, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "marathon-${version}";
+  pname = "marathon";
   version = "1.4.2";
 
   src = fetchurl {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,libexec/marathon}
-    cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar
+    cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
-      --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
+      --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \
       --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
     '';
 
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 8cff2494bf8fe6ca5f2a02fee62afd699548d01d..0ffc7a1fb6f0737bc880a9cbfbac8206c4a5a3ca 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -26,13 +26,13 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.4.1";
-  name = "mesos-${version}";
+  pname = "mesos";
 
   enableParallelBuilding = true;
   dontDisableStatic = true;
 
   src = fetchurl {
-    url = "mirror://apache/mesos/${version}/${name}.tar.gz";
+    url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz";
     sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
   };
 
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 5551f635bc36a2ccd0c44509a7d1f5bdbbb610b7..43e960d9403ee4911ba22f22db2b0868014abfa3 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -11,7 +11,7 @@ let
   openshiftVersion = "v3.11.0";
 
 in buildGoPackage rec {
-  name = "minishift-${version}";
+  pname = "minishift";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index fec737ddb2aef49b5f587907a738da25c229cf93..ce7b9beb4f8af355bc2de9ce46c88213ca25172f 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nomad-${version}";
+  pname = "nomad";
   version = "0.9.4";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index dd57add14af9cc9d265201c866d312fcd2360c4f..758786f586a6fb0735d4bbd3f8797c8a8777e6ee 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -21,7 +21,7 @@ let
   k8sgitMajor = "0";
   k8sgitMinor = "1";
 in buildGoPackage rec {
-  name = "openshift-origin-${version}";
+  pname = "openshift-origin";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index 618bea36de862dc068ea896ff06d430b78cbd454..de0bb015852cfda8cc157f81e17c8bcc75eec3f9 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "pachyderm-${version}";
+  pname = "pachyderm";
   version = "1.8.5";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 3572bfe7f5ba01ead52b5193ff03f14f4116622a..e675d17491afb6ebab1ec7d567488434bdd8ceff 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -15,18 +15,19 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
 
-  name = "spark-${version}";
+  pname = "spark";
+  inherit version;
 
   src = fetchzip {
     inherit sha256;
-    url    = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz";
+    url    = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
     ++ optional RSupport R
     ++ optional mesosSupport mesos;
 
-  untarDir = "${name}-bin-without-hadoop";
+  untarDir = "${pname}-${version}-bin-without-hadoop";
   installPhase = ''
     mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
     mv * $out/lib/${untarDir}
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 052797db2f3f052158a9c287b2ff9cccbb3a457e..0835d268cd79b2addf044b682dbe152baf66514b 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name    = "${pname}-${version}";
   pname   = "amazon-ssm-agent";
   version = "2.0.633.0";
 
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 3218e6a25b39351dd02bb9a8f9e9a0e4202ac938..8e9e6691a79e8510f6435d7b9b95726de817ac81 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -3,7 +3,7 @@
 let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
 
 buildGoPackage rec {
-  name = "stern-${version}";
+  pname = "stern";
   version = "1.11.0";
 
   goPackagePath = "github.com/wercker/stern";
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index c61896d892182d2bd089eab33baea05efedd2b34..3423163f590267ba61225e9ee62c80bfe213c669 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.7";
-  name = "taktuk-${version}";
+  pname = "taktuk";
 
   buildInputs = [ perl ];
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/33412/${pname}-${version}.tar.gz";
     sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr";
   };
 
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 2b39cebbbeb0730d8c26736d39f63c2757dd09ba..606cd0370aa2c8820cd8a41f5ae4c4d963b033a9 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,6 +1,5 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "terraform-docs";
   version = "0.6.0";
 
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index dd4a36807ea15d8a84323c6a7921c2e6f306ea4c..1bb8df88d0101f6432a28dc279a7f5b77f6917a9 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub}:
 
 buildGoPackage rec {
-  name = "terraform-inventory-${version}";
+  pname = "terraform-inventory";
   version = "0.7-pre";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
index 2b2c3caba8626eb8b71ef3bd86a8cb5b975696ce..bb634a78e23cfa88a60e97605ee7bed4b8caf29b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
-  name = "terraform-provider-ansible-${version}";
+  pname = "terraform-provider-ansible";
   version = "1.0.3";
 
   goPackagePath = "github.com/nbering/terraform-provider-ansible";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index ae456185a80ddb760ff6ff65ca5ebc9c7da0e3cb..1aadbbc5ccd38e3a70ceca5d3c4b55483961003e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
-  name = "terraform-provider-elasticsearch-${version}";
+  pname = "terraform-provider-elasticsearch";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
index 291698f3065f79a1124a7357cdacfe9dcb834e44..4571d368991fa69ec106cf53eea1133a4b59a2bf 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
-  name = "terraform-provider-gandi-${version}";
+  pname = "terraform-provider-gandi";
   version = "1.0.0";
 
   goPackagePath = "github.com/tiramiseb/terraform-provider-gandi";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
index fddf13795f3eab11d69ebd9aa776632dedfeb9d8..06d7b8a9f073eaaa4c3837d41a96700ef3057989 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
@@ -11,7 +11,7 @@
 #
 
 buildGoPackage rec {
-  name = "terraform-provider-ibm-${version}";
+  pname = "terraform-provider-ibm";
   version = "0.11.1";
 
   goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 96b5c8a0fa1fd61610171103611480b4364666fa..23c4f4bfa8b3519e7659791c35aae7334299a7f1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -18,7 +18,7 @@
 # https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
 
 buildGoPackage rec {
-  name = "terraform-provider-libvirt-${version}";
+  pname = "terraform-provider-libvirt";
   version = "0.5.1";
 
   goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 56c30df37c5b16a5b2f5a1d70acb3ab5b5b31964..ddeb5851037b839f8ae3b90cf2829ffacb87424a 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
 
 buildGoPackage rec {
-  name = "terragrunt-${version}";
+  pname = "terragrunt";
   version = "0.17.4";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 1ee2c694e0b46f3baaf0167db6c18f16ef8e98fb..6dbc6954ef519b5108d7e4a57bd3084e291c0570 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.7.4";
-  name = "corebird-${version}";
+  pname = "corebird";
 
   src = fetchFromGitHub {
     owner = "baedert";
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 34ebc84cea288272754500f07df89fbfed39d24b..0967fd95dc0b14d6e236a399024f4fbcb79566b0 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "drive-${version}";
+  pname = "drive";
   version = "0.3.8.1";
 
   goPackagePath = "github.com/odeke-em/drive";
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index 62fe4e2e662e1c77dddba5d0cf5351d66d44d3b0..c74f5789d84fe83a41235e595c751388ed54ca03 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "droopy-${version}";
+  pname = "droopy";
   version = "20160830";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index ae0643669dc0007872989a14feb344dc019c169c..54ed0f2eea040cc875f18160d8c2a5c9b9e9d7f2 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -15,7 +15,8 @@ let
   dropboxd = "${dropbox}/bin/dropbox";
 in
 stdenv.mkDerivation {
-  name = "dropbox-cli-${version}";
+  pname = "dropbox-cli";
+  inherit version;
 
   outputs = [ "out" "nautilusExtension" ];
 
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index f89b8206dbe63072ba6a99f975c81aecb6537816..5b1ab692abd241aa0e5ced227ffbd05a49e37442 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "errbot-${version}";
+  pname = "errbot";
   version = "5.2.0";
 
   src = fetchurl {
-    url = "mirror://pypi/e/errbot/${name}.tar.gz";
+    url = "mirror://pypi/e/errbot/${pname}-${version}.tar.gz";
     sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053";
   };
 
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 4d17cc8bddd1695f410bc437e6a24cb0f6e15acc..67346d45b9f4b3c14983605ea28d821691fc5cea 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -3,7 +3,6 @@
 with pythonPackages;
 
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "rss2email";
   version = "3.9"; # TODO: on next bump, the manpage will be updated.
   # Update nixos/modules/services/mail/rss2email.nix to point to it instead of
@@ -12,7 +11,7 @@ buildPythonApplication rec {
   propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
 
   src = fetchurl {
-    url = "mirror://pypi/r/rss2email/${name}.tar.gz";
+    url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
     sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
   };
 
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index c1a9fddb3c21c3df4d511e662835f42862efdc35..169b88f27185808822ff7ffb8f96134047eab438 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "rssguard";
   version = "3.5.9";
 
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 459aee01f43f2b6e56b24cf7539b2eed59dd1306..c0a6185309ae1885a438b902e9e73682bbcce04f 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
 stdenv.mkDerivation rec {
-  name = "rsstail-${version}";
+  pname = "rsstail";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index 335f393bc0773bf47571fcd085bb08eb02ff07b7..ab2ca1601520b78574f79ac687471bf7aa0541d9 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "firehol-${version}";
+  pname = "firehol";
   version = "3.1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix
index bb245928f07ccf2cd630071e1dc0e666cba5fce6..194dfc25ebaacf8d5f1f7a126eef4927fa12e0c0 100644
--- a/pkgs/applications/networking/firehol/iprange.nix
+++ b/pkgs/applications/networking/firehol/iprange.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iprange-${version}";
+  pname = "iprange";
   version = "1.0.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
index 25ec5d29613abf8109b41f5c9657a222902f01d8..e1ba71ff2c8853c9cac3a12f3dc0904c9f4541c3 100644
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -5,8 +5,6 @@ stdenv.mkDerivation rec {
   pname = "taxi";
   version = "0.0.1";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = pname;
diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix
index d5ef1d7beaabf6d001092d1b9f9e00ae5598e2ff..f16b6337d71a9971b8c4cb4516c05744457ae4a3 100644
--- a/pkgs/applications/networking/gdrive/default.nix
+++ b/pkgs/applications/networking/gdrive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name    = "gdrive-${version}";
+  pname = "gdrive";
   version = "2.1.0";
   rev     = "${version}";
 
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 15e0b5a07b43e2d57a1b9461f133ffeabdd8aed3..830eae1fc281877481ca1971bad2fdb8835b60de 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -2,7 +2,7 @@
 , ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
-  name = "google-drive-ocamlfuse-${version}";
+  pname = "google-drive-ocamlfuse";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix
index 9057fda2e6008fb675ed3569a39e41d9aef0ff16..4fcdf55777a6f16539e63c7a362c126d797e8228 100644
--- a/pkgs/applications/networking/gopher/gopher/default.nix
+++ b/pkgs/applications/networking/gopher/gopher/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "gopher-${version}";
+  pname = "gopher";
   version = "3.0.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix
index d36533fc9e5e639309ccb0f22b106d2cc6b6f1a8..45d9235afc98df2f1f36a891e87a8c929a4f550e 100644
--- a/pkgs/applications/networking/gopher/gopherclient/default.nix
+++ b/pkgs/applications/networking/gopher/gopherclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }:
 
 buildGoPackage rec {
-  name = "gopherclient-${version}";
+  pname = "gopherclient";
   version = "2016-10-02";
   rev = "91c41b5542d08001636708e2a5054521a6004702";
 
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 0fdfbacb45cf9644e610847cd52417d4664c3359..88df3857ec149d7e714390c5d3b4fba0018e162a 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "2.9.11.1";
-  name = "snort-${version}";
+  pname = "snort";
   
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz";
     sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz";
   };
   
diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
index 163f0ba3f4972a7e444c7dc11b01a5fb2f36374a..716989c7b565e20ab13a6ef77e27bdfac15046e4 100644
--- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost166 }:
 
 stdenv.mkDerivation rec {
-  name = "SkypeExport-${version}";
+  pname = "SkypeExport";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 75e1791644b8162f8cebfedd0563efaa9802185f..f01b8d387f83ef696bb384b4c9e9b10bd24135bd 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,7 +4,7 @@
 }:
 stdenv.mkDerivation rec {
   version = "0.6.3";
-  name = "baresip-${version}";
+  pname = "baresip";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
     sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index e1e851b13bbd14d281aa12e0deb6f4257b1ab80e..5094a13119f763025f375c3d383b53842068dd9c 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-discord-${version}";
+  pname = "bitlbee-discord";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index d6c8fae2b5858a589252c3bb19d1bbb691ae37e5..84067dc5f19d7b273db6f50238b488ae223ce790 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-facebook-${version}";
+  pname = "bitlbee-facebook";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index a034827c4ed47b12e811de2c9d8633c0e44d0f06..798dab2b646db55b458e8948a03c56c10454ab7c 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "bitlbee-steam-${version}";
+  pname = "bitlbee-steam";
 
   src = fetchFromGitHub {
     rev = "v${version}";
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index bbdb2ae79f831edfdd4bf3729f97cb53aecadef3..001eadbb01d85c3ab6b3a033dfb83f6853f32a6c 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -2,7 +2,7 @@
 , gnutls, libvpx, makeDesktopItem }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "blink-${version}";
+  pname = "blink";
   version = "3.0.3";
 
   src = fetchdarcs {
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index d76cebd11b01206b969a8093c7545b05b80d86a7..21b21e2534999ad584c786ff86d294d10752815d 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bluejeans-${version}";
+  pname = "bluejeans";
   version = "1.36.9";
 
   src =
diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix
index 350d09078c41fd01dd9c428f1efaba9a776340b1..daffb539676fed9a2f32408b8475ec8bee35f34c 100644
--- a/pkgs/applications/networking/instant-messengers/centerim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "5.0.1";
-  name = "centerim5-${version}";
+  pname = "centerim5";
 
   src = fetchurl {
-    url = "http://centerim.org/download/cim5/${name}.tar.gz";
+    url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz";
     sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index fb47d8db8c85fac93052b8d8f034160990461b6b..3186009db5827d98a4feffdbfe9e8b83674ca0e4 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -2,7 +2,7 @@
   cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
 
 buildGoPackage rec {
-  name = "coyim-${version}";
+  pname = "coyim";
   version = "0.3.11";
 
   goPackagePath = "github.com/coyim/coyim";
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 97a4341dc4d7a085b50dd9f1aeace5237d10fecd..f04afb6f1f7123c16e59beb376dd57e24a5d001f 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -5,7 +5,8 @@
 let
   version = "5.2.0";
 in stdenv.mkDerivation rec {
-  name = "franz-${version}";
+  pname = "franz";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
     sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg";
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index ea793e3c0aac3d1bef2c420f55f7ec80f1f4c759..e24ac2e18317b68e0106004ddc16712511463389 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -3,7 +3,7 @@
 , libunwind, ncurses, curl, jansson, texinfo
 , automake, autoconf }:
 stdenv.mkDerivation rec {
-  name = "freetalk-${version}";
+  pname = "freetalk";
   version = "4.1";
   
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix
index 6878c9a870b1e8ca2917242c2fb23f988e5eafa9..57b745057dce96f23c24819d5dbf837232448231 100644
--- a/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix
@@ -20,7 +20,6 @@ let gitterDirectorySuffix = "opt/gitter";
 in stdenv.mkDerivation rec {
   pname = "gitter";
   version = "4.1.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 9e1b9fe9c39f12cdbbd5e198f656a7eef8ff724f..47854683e0ed54651db2409781982020c24327f5 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -39,7 +39,8 @@ let
     libGL
   ] + ":${stdenv.cc.cc.lib}/lib64";
 in stdenv.mkDerivation {
-  name = "hipchat-${version}";
+  pname = "hipchat";
+  inherit version;
 
   src = fetchurl {
     url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index e9a2b9edec37f27231d3c5e30b7fd675ff0b9ce2..e2203dfe6eedecb253f8217214cb3e24d034015d 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,8 +3,8 @@
 assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
 stdenv.mkDerivation rec {
+  pname = "jackline";
   version = "2019-08-08";
-  name = "jackline-${version}";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 820a742245edc10a71f66aab9b41de723ff6214f..04a31ba403a26436de1a162dbdf647901772e9e7 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "jitsi-${version}";
+  pname = "jitsi";
   version = "2.10.5550";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index 4b8e270c489081cc539accbe53ead4a23c070aad..f5f8414c870c3387680a107a6fad2ce94dfa5780 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -37,18 +37,18 @@ let
 
 in
   stdenv.mkDerivation rec {
-    name = "mattermost-desktop-${version}";
+    pname = "mattermost-desktop";
     version = "4.2.3";
 
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
-          url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz";
+          url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
           sha256 = "14xyn8dp0xxl4j9xdsjik9p6srqdxbirgcgym2sv64p01w3kc9wf";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
-          url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz";
+          url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
           sha256 = "063rrxw76mjz71wp9xd3ppkq3s017vrzms879r2cilypmay7fhgs";
         }
       else
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index d86d62021fbd9cd1e24cced059b98b9378d9c7dc..f41111237114446fde8bfed91c412e04c8f32661 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mcabber-${version}";
+  pname = "mcabber";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index ea190db07a6116601125bb076a06c2e58c2c40e9..3e2718c9c573ec27de3d8c335fdbf7aee28b7041 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -18,7 +18,7 @@
 # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
 
 stdenv.mkDerivation rec {
-  name = "mikutter-${version}";
+  pname = "mikutter";
   version = "3.8.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index a75835b3c7e97cb94b3c719edf3c7d74cb1d94a4..7b76154021aba8063d6e388b6584e6fe11bfab4a 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitLab }:
 
 buildGoPackage rec {
-  name = "mm-${version}";
+  pname = "mm";
   version = "2016.11.04";
 
   goPackagePath = "gitlab.com/meutraa/mm";
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index d337c62ea0947546997d7bd9b148b09802b3bbf6..f214f7221438827cfe7c911c872174df495899d7 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -22,7 +22,7 @@ let
   };
 in
 mkDerivation rec {
-  name = "nheko-${version}";
+  pname = "nheko";
   version = "0.6.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
index 64443461e375bd53d345973ac70d53e4c6919938..ff260c9161b807f434cccc341e714eb10c9545b6 100644
--- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
@@ -2,7 +2,7 @@
 fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "oysttyer-${version}";
+  pname = "oysttyer";
   version = "2.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 60fd5af0a1ab030304bf531a592d0c3f71cd622f..079fc7d57fb1d9fab0bb848f20393aedf05666ca 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -1,7 +1,7 @@
 { stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-carbons-${version}";
+  pname = "pidgin-carbons";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 59b1d463c9d2bda00f4c21a1e46527b17f865e21..eb6d954eb33464fba56e9cfe9bcb386909c2e3e2 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -3,7 +3,8 @@
 let version = "1.5.0";
 in
 stdenv.mkDerivation {
-  name = "pidgin-latex-${version}";
+  pname = "pidgin-latex";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
index 18bf89a5f2ed9075ce9b808b99b20c12591c2860..9a1e46e5ac55885ac405b4263b4842d708d058ed 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -4,7 +4,8 @@ let
   version = "54b2992";
 in
 stdenv.mkDerivation rec {
-  name = "pidgin-mra-${version}";
+  pname = "pidgin-mra";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/dreadatour/pidgin-mra";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 7e86a390edcbdc896f31b49bb9b070860e3c9443..34755809e392ba1d57c2ab47cc1db230724880b7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-opensteamworks-${version}";
+  pname = "pidgin-opensteamworks";
   version = "unstable-2018-08-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index f407ed6cabe31a8d90bc5337b21d06cb165737bf..c418b2e992a87d82d8ad1f896ba13f95e9e8d651 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
 stdenv.mkDerivation rec {
-  name = "pidgin-skypeweb-${version}";
+  pname = "pidgin-skypeweb";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
index f482e12a4bc97527a32d7b8052757070be4dbaea..936974a1a8807a54267ecd8ae8bbf3d1c73365fc 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.8";
 in
 stdenv.mkDerivation rec {
-  name = "pidgin-xmpp-receipts-${version}";
+  pname = "pidgin-xmpp-receipts";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "noonien-d";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index ba1d64c8b92514d1255df5c861900752f1f160a7..1e998bcc80651a4fae4abb4f450cbd84e8e9a508 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
 stdenv.mkDerivation rec {
-  name = "purple-discord-${version}";
+  pname = "purple-discord";
   version = "unstable-2018-04-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index 61e8c2b58d9d5b3066631ce9a5bf6be13be3ac5f..d226490b275502607270f56e9e1528db15791686 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "purple-hangouts-hg-${version}";
+  pname = "purple-hangouts-hg";
   version = "2018-12-02";
 
   src = fetchhg {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
index bcfcbee8556847685a9663895a8bc4029137cce6..e488ae73be008476b3ac7aae3e8d5f3faf17cd29 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "purple-lurch-${version}";
+  pname = "purple-lurch";
   version = "0.6.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index 0b2cba649207198f3400d606768106071b9da914..3c4169274877fb76e3de32f1079446bb5babed1c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -4,7 +4,8 @@ let
   version = "2018-08-03";
 in
 stdenv.mkDerivation rec {
-  name = "purple-matrix-unstable-${version}";
+  pname = "purple-matrix-unstable";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/matrix-org/purple-matrix";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
index e54af933a0818138ae586f83dc6d9c515b35d130..22554a4abf8ba303e4ecf58d2385393ff10585a9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
@@ -4,7 +4,8 @@ let
   version = "40ddb6d";
 in
 stdenv.mkDerivation rec {
-  name = "purple-vk-plugin-${version}";
+  pname = "purple-vk-plugin";
+  inherit version;
 
   src = fetchhg {
     url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
index 8527593c1a20d0b26643724fe0752f0750a4ac49..df2665d8ce8f39a537fa50b3a0a323a1bc2c9c06 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.3.0";
 in
 stdenv.mkDerivation rec {
-  name = "telegram-purple-${version}";
+  pname = "telegram-purple";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/majn/telegram-purple";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 6d75ba40ce013f5ff8ca10e59383616357344369..41f205514e7632a4f6531ca5dcdb37663403efb4 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "tox-prpl-${version}";
+  pname = "tox-prpl";
   version = "0.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
index dfdc92cfd4b87ea0bafa19c465cba480ff5f97b1..8f86256069ce901ba0c59a3d7c014cc9fd3b81dd 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pidgin } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-window-merge-${version}";
+  pname = "pidgin-window-merge";
   version = "0.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 8b6863384b3f8c2af2a83eaa920ad7cba48344ee..71168e1a692c2656b93e38f6a37d33a2c34efcce 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -13,12 +13,12 @@
 # FIXME: clean the mess around choosing the SSL library (nss by default)
 
 let unwrapped = stdenv.mkDerivation rec {
-  name = "pidgin-${version}";
+  pname = "pidgin";
   majorVersion = "2";
   version = "${majorVersion}.13.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
+    url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2";
     sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index e7527bafcc65d2180524ea66c90290b84ec68b88..1ddc603dc62ee34086bf791c978b8e818598708e 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -5,7 +5,7 @@ let
   gui = true; # Might be implemented with nixpkgs config.
 in
 buildGoPackage rec {
-  name = "pond-${version}";
+  pname = "pond";
   version = "20150830-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
 
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 79a197d1a7ac0fa047ce7c6b6d56c7f8deb43f31..bd88962c40dfc8f40d8fafc1d667803e4c7fc323 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -21,7 +21,7 @@ assert omemoSupport        -> libsignal-protocol-c != null && libgcrypt != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "profanity-${version}";
+  pname = "profanity";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index e1a2fb40c5aefca99c7e3eb229c63cfdee46d0fa..b77407bd0c833b8f4dcdf8cd7801fb1ff8bff4b1 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "psi-plus-${version}";
+  pname = "psi-plus";
   version = "1.4.504";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 4ab3c64d16d8aadaddae99039f67ecdc7079b99c..6a43344fbd3ccf0a7c849f059500700421f3c5b9 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -11,7 +11,8 @@ let
   rev = "v${version}";
 
 in mkDerivation rec {
-  name = "qtox-${version}";
+  pname = "qtox";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "qTox";
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 60a4dd39fb0e6dc5aa4a596aa8d6da3eca2a958b..a23dbda6cb2a367f734cf6c7e9547bcf80e8d8be 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -2,7 +2,7 @@
 , auth0ClientID, auth0Domain }:
 
 stdenv.mkDerivation rec {
-  name = "rambox-bare-${version}";
+  pname = "rambox-bare";
   version = "0.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index efecebe169e9f16e0e76c6da832273ecda7ec426..97c722f093545ae5c39f29553a4f1e8b32ded956 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -17,7 +17,7 @@ in
 stdenv.mkDerivation rec {
   inherit version;
 
-  name = "sencha-bare-${version}";
+  pname = "sencha-bare";
   src = srcs.${stdenv.hostPlatform.system};
 
   nativeBuildInputs = [ gzip which unzip ];
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index a6aef5e6a2fb21866923d9439346dae7cbed957a..96ce9c32a7d670ac54cd9274c1f628254e5ed5e4 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ricochet-${version}";
+  pname = "ricochet";
   version = "1.1.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 168719bf0e4c0db889d0dd14a0e90b36586bd260..8dc053631e92396675cde544e7d4f5e3cd4745eb 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -79,7 +79,7 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  name = "ring-daemon-${version}";
+  pname = "ring-daemon";
   version = "2017-07-11";
 
   inherit src;
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index 0546d2dae4727d0e66f81ac85e8a91c350819b30..d1f1c033361631a1b837f16504c2222dfd71f083 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "restbed-${version}";
+  pname = "restbed";
   version = "2016-09-15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 383952f2a8937fc737862268db94bc6f2b7b06d9..2755d181da2b5bafae52a41163ca1e107d7a26d1 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -4,7 +4,7 @@
 # Versions of `riot-web` and `riot-desktop` should be kept in sync.
 
 stdenv.mkDerivation rec {
-  name= "riot-web-${version}";
+  pname = "riot-web";
   version = "1.3.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 3336c05aae74260fafe849c5c0ee89d71070002a..010ea1bff7c390d7034b8b4106ee71eccd4de149 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
-  name = "signal-cli-${version}";
+  pname = "signal-cli";
   version = "0.6.2";
 
   # Building from source would be preferred, but is much more involved.
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 0b4c3aade87dc68ef7cab258f55e62cfbcf911f3..c97a908d33d9b50cab4b59e74dded305e147bbb8 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -56,7 +56,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "signal-desktop-${version}";
+  pname = "signal-desktop";
   version = "1.26.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix
index cf6031aa05b564402ab2ed47e65bfdbc75d0ae40..cdc176be65b0408dd7e4a0c14ac979355b5313af 100644
--- a/pkgs/applications/networking/instant-messengers/sky/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sky/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version_major = "2.1.7369";
   version_minor = "1";
   version = version_major + "." + version_minor;
-  name = "sky-${version}";
+  pname = "sky";
   unpackCmd = "ar x $curSrc; tar -xf data.tar.xz";
   src = fetchurl {
     url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 96eef843d5b94cc13ac580a15a018b36b85441a2..cbab67e5e1a5bf6a389949e2fa74bece81c243d7 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -66,7 +66,8 @@ let
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "skypeforlinux-${version}";
+  pname = "skypeforlinux";
+  inherit version;
 
   system = "x86_64-linux";
 
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 79464f54232c3433c67b30c4995543dc9852fc01..6271e338a96419d4c8e44468adf26fc77291e6c6 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   # https://github.com/erroneousboat/slack-term
-  name = "slack-term-${version}";
+  pname = "slack-term";
   version = "0.4.1";
 
   goPackagePath = "github.com/erroneousboat/slack-term";
diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
index c24e2c4301e0df6699adef8fca781de677d95b9c..58cc7a220b928ae376879ef6c77818a9464968ed 100644
--- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   rev = "e2a6a9cd9da70175881ab991220c86aa87179509";
   version = "2019-07-26";
-  name = "slack-theme-black-${version}";
+  pname = "slack-theme-black";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/laCour/slack-night-mode";
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 27b8aaf887a3ddf47f5b1671a766bf45e1bc1e1d..d3aa302d601adab267c37004dffbe6775893b983 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -57,7 +57,8 @@ let
       throw "Slack is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "slack-${version}";
+  pname = "slack";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 17a38479f82e67e9cb0e9b58c5c35cc9fc6eb9ba..7a9ab4d127c4d17dcaa8b8338516acd9f79d1ad2 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -34,7 +34,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.17.82";
-  name = "stride-${version}";
+  pname = "stride";
 
   src = fetchurl {
     url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index 51e7f081d1e06c4e8b31a444ab69aa2e2d2db45e..db1d0a54dce0927f44a98e82e4bae5d21b61efb0 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swift-im-${version}";
+  pname = "swift-im";
   version = "4.0.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 21b9510a60571cef8b2086b002aea41246031cee..3c532fa506a54b64fe2b03beb7c2a571ca4cd29d 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -29,7 +29,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "teamspeak-client-${version}";
+  pname = "teamspeak-client";
 
   version = "3.3.0";
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 4607961cdf08bb8f65865bb79b34baaa85d3edce..3368ec1124ebfc61e653e3f11ed968fa1e7a557a 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "telepathy-idle";
   version = "0.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index c6b930fc590fe6409dd59ec051c6fc2df3c2f010..11845ecfb26cb57a814c1a556a9ced46322f1670 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -4,7 +4,7 @@
 # should use that
 
 stdenv.mkDerivation rec {
-  name = "tensor-git-${version}";
+  pname = "tensor-git";
   version = "2017-02-21";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 06bcd7a0400ecb4eea44c86aeeb45b561964602a..edfec97edf8aede64d740213201aa9e2e33f1beb 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
 stdenv.mkDerivation rec {
 
-  name = "torchat-${version}";
+  pname = "torchat";
   version = "0.9.9.553";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 95879fef05adfd0aec7cdd79e7fbef8582633e07..540aa3fcea4da073dfb2ab39be857cd78e4922e4 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -3,7 +3,7 @@
 , qrencode, gdk-pixbuf, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "toxic-${version}";
+  pname = "toxic";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 349a1363259ca24b5dcbd08358c6b5912cb798f5..5ef0d9162429a1146d0e8a0d09d8492765e0e346 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,7 +3,7 @@
 , libXrender, fontconfig, libXext, libXft, libsodium, libopus }:
 
 stdenv.mkDerivation rec {
-  name = "utox-${version}";
+  pname = "utox";
 
   version = "0.17.0";
 
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 109566b5d07997a8607f855bf67f6c12bbf3e331..cd5109320c794032658e850020025d8366eac605 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -4,7 +4,7 @@
   , xz, zlib
 }:
 stdenv.mkDerivation rec {
-  name = "vacuum-im-${version}";
+  pname = "vacuum-im";
   version = "1.3.0.20160104";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index a4bf26a0b1afbd4536571c8f84595a6404fae672..b0824c780225f6510ba6046b84d1aa5c0b024235 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "viber-${version}";
+  pname = "viber";
   version = "7.0.0.1035";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index b992263e215bed52ffd4194c54bca4c72276a82f..03bf3b3bbdd243fe3976a3b8455e171d0ff0081a 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -4,7 +4,8 @@
 let
   version = "4.0.1";
 in stdenv.mkDerivation {
-  name = "vk-messenger-${version}";
+  pname = "vk-messenger";
+  inherit version;
   src = {
     i686-linux = fetchurl {
       url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 9f704e52721d6f4d60a41435d29775d607b71588..da4c5073000a3c3b4ee07b2213cf162d5e076f4c 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -22,7 +22,8 @@ let
   tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
 
 in stdenv.mkDerivation rec {
-  name = "wavebox-${version}";
+  pname = "wavebox";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
     sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23";
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index 980d21572cc06dafdd67e8b93ab17cde0a925c7f..4047eba1fbb52070a0afc7c2f0b84b64deacae9e 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "xmpp-client-${version}";
+  pname = "xmpp-client";
   version = "20160916-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e";
 
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index f6231766659447c6ce7ead8914db18c7b74c5381..b9791cbfbac172fbf26fb1e50cec26070aaf65da 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -31,7 +31,8 @@ let
   };
 
 in mkDerivation {
-  name = "zoom-us-${version}";
+  pname = "zoom-us";
+  inherit version;
 
   src = srcs.${stdenv.hostPlatform.system};
 
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 3719a69138c60c36de46ef542bfc1a37ee7d191b..3a2b32f01175e27f274a3d6fbecd921980149620 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "insync-${version}";
+  pname = "insync";
   version = "1.5.7.37371";
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
         sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n";
       }
     else
-      throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+      throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 870e40d812824a4e79f7f087ba54120321829059..426619908d65e889223fd9704a87ee0ec072a602 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }:
 
 buildGoPackage rec {
-  name = "ipfs-cluster-${version}";
+  pname = "ipfs-cluster";
   version = "0.9.0";
   rev = "v${version}";
 
@@ -9,7 +9,7 @@ buildGoPackage rec {
 
   extraSrcPaths = [
     (fetchgx {
-      inherit name src;
+      inherit  src;name = "${pname}-${version}";
       sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx";
     })
   ];
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index f070c5109376ca5d4b20437691dc2b2384533983..39631bfc5c878d5c61457b0162bb22402bb62e0d 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ipfs-migrator-${version}";
+  pname = "ipfs-migrator";
   version = "7";
 
   goPackagePath = "github.com/ipfs/fs-repo-migrations";
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
index 45835248d0d800ffe4f682afea63f16cb582eb38..9f206a8f48f3f779b74ccb302a59e37e51a548f1 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
 
 buildGoPackage rec {
-  name = "ipget-${version}";
+  pname = "ipget";
   version = "0.3.2";
   rev = "v${version}";
 
@@ -9,7 +9,7 @@ buildGoPackage rec {
 
   extraSrcPaths = [
     (fetchgx {
-      inherit name src;
+      inherit  src;name = "${pname}-${version}";
       sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8";
     })
   ];
diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix
index 746d79805f5c6ade707dc57906a9a0e308170302..cdece4eb644f060f0333af6f4b260aac9e141c03 100644
--- a/pkgs/applications/networking/iptraf-ng/default.nix
+++ b/pkgs/applications/networking/iptraf-ng/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.4";
-  name = "iptraf-ng-${version}";
+  pname = "iptraf-ng";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz";
+    url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz";
     sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r";
   };
 
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index 7c40a4e12a66ddb640d56170c7edd517ed4fa2cf..0792aefe25f5bec4b1bfb12528331ced9f3e8f8b 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "bip-${version}";
+  pname = "bip";
   version = "0.8.9";
 
   # fetch sources from debian, because the creator's website provides
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 917de745d2776584fb4dded52e84a420782133a6..8278f90d321c9602d6d32cda777c96aa419a6988 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, libcommuni, qtbase, qmake, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "communi-${version}";
+  pname = "communi";
   version = "3.5.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 0b52515228b99997aa8cf415749067ab560fb425..a90446a87fa96bed44e7b8c2abd4d67ea7cbb562 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "epic5-${version}";
+  pname = "epic5";
   version = "2.0.1";
 
   src = fetchurl {
-    url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz";
+    url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz";
     sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
   };
 
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix
index 8c5d2ffa35ea7c4f897859089a77212a81c6828c..8bdb23d50dd33757c0190992793cec049b603832 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/pkgs/applications/networking/irc/glowing-bear/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glowing-bear-${version}";
+  pname = "glowing-bear";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 815b74f85c97549012a1ff45d0d8d1bf001221bf..331be19abc4cb9c1031b42e8141f1bedbdc391d4 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -6,8 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.14.2";
   pname = "hexchat";
+  version = "2.14.2";
 
   src = fetchFromGitHub {
     owner = "hexchat";
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 0994fa049dd75bf6cb8c6331d87ef57e17000593..1751812d67e88b56d4c5826971237fa8463b0a0f 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
 
 stdenv.mkDerivation rec {
+  pname = "irssi";
   version = "1.2.2";
-  name = "irssi-${version}";
 
   src = fetchurl {
-    url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k";
   };
 
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 27297b01dce1f9097021d66719dcccc7ed4d938f..6a58241b89aa9e8c4fc5ad8db0deeaeb66afee37 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,6 +1,7 @@
 { mkDerivation
 , lib
 , fetchurl
+, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@@ -38,6 +39,14 @@ in mkDerivation rec {
     sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
   };
 
+  patches = [
+    # Delete this patch for konversation > 1.7.5
+    (fetchpatch {
+      url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53";
+      sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y";
+    })
+  ];
+
   buildInputs = [
     kbookmarks
     karchive
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index cf72bef62b1774a0435ee67fcb1c4fb44701c030..b081a6b3672d6a7f64a4b8fd8836af86bf641cc1 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sic-${version}";
+  pname = "sic";
   version = "1.2";
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 5ae96d03f7c653b7dead4f34e589d130203febf8..3f8ad762218c1f184f485fe094690cf70cbfd1c1 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -28,7 +28,7 @@ let
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
       version = "2.5";
-      name = "weechat-${version}";
+      pname = "weechat";
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index de7974d4cbe38c41a2d5a00dd07393b8d281b6bc..49616671507d3e8530279e21e016153e26516968 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "wee-slack-${version}";
+  pname = "wee-slack";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix
index add52d85d8b4b4c75bc968eba08802e006135c38..6d9acdb68e52d96e99ec8ff7b87d07116ac84cf5 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/pkgs/applications/networking/irc/wraith/default.nix
@@ -4,7 +4,7 @@ with stdenv;
 with stdenv.lib;
 
 mkDerivation rec {
-  name = "wraith-${version}";
+  pname = "wraith";
   version = "1.4.7";
   src = fetchurl {
     url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index 34f332b003cfdd0a6e50ad822d071e4d60827962..3f626a6ac483b7656c08dfe1b70c1da55b25e589 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "jmeter-${version}";
+  pname = "jmeter";
   version = "5.1.1";
   src = fetchurl {
-    url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
+    url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
     sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4";
   };
 
diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix
index 8967a5d824aa356bcac9fe8b5a60314fae0b64d0..e2a8a2d56bd140eba6e43c060a2db52e1059291e 100644
--- a/pkgs/applications/networking/jnetmap/default.nix
+++ b/pkgs/applications/networking/jnetmap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "jnetmap-${version}";
+  pname = "jnetmap";
   version = "0.5.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 14ee8095247ef982012d25f36fdc8e32753f4570..daddf6adf7e48123848b17aaab5a978e45d53d84 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "linssid-${version}";
+  pname = "linssid";
   version = "2.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 17a3b92e2f973cc9a4ea6f05930d9dbc68dd9e55..492cd640d871fee23261f030444c49214559a28e 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "alpine-${version}";
+  pname = "alpine";
   version = "2.21";
 
   src = fetchurl {
-    url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz";
+    url = "http://alpine.freeiz.com/alpine/release/src/${pname}-${version}.tar.xz";
     sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index db3cd7782e8f61d0a5041068726b425bc46c7656..15f707e06a2d8e065eab797c7f03546f61f0140b 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "balsa-${version}";
+  pname = "balsa";
   version = "2.5.7";
 
   src = fetchurl {
-    url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2";
+    url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2";
     sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index bb4c6c54f161f7a8ae166327ecb7f7d202d938f0..d7df94f7e6732b56061d3ff78314c89f9038590b 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,7 +30,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "claws-mail-${version}";
+  pname = "claws-mail";
   version = "3.17.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index e5a919af2e6ff5fade971e99ed4be6e162ee12c2..78b1aad03fbf05f49c09191be49597b761653627 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, lua, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "imapfilter-${version}";
+  pname = "imapfilter";
   version = "2.6.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 4139b650fb78053a84c35a0f38da7262fb5e51aa..189ac1e6aaede609617c487184d0e787bd7af139 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -3,7 +3,7 @@
 , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
-  name = "inboxer-${version}";
+  pname = "inboxer";
   version = "1.2.1";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index bc0918737dd5205a363791fb06df02825c652b57..0a670b2b9a6a64221b1215cc8c7c5b2beb9e1961 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -25,7 +25,8 @@ let
   luaCPath = getPath "so";
 in
 stdenv.mkDerivation {
-  name = "lumail-${version}";
+  pname = "lumail";
+  inherit version;
 
   src = fetchurl {
     url = "https://lumail.org/download/lumail-${version}.tar.gz";
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix
index 05e7848565545ec276a7471ebde19cc031683669..ffa3e92d390cec7026d15822d554811ca6955863 100644
--- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mailcheck-${version}";
+  pname = "mailcheck";
   version = "1.91.2";
 
   patches = [ ./mailcheck-Makefile.patch ];
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index d81513406624d21d82253217125d9a541013e26a..4cbaee4488b1533706f19aeef61d8f16dee473c2 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -9,7 +9,7 @@
 let
   inherit (pythonPackages) python;
 in pythonPackages.buildPythonApplication rec {
-  name = "mailnag-${version}";
+  pname = "mailnag";
   version = "1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index f00ec6e6566f7da3430d52736682b4c9b81f9988..6c3b3a69b1d6de1fa4b7aba0cafe50b64b433cb1 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "mblaze-${version}";
+  pname = "mblaze";
   version = "0.5.1";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index f259fdebf2280411b1b66bc4848e3f2a3d720a92..c694398bd7d257af0a662a9d0ebbf31a3cf0017b 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -26,11 +26,11 @@ assert gpgmeSupport -> gpgme      != null && openssl != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "mutt-${version}";
+  pname = "mutt";
   version = "1.12.1";
 
   src = fetchurl {
-    url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
+    url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
     sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index f4b0846b98f02a425c6c0b6a9c8bf45ebce06f83..615b810d00293bd4ca1aac5dc45099c63285abde 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "20180716";
-  name = "neomutt-${version}";
+  pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
index 3e235400498f3413c9f15b57ebabd0f221a6d92e..b87728dd2cd1b1e9e80afaa0d379ce2fc39dc508 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "notbit-${version}";
+  pname = "notbit";
   version = "2018-01-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 126e2854574e2839dd5fa459b5a1e5b7729de50e..67c673bc913c7187e734ae4c330d558e7f7e7b9d 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -4,7 +4,8 @@ let
   version = "9";
 in
 stdenv.mkDerivation rec {
-  name = "notmuch-addrlookup-${version}";
+  pname = "notmuch-addrlookup";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "aperezdc";
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index 90c8590d52d1093a36dc355346640f0a25ff51a7..d9eae3c9c503432f34f339de16c014ad9e079f47 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-bower-${version}";
+  pname = "notmuch-bower";
   version = "0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 9ddedac09747fdc8cc1e01dd14c0e17e690b92f7..f6e6a8d747eb0889166be50c760cc542c5984458 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -13,15 +13,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.28.4"; # not really, git
-  name = "notmuch-${version}";
+  pname = "notmuch";
 
   passthru = {
-    pythonSourceRoot = "${name}/bindings/python";
+    pythonSourceRoot = "${pname}-${version}/bindings/python";
     inherit version;
   };
 
   src = fetchurl {
-    url = "https://notmuchmail.org/releases/${name}.tar.gz";
+    url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index e25dfe834f65fa89d1d26b0adb74b5222d1fa036..a0dbf98f2763d2a164f718bbe0cc6d509d3e5810 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -3,12 +3,12 @@
 }:
 stdenv.mkDerivation rec {
   version = "5";
-  name = "muchsync-${version}";
+  pname = "muchsync";
   passthru = {
     inherit version;
   };
   src = fetchurl {
-    url = "http://www.muchsync.org/src/${name}.tar.gz";
+    url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz";
     sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index 410e5e10ceb61850ea9014e41903431b47d19395..7382b97ba8113f960975ab17cc77fdd4f8cfbe35 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, perl, perlPackages, makeWrapper, coreutils, notmuch }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-mutt-${version}";
+  pname = "notmuch-mutt";
   version = notmuch.version;
 
   outputs = [ "out" ];
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 70f74dff3097ffe42f47b5c44f6c3326a4d9e22b..986ee5fe3c9ee871513b15bca6f198b592e4fc4a 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -7,11 +7,11 @@ assert sslSupport -> openssl != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "sylpheed-${version}";
+  pname = "sylpheed";
   version = "3.7.0";
 
   src = fetchurl {
-    url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz";
+    url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz";
     sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 6921279b27f2bc8cb2da7053468fca0a025958af..da817731e07ee4371f234c2cc0e5bb9c7e17576c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -23,7 +23,7 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
-  name = "thunderbird-${version}";
+  pname = "thunderbird";
   version = "60.8.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index 2d96d03361326db579909bbd6aca9260a44cdfd7..7f7296cd70064d5c123db1aed2182b812cc3ff6b 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -8,11 +8,11 @@
 }:
 
 mkDerivation rec {
-  name = "trojita-${version}";
+  pname = "trojita";
   version = "0.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trojita/trojita/${name}.tar.xz";
+    url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz";
     sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0";
   };
 
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index 6d7a8bd6c430c240c499fa33567e31672062f8a5..776255e7a12cb0659476e37e7ceebb8ac847a6c5 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gzip }:
 
 stdenv.mkDerivation rec {
-  name = "ndppd-${version}";
+  pname = "ndppd";
   version = "0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index b89173820ee83bbc38ef90b3dd2d22d0aed4affb..b3001c960574943555a1b1f3439fc923b0dce86d 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,7 +1,7 @@
 { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "netperf-${version}";
+  pname = "netperf";
   version = "20180613";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index e88936dc072bd1dc6559b89955c8f392ff069969..34ebf4364ce7e2b41cdb27577690486306a6971f 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -10,7 +10,8 @@ assert spellChecking -> gtkspell3 != null;
 let version = "0.145"; in
 
 stdenv.mkDerivation {
-  name = "pan-${version}";
+  pname = "pan";
+  inherit version;
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 898b7706bd61916e470e6389e2b720405af51d18..002f142a53edb3b8a5aafd4dc2f1d687151263ee 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "quiterss-${version}";
+  pname = "quiterss";
   version = "0.18.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix
index 2c16fabc5c41dd68852a1b24ae7599f7f3b55300..16cc0e3d50a2e5ec822e8760d574366be3c390b9 100644
--- a/pkgs/applications/networking/nload/default.nix
+++ b/pkgs/applications/networking/nload/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
-  name = "nload-${version}";
+  pname = "nload";
 
   src = fetchurl {
-    url = "http://www.roland-riegel.de/nload/${name}.tar.gz";
+    url = "http://www.roland-riegel.de/nload/${pname}-${version}.tar.gz";
     sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61";
   };
 
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
index 8795f32e829d56ea7cd65218250c966e7b0989a0..58e1fffdbdadebd06ec7745f107db856bdb59a7c 100644
--- a/pkgs/applications/networking/nntp-proxy/default.nix
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "nntp-proxy-${version}";
+  pname = "nntp-proxy";
   version = "2014-01-06";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix
index 1e127c1b1ec2255855a8ab0354180de06d343329..dc52d767438b59fac04f6d111e14fabc83551386 100644
--- a/pkgs/applications/networking/omping/default.nix
+++ b/pkgs/applications/networking/omping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "omping-${version}";
+  pname = "omping";
   version = "0.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 962f10a99c01f17156f2acd21660af86a122169d..3f48601d96f59840cca004f334d8e6960094a78b 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "ostinato-${version}";
+  pname = "ostinato";
   version = "0.9";
 
   src = fetchFromGitHub  {
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index 9ed532acfe1a138b661d2c58b483972c94bd4da6..4dad5f4d6bdf3c3b1ebf9123831c64882737d095 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -2,7 +2,7 @@
 , autoconf, automake, mandoc }:
 
 stdenv.mkDerivation rec {
-  name = "owamp-${version}";
+  pname = "owamp";
   version = "3.5.6";
   buildInputs = [ autoconf automake mandoc ];
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 8ced53c972b5384b26ef11196b94d93127863fb1..7907365a6a39ad07b1261e691f8497d84764287a 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "owncloud-client-${version}";
+  pname = "owncloud-client";
   version = "2.5.4.11654";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index f58f7e04e00b6828e6694d1a992235cd7066551d..6e3b8a7293e094bf8445e00a4ce35d02184f95aa 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "deluge-${version}";
+  pname = "deluge";
   version = "1.3.15";
 
   src = fetchurl {
-    url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
+    url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2";
     sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
   };
 
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index db30da82bdb2fc96e47775e511036523e485308b..77aee30d38b280d598fdbdf4184624301116f4e1 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -2,7 +2,7 @@
 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "eiskaltdcpp-${version}";
+  pname = "eiskaltdcpp";
   version = "2.2.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index d674c70e4c2fe338f6fc3a7202a610f0c08ea71d..24435288488325de2722a3cb88063786409860cc 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -18,7 +18,8 @@ let
   version = "build01475";
 
   freenet-jars = stdenv.mkDerivation {
-    name = "freenet-jars-${version}";
+    pname = "freenet-jars";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "freenet";
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 1d98bf77675578e6f24d31f33980da20cfcd48d6..5488baddef4ad5d9551a35357a105b8a63710377 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "6.7.4";
-  name = "frostwire-${version}";
+  pname = "frostwire";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index c66c3ca05a4ec2998ec9944c6eb7c6cbeb90cd14..6dd2fc3435501a60b5793ec35156403a62159127 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ktorrent-${version}";
+  pname = "ktorrent";
   version = "${libktorrent.mainVersion}.0";
 
   src = fetchurl {
-    url    = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${name}.tar.xz";
+    url    = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz";
     sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw";
   };
 
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 7f229be1b543ee531d1a6931ff9fe9cf96cf1137..b28074a2fd6e01bba8f4663fb0eafebdacfa59a2 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "ncdc-${version}";
+  pname = "ncdc";
   version = "1.22.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 7ffd79edba4372a73ce8574ab7d08f08a47d6c0b..a579ae15181d14601b9ec85f4c818dc4d1d6aefb 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -9,7 +9,7 @@ assert guiSupport -> (dbus != null);
 with lib;
 
 mkDerivation rec {
-  name = "qbittorrent-${version}";
+  pname = "qbittorrent";
   version = "4.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 2d523cc07dd989dd479bffb02b34c702d3b1e2ab..f10714031ff016b038328c1c8cc1147222b1a7b9 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -3,7 +3,7 @@
 , qtmultimedia, qtx11extras, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "retroshare-${version}";
+  pname = "retroshare";
   version = "0.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 104131e477521701e97168edbfc0b51bbd70ca7c..bcfe8f01e4a4c0e81af6c69ffa2aca31066d9738 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -25,7 +25,7 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "soulseekqt-${version}";
+  pname = "soulseekqt";
   inherit version;
   src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 87b331adf2d3751746ae21a8ea5858a8ba5e1eac..850fc488bf3c6ddf5818a59e0d26e083958b2205 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
 
 stdenv.mkDerivation rec {
-  name = "tixati-${version}";
+  pname = "tixati";
   version = "2.62";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
index fc803fa2745c73b3403d3879123dbf1bb41bbdbe..e05ca43eb507761307b1bf7c0101e414ba44dccc 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "transmission-remote-cli-${version}";
+  pname = "transmission-remote-cli";
   version = "1.7.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 7d2f34c591e98b8eaac97db65a77db76942b8632..bcaea5eb6dcd3fc96129044691914e66eb223a23 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -4,7 +4,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "transmission-remote-gtk-${version}";
+  pname = "transmission-remote-gtk";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 29ec8158099cae517559aa7c42d50a6fd27e55ce..65abcf35a35267e109f4904c3f7fa3b951fe05d2 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -2,7 +2,7 @@
 , enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "tribler-${version}";
+  pname = "tribler";
   version = "7.1.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index cce44521a6208d4274171e67392308b9141a5f11..647b708e1021d783b7fc110ecb4d24f5c487cb48 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -16,7 +16,7 @@ let
   boostPython = boost.override { enablePython = true; };
 
 in stdenv.mkDerivation rec {
-  name = "twister-${version}";
+  pname = "twister";
   version = "0.9.34";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix
index 8725d5263fe304db007b062602f94f8e2f4ed29c..b1d3c73129aa7e82017f038a1c1e05ec85621f2f 100644
--- a/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/pkgs/applications/networking/p2p/vuze/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "vuze-${version}";
+  pname = "vuze";
   version = "5750";
 
   src = fetchsvn {
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 8a66c039b5a770e66e74aaf6384f203f165f1eee..c9df5d3fbe37f66bcf1ce694f62af138d5776116 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl, libsamplerate, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "pjsip-${version}";
+  pname = "pjsip";
   version = "2.9";
 
   src = fetchurl {
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
-    mkdir -p $out/share/${name}/samples
-    cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples
+    mkdir -p $out/share/${pname}-${version}/samples
+    cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
   '';
 
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index c685a2705862a61399290cb386521008e50fbb22..bf8e7a16a4f3ba6949e6c6153ee750f86acd7386 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -22,7 +22,8 @@ let
   };
 
 in mkDerivation rec {
-  name = "protonmail-bridge-${version}";
+  pname = "protonmail-bridge";
+  inherit version;
 
   src = fetchurl {
     url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index 5b292fe7bec5d76d2106e9f93c99bab6a09f53f0..be4cc5830d5438d1520f648105fcc9caba66ce47 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "unstable-2018-10-18";
-  name = "ps2client-${version}";
+  pname = "ps2client";
 
   src = fetchFromGitHub {
     owner = "ps2dev";
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 66edc2032762d05ba225403d1a8e3b30b9e7d61d..5255b492ec66239da6dd45d4ed6c26bf87b37b82 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -26,11 +26,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "anydesk-${version}";
+  pname = "anydesk";
   version = "4.0.1";
 
   src = fetchurl {
-    url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz";
+    url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index bf5f5df934d17a094c8feaa7ae88ad360702aba2..8d21f64765dc672a3b05200f87c15e3e59212a1a 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -65,7 +65,7 @@ let
 
   citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
     stdenv.mkDerivation rec {
-      name     = "citrix-receiver-${version}";
+      pname = "citrix-receiver";
       version  = "${major}.${minor}.${patch}";
       inherit homepage;
 
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 33f1f06e0b3044c73e509c0f4944907dca1322fb..4936b0ce0b503c6efd7c56e7a8a7b24bf299bba0 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -80,7 +80,7 @@ let
 
   citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }:
     stdenv.mkDerivation rec {
-      name     = "citrix-workspace-${version}";
+      pname = "citrix-workspace";
       version  = "${major}.${minor}.${patch}";
       inherit homepage;
 
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 0653686c650d3fd43fc505687da6fd863ee89a6d..5963c6b6c950d2eea028ce68064fbe671a71db29 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "freerdp-${version}";
+  pname = "freerdp";
   version = "2.0.0-rc4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index fdd367f97c03e9a4ca6d7453e14e017ff88ab1da..3b7db7075bb59fa1b4aaa27d4653225336a51a18 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   version = "0.71";
-  name = "putty-${version}";
+  pname = "putty";
 
   src = fetchurl {
     urls = [
-      "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz"
-      "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz"
+      "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
+      "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
     ];
     sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
   };
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 5f737cacb4654d9e82aba0819a699b0c5d98949b..9c9abe55daa617d6c22912b062e8d103c4a6942b 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
   version = "1.8.6";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 9227cad52496837cf7779856ca728d903850ee71..f9b17b42bdee1c030cbbb1ca3bfe3071a002760d 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "teamviewer-${version}";
+  pname = "teamviewer";
   version = "14.5.1691";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 442881398f632fec34b978e33d327c87872c3477..5d33f186df7bd10d88a2537219788ae06996e24a 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -2,7 +2,7 @@
 
 let
   xorgxrdp = stdenv.mkDerivation rec {
-    name = "xorgxrdp-${version}";
+    pname = "xorgxrdp";
     version = "0.2.9";
 
     src = fetchFromGitHub {
@@ -35,7 +35,7 @@ let
 
   xrdp = stdenv.mkDerivation rec {
     version = "0.9.9";
-    name = "xrdp-${version}";
+    pname = "xrdp";
 
     src = fetchFromGitHub {
       owner = "volth";
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 1844711066b00fe6a958ae98448880af7b49a485..ecce7172defa72ad5f0a8e9cdbda23e760484505 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -8,7 +8,7 @@ let
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 
 in stdenv.mkDerivation rec {
-  name = "resilio-sync-${version}";
+  pname = "resilio-sync";
   version = "2.6.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index e93410d2669c539d05d6bfbd386740f43bb60d07..16430d31e8355c2403444d3405071444f5150b45 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 
 mkDerivation rec {
   version = "6.2.11";
-  name = "seafile-client-${version}";
+  pname = "seafile-client";
 
   src = fetchFromGitHub {
     owner = "haiwen";
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix
index 69ae40b7618071fd5adf61b878a20abf6757c7a4..dc578dccd19dea1bdb83139579b75826c8d0c1a8 100644
--- a/pkgs/applications/networking/sieve-connect/default.nix
+++ b/pkgs/applications/networking/sieve-connect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "sieve-connect-${version}";
+  pname = "sieve-connect";
   version = "0.90";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index 10c8c4235e54facaab1d4e2a07d87c720148b774..dbff491fa8078cc313818e335afb37ee84ee5510 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ettercap-${version}";
+  pname = "ettercap";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 0c793c41c55a2177142e916ead743bc29ed48d2d..0005a5d230d7c2beffc2d41a0d6df80c22888fdb 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }:
 
 stdenv.mkDerivation rec {
-  name = "kismet-${version}";
+  pname = "kismet";
   version = "2016-07-R1";
 
   src = fetchurl {
-    url = "https://www.kismetwireless.net/code/${name}.tar.xz";
+    url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
     sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx";
   };
 
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix
index 10bb465b8a1b8551b5bc358a4c524d1bcf84bae4..301802d322bd93fc4c887eada42892af0c0d952a 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
 
 stdenv.mkDerivation rec {
-  name = "sniproxy-${version}";
+  pname = "sniproxy";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix
index 1034acf0b90fe57075005092b2eb745ab17b2fe4..9de525d93245e29cbd521f68d9f91f4a6c0d1105 100644
--- a/pkgs/applications/networking/soapui/default.nix
+++ b/pkgs/applications/networking/soapui/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, writeText, jdk, maven, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "soapui-${version}";
+  pname = "soapui";
   version = "5.5.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index d96a810ee05a3c9a2423a3b19a1e1ecf0893e501..11c8af368b95323b45dc833c196f76fc1c34430e 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -14,7 +14,8 @@ let
   version = "7.5.0";
 
 in stdenv.mkDerivation {
-  name = "spideroak-${version}";
+  pname = "spideroak";
+  inherit version;
 
   src = fetchurl {
     name = "SpiderOakONE-${version}-slack_tar_x64.tgz";
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index 706dd6703248f7556123fd63a832fad9b24c83e6..c70723284fd8e8a02811ba189605fbe33329094a 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   version = "2.12.0";
 
-  name = "patchwork-classic-${version}";
+  pname = "patchwork-classic";
 
   src = fetchurl {
     url    = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb";
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 3f87c8558e1f78b312c2c610449ac6ec41b45346..c5ff090a80768087959ca886dae4b21839823342 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -53,7 +53,8 @@ let
       throw "super-productivity is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "super-productivity-${version}";
+  pname = "super-productivity";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
index e4ba29d3a9f8897b810b64ac16cb90f0c8a8d313..669ab4d1e3e52dfddc52310fa62ea4424ec95fbb 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -3,7 +3,6 @@
 , fusepy, sqlalchemy }:
 
 buildPythonApplication rec {
-  name = pname + "-" + version;
   pname = "acd_cli";
   version = "0.3.2";
 
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index fae838a7d5f837a0f8a385720a176cf97973d6b0..36c4dd46222ebbf0a36442624a5cf0ea89c9ff80 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -5,7 +5,7 @@ let
 in stdenv.mkDerivation rec {
   version = "1.1.24";
 
-  name = "backintime-common-${version}";
+  pname = "backintime-common";
 
   src = fetchFromGitHub {
     owner = "bit-team";
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index 26288f9f6e65033a9bbc417e26b1d253130b0d3d..fb47d9bc5101fe3df9c98096d680a39a14f2d59a 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (backintime-common) version src installFlags;
 
-  name = "backintime-qt4-${version}";
+  pname = "backintime-qt4";
 
   buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ];
 
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 8d9b941e26e449efd73c2bbb846923da29b33fd0..1eb5e44ba24f7578c8520a0d732f47929d5f2d33 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "casync-${version}";
+  pname = "casync";
   version = "2-152-ge4a3c5e";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix
index 6dcd451533aecd633e42197f46c0dd64a403876a..d38f8b53dbbf181af515a25e1420b43003ddbaa8 100644
--- a/pkgs/applications/networking/sync/desync/default.nix
+++ b/pkgs/applications/networking/sync/desync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "desync-${version}";
+  pname = "desync";
   version = "0.4.0";
   rev = "v${version}";
 
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index b0315ee3477d32e4da36d2be953eb1fc434d3f66..832f7c63f275bf43c58230864c654069b2b6699c 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -2,7 +2,7 @@
   asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "lsyncd-${version}";
+  pname = "lsyncd";
   version = "2.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 4325c8ea88aebe18f074f04506a28386a8db553e..00edcd411fd5b01fd952d32f0b9edb92f82d378c 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "rclone-browser-${version}";
+  pname = "rclone-browser";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index ad5a35eb251f76e62a05941da49feb34f9e87f6a..bc93b743f8b19652f07ab2fde1a4f9869a085483 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "unison-${version}";
+  pname = "unison";
   version = "2.51.2";
   src = fetchFromGitHub {
     owner = "bcpierce00";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 763c740c8175db8c7cc6e12c3f5a964ecb01160f..3e5d3187e9b2cc8458cf9ccda32bea1399ab8ec1 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }:
 
 buildPythonApplication rec {
-  name = "syncplay-${version}";
+  pname = "syncplay";
   version = "1.6.4";
 
   format = "other";
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 328561529ce5a8efeba1ed500e85e0ee98a46cc5..9317ccab4eab818f4ec4f141092b88bbb672d6f9 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -6,7 +6,7 @@
 
 buildPythonApplication rec {
   version = "0.9.4";
-  name = "syncthing-gtk-${version}";
+  pname = "syncthing-gtk";
 
   src = fetchFromGitHub {
     owner = "syncthing";
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix
index 8a056e21692be0c8b8d531d599e88100ce6b0d81..a71425422383cdefeac4c1eec31609e0d0541b79 100644
--- a/pkgs/applications/networking/tcpkali/default.nix
+++ b/pkgs/applications/networking/tcpkali/default.nix
@@ -3,7 +3,8 @@
 let version = "1.1.1"; in
 
 stdenv.mkDerivation rec {
-  name = "tcpkali-${version}";
+  pname = "tcpkali";
+  inherit version;
   src = fetchFromGitHub {
     owner = "machinezone";
     repo = "tcpkali";
diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix
index 050c8502e077c3045e0017bf1ea1bb1b67b619e0..6f5a3f3ec16fc9062ba417cf5b3331205ba7e634 100644
--- a/pkgs/applications/networking/tsung/default.nix
+++ b/pkgs/applications/networking/tsung/default.nix
@@ -5,7 +5,7 @@
   gnuplot }:
 
 stdenv.mkDerivation rec {
-  name = "tsung-${version}";
+  pname = "tsung";
   version = "1.7.0";
   src = fetchurl {
     url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index a1fe790b1190379d1130f2bef7144fb76fb9adc2..1a19c8c96b330698d0086e02c2500f346c1f6205 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }:
 
 stdenv.mkDerivation rec {
-  name = "umurmur-${version}";
+  pname = "umurmur";
   version = "0.2.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 08fa53a6e3885e4f5b9648bebf1793f67d1f3d4b..238864311ef079c1bf3c866f5c599d9dd176598d 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -12,11 +12,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "znc-${version}";
+  pname = "znc";
   version = "1.7.4";
 
   src = fetchurl {
-    url = "https://znc.in/releases/archive/${name}.tar.gz";
+    url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz";
     sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
   };
 
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 6808a81bec1d50380c76fc0eccfc878956abb744..a2b14443c1a93b388b2946f07aabd3f83bbf3268 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "abiword-${version}";
+  pname = "abiword";
   version = "3.0.2";
 
   src = fetchurl {
-    url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
+    url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
     sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
   };
 
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 91b12d8a33c3dc27ae9686220a7897c1e5e16f52..6ef6e51527e254fd48296b0de0281a7c1993a077 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-cli-${version}";
+  pname = "atlassian-cli";
   version = "8.5.0";
   
   src = fetchzip {
-    url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
+    url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
     sha256  = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz";
     extraPostFetch = "chmod go-w $out";
   };
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 4a050eb5d7491db2efd51f5b61b4adafeb95f920..4855fbc63c3e4527db695c069390bda1a1fdc061 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -16,10 +16,9 @@
 mkDerivation rec {
   pname = "calligra";
   version = "3.1.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
     sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
   };
 
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index 461d428787b9e47ace1e1ac05bbe76918842aecc..0043648146f53f8bdf4bf91634cc949f18e5cc53 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "cb2bib";
   version = "2.0.0";
   src = fetchurl {
-    url = "https://www.molspaces.com/dl/progs/${name}.tar.gz";
+    url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz";
     sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
   };
   buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e4a89b513e9c473569301fbb5930f73eb9e34ab4..d3ab02fabd3f87069fbfac245becc2e8b09b551c 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -24,11 +24,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnucash-${version}";
+  pname = "gnucash";
   version = "3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
+    url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
     sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
   };
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     rm $out/bin/gnucash-valgrind
 
     wrapProgram "$out/bin/gnucash" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \
       --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
       --prefix PERL5LIB ":" "$PERL5LIB" \
       --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 338cdc170656bf40ed55e97f51675bcf04e5d8f2..752ad70cd094caf39262171931390a3e95c620b2 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -2,11 +2,11 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "grisbi-${version}";
+  pname = "grisbi";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
+    url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
     sha1 = "1159c5491967fa7afd251783013579ffb45b891b";
   };
 
diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix
index b39617e02db2e7c1da6fb30ed27957478b5a459a..372414c1a76d8224a4e6c169c5068fc0e555808f 100644
--- a/pkgs/applications/office/ib/controller/default.nix
+++ b/pkgs/applications/office/ib/controller/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.14.0";
-  name = "ib-controller-${version}";
+  pname = "ib-controller";
 
   src = fetchurl {
     url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz";
diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix
index 59ecb5a5c3b762c2d828d056d644fd6dee29fe3b..a88f1af02c655af84334764509b11c5d5f79202d 100644
--- a/pkgs/applications/office/ib/tws/default.nix
+++ b/pkgs/applications/office/ib/tws/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "9542";
-  name = "ib-tws-${version}";
+  pname = "ib-tws";
 
   src = requireFile rec {
     name = "ibtws_${version}.jar";
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 8946bbab93164d83be2e2f4323b0995191bf5af4..5065a1cb9bc94d11f7a3eff99f31aad1efffd12a 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation {
     # This project was formerly known as KeyJNote.
     # See http://keyj.emphy.de/apple-lawsuit/ for details.
 
-    name = "impressive-${version}";
+    pname = "impressive";
+    inherit version;
 
     src = fetchurl {
       url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index ebd5a14ad047b94cfd20995da35bed3e24d35c6a..b249186c2f1745e909e022f2a15b981429df4dfe 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.8.1";
-  name = "jabref-${version}";
+  pname = "jabref";
 
   src = fetchurl {
     url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index e28a2d0852b674a927a2d7f6e77e947d8ab0e621..adad5c8680fceee5dc2651e840e44941e7fad5f3 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -10,10 +10,9 @@
 mkDerivation rec {
   pname = "kexi";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs";
   };
 
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 363c484fa28d0c1d17e7a299c3034153d6322f73..0cb23abea66ae6a07ad0058545fc52ac6bc16610 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-${version}";
+  pname = "kmymoney";
   version = "5.0.5";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
   };
 
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 276134efd73d2f8f6e356097e0772818c3b3c05e..99e09a8f36f2fb299d0486250f35d95f50b1eef0 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -2,7 +2,7 @@
 , texinfo, gnused, usePython ? true }:
 
 stdenv.mkDerivation rec {
-  name = "ledger-${version}";
+  pname = "ledger";
   version = "3.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fe33d72a2167f5ed02326e48e6dabac6c257b81f..b5cfefd782097a31b3aac463159fb4cf30bdcf93 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -60,7 +60,8 @@ let
 
   };
 in stdenv.mkDerivation rec {
-  name = "libreoffice-${version}";
+  pname = "libreoffice";
+  inherit version;
 
   inherit (primary-src) src;
 
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 969325b00006e144556a5bdfae073c15194155f9..9f04cd83c10de03d680b9a87c2c8c640ca5e6746 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -60,7 +60,8 @@ let
 
   };
 in stdenv.mkDerivation rec {
-  name = "libreoffice-${version}";
+  pname = "libreoffice";
+  inherit version;
 
   inherit (primary-src) src;
 
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index cdda46d4837f167d9af37b7b4131eabc6c909a30..7c054ba52047949c866f3cdd9eb79c570145f677 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "marp-${version}";
+  pname = "marp";
   version = "0.0.14";
 
   src = fetchurl {
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 3c4434f0098c7be593f33a8544f2447a50ba798e..655a10d3a942624156e30fc204d692046e47e2c6 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -91,7 +91,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mendeley-${version}";
+  pname = "mendeley";
+  inherit version;
 
   src = fetchurl {
     url = url;
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 3ddca8fe76208fa07ce7bfa4a757a79aa818a6dd..99824cd19ec04f6f033f4e7e60446e6b22588827 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -5,7 +5,8 @@ let
   version = "1.3.3";
 in
   stdenv.mkDerivation {
-    name = "money-manager-ex-${version}";
+    pname = "money-manager-ex";
+    inherit version;
 
     src = fetchgit {
       url = "https://github.com/moneymanagerex/moneymanagerex.git";
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 3e666b0f627289b7907c9935524b1512986a1de7..6b4a3869af9fe31a019f4abacd401bd80114ab2b 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -19,7 +19,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "moneyplex-${version}";
+  pname = "moneyplex";
   version = "16.0.22424";
 
   src = fetchurl (if stdenv.hostPlatform.system == "i686-linux" then src_i686
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index afe8ba2f9178b1ba0f3430fb2bc09f654b7040ad..dd7f0ace26c95bbfc2730113a075e119125796e1 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.44.55";
 in mkDerivation rec {
-  name = "mytetra-${version}";
+  pname = "mytetra";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
     sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l";
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 20f8b428f0db465134ef97d23c4c78230a04f412..b1311428c61d0bb38e5d21b006ca267180c8852f 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -2,11 +2,11 @@
 , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "osmo-${version}";
+  pname = "osmo";
   version = "0.4.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
+    url = "mirror://sourceforge/osmo-pim/${pname}-${version}.tar.gz";
     sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v";
   };
 
diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix
index f1dd10e9420f083340910785ee762e0c7b4765fd..af2fd82ddb03a0c52368dcc312f82ed8610bfd7a 100644
--- a/pkgs/applications/office/paperless/default.nix
+++ b/pkgs/applications/office/paperless/default.nix
@@ -33,7 +33,7 @@
 
 let
   paperless = stdenv.mkDerivation rec {
-    name = "paperless-${version}";
+    pname = "paperless";
     version = "2.7.0";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 7e6da96db80808dea4feac295c1acdae995e284d..14756c3557f4d91bca4e27554f62f602948f7e6f 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -2,10 +2,10 @@
 , gdk-pixbuf, cairo, clutter-gtk }:
 
 stdenv.mkDerivation rec {
-  name = "pinpoint-${version}";
+  pname = "pinpoint";
   version = "0.1.8";
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz";
     sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index d8765d2fa61ac04630bf93aa566ba61e536bf2bb..41cc3d94016468094b6c771204ef84f2eb4f059a 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -13,7 +13,8 @@
 let version = "unstable-2019-02-13";
 
 in stdenv.mkDerivation {
-  name = "planner-${version}";
+  pname = "planner";
+  inherit version;
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index ecd38627ac5fff5b697a417d9b238c1aff89fcc4..42fddb972c9f9871579ab9d2c63996e4a6cbfa03 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -6,11 +6,11 @@
 }:
 
 mkDerivation rec {
-  name = "skrooge-${version}";
+  pname = "skrooge";
   version = "2.20.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
+    url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
     sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w";
   };
 
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index 77a602954438af67943952ec17d71f9d4e67b607..edb2c778a0a55f4329ada3e4dcec25ba74748a66 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -2,7 +2,8 @@
 let
   version = "2.11.0";
 in stdenv.mkDerivation {
-  name = "todo.txt-cli-${version}";
+  pname = "todo.txt-cli";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index a69fb7a1c6c73ec4b984c99ef62c9b0cc0920fd7..450ee34262b9b8bc0e97bd6cd80d090f8516d430 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -6,7 +6,6 @@ in
 buildPythonApplication rec {
   pname = "todoman";
   version = "3.5.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 951b61e43ef4b84be437fd43b38dc89b8c01123b..000fa7ff1015004bfc504bf351df07c903df950d 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, wxGTK, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name    = "treesheets-${version}";
+  pname = "treesheets";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index c1e2fdcc7dfa888b353c155d56f273574ac7345a..877dfba88c06f2b14e4ae9174183ddcf8e48db99 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -12,7 +12,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "trilium-${version}";
+  pname = "trilium";
   version = "0.33.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index 89a3d1287964de4a3717fb19629e005fc0a565cd..a4734f4546055155006c0375eda08f937ad0391a 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 stdenv.mkDerivation rec {
 
-  name = "tudu-${version}";
+  pname = "tudu";
   version = "0.10.3";
 
   src = fetchurl {
-    url = "https://code.meskio.net/tudu/${name}.tar.gz";
+    url = "https://code.meskio.net/tudu/${pname}-${version}.tar.gz";
     sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y";
   };
 
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 4271e3d17aa2e49f617db6afc2f86512d94e8bff..3e4ca0ae975f79f66ca4b26944ee788c95920d18 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -2,7 +2,7 @@
 , lua52Packages, libXft, ncurses, ninja, readline, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "wordgrinder-${version}";
+  pname = "wordgrinder";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index 4c83d67f7cda77e5361b4c2eda313e119e38bd1e..1f21ec60ae2beb7b5cc40d18c511a9ebd2b7ead2 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -8,10 +8,11 @@ let
 
   version = "10.1.0.5672";
 in stdenv.mkDerivation rec{
-  name = "wpsoffice-${version}";
+  pname = "wpsoffice";
+  inherit version;
 
   src = fetchurl {
-    name = "${name}.tar.xz";
+    name = "${pname}-${version}.tar.xz";
     url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz";
     sha256 = if bits == "x86_64" then
       "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index f8785616c5e662b2ac37e9af5b3ad267023427e9..6f4f9c43b0ffbb6efcda4f07fcd4f12b84062dc1 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -10,7 +10,6 @@
 mkDerivation rec {
   pname = "zanshin";
   version = "2017-11-25";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "KDE";
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index f4c5e604ec49007db80b2ae58cdecfad24a144b6..5221add8ff684bb0f5209d57d88e0974fe5eef24 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -33,7 +33,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "zotero-${version}";
+  pname = "zotero";
   version = "5.0.73";
 
   src = fetchurl {
diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix
index 2042f1047b22f3f0cbe6ad7ef684798e201e99eb..0a313c35a1826d6bdcf507ea022c0eae5e7e7e6c 100644
--- a/pkgs/applications/radio/airspy/default.nix
+++ b/pkgs/applications/radio/airspy/default.nix
@@ -6,7 +6,8 @@ let
   version = "1.0.9";
 in
   stdenv.mkDerivation {
-    name = "airspy-${version}";
+    pname = "airspy";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "airspy";
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index 07bf0a542fa37b328c741a3369f2fbe5031128b3..14badd6c55c5742ea9d086ff62f79a51769f86f8 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -2,7 +2,7 @@
   pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }:
 
 stdenv.mkDerivation rec {
-  name = "cubicsdr-${version}";
+  pname = "cubicsdr";
   version = "0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix
index 7125e37f7f950e2a625146e2a308f73a97ae02c2..f718854224ced0e28517ab55eb32dacf01663432 100644
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/pkgs/applications/radio/dmrconfig/default.nix
@@ -2,7 +2,7 @@
 , libusb1, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "dmrconfig-${version}";
+  pname = "dmrconfig";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix
index 713755d8a654e0aa504e61be865e009e40fe5150..49149a2d82a6b3b066b44f984950ee6872d1b1d8 100644
--- a/pkgs/applications/radio/fllog/default.nix
+++ b/pkgs/applications/radio/fllog/default.nix
@@ -8,10 +8,9 @@
 stdenv.mkDerivation rec {
   version = "1.2.6";
   pname = "fllog";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
     sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg";
   };
 
diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix
index b96f3c2b3278295b8912e43d4796598b1919bcd0..6bdab0a925d30e01cd1a77fd8552c0e1e1813bea 100644
--- a/pkgs/applications/radio/flwrap/default.nix
+++ b/pkgs/applications/radio/flwrap/default.nix
@@ -8,10 +8,9 @@
 stdenv.mkDerivation rec {
   version = "1.3.5";
   pname = "flwrap";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
     sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg";
   };
 
diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix
index 747015d80eebb821d4233c2a86c4118f92af825e..ba37b7ecad2250548b710c22c416cea490eec552 100644
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/pkgs/applications/radio/gnss-sdr/default.nix
@@ -19,7 +19,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnss-sdr-${version}";
+  pname = "gnss-sdr";
   version = "0.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix
index 7c6db61b52918c7353a28b62a95fde4a23a36366..6b23858aee48ec9745626d42e9e6c0301345cd4d 100644
--- a/pkgs/applications/radio/gnuradio/ais.nix
+++ b/pkgs/applications/radio/gnuradio/ais.nix
@@ -6,7 +6,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-ais-${version}";
+  pname = "gr-ais";
   version = "2015-12-20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index f9a50313c472a0be3397db81df1d8e9f46ef45d3..016540c1e67a787856a24c975df8aa19ce4f31be 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -25,7 +25,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnuradio-${version}";
+  pname = "gnuradio";
   version = "3.7.13.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix
index 119b7f7600f9a2e699c1bf5dde22c3754a2073fa..80583c0ff3bb0a993ee840bbd0835a6c40ebf161 100644
--- a/pkgs/applications/radio/gnuradio/gsm.nix
+++ b/pkgs/applications/radio/gnuradio/gsm.nix
@@ -6,7 +6,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-gsm-${version}";
+  pname = "gr-gsm";
   version = "2016-08-25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix
index af3cabac9ef72e61d28e2b27f37f6ceae635f0ca..d56994e46ff5e866c6905888b556b2eb6510e8c8 100644
--- a/pkgs/applications/radio/gnuradio/limesdr.nix
+++ b/pkgs/applications/radio/gnuradio/limesdr.nix
@@ -8,7 +8,8 @@ let
   version = "2.0.0";
 
 in stdenv.mkDerivation rec {
-  name = "gr-limesdr-${version}";
+  pname = "gr-limesdr";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "myriadrf";
diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix
index c3c8721be25826bdebc0183a3d686ecad897ee39..d357db9134471fd85ea7e5700b7361d33330b076 100644
--- a/pkgs/applications/radio/gnuradio/nacl.nix
+++ b/pkgs/applications/radio/gnuradio/nacl.nix
@@ -6,7 +6,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-nacl-${version}";
+  pname = "gr-nacl";
   version = "2017-04-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix
index df2a88033c46f24bd9efde8682a1925fcad445d2..b8cc60544c99f6f531564766fd90e85dbba96574 100644
--- a/pkgs/applications/radio/gnuradio/osmosdr.nix
+++ b/pkgs/applications/radio/gnuradio/osmosdr.nix
@@ -13,7 +13,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-osmosdr-${version}";
+  pname = "gr-osmosdr";
   version = "2018-08-15";
 
   src = fetchgit {
diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix
index b56e0d226871908f27f31dbd46e3c0a5298942f0..e4a55fe50987cb8adaca859603953d3e771240ed 100644
--- a/pkgs/applications/radio/gnuradio/rds.nix
+++ b/pkgs/applications/radio/gnuradio/rds.nix
@@ -5,7 +5,7 @@
 assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
-  name = "gr-rds-${version}";
+  pname = "gr-rds";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index cd5f8b0db9e6dae1781f89209a40ba565808fada..03acf9e11350c545907545c4039df6fd1663d5f9 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -8,7 +8,7 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 mkDerivation rec {
-  name = "gqrx-${version}";
+  pname = "gqrx";
   version = "2.11.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix
index 81a66bf503c07d6839d28d728108530a08a1ee75..09b4c84c1314432a6f656c619e44d9d9d84fcf38 100644
--- a/pkgs/applications/radio/hackrf/default.nix
+++ b/pkgs/applications/radio/hackrf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }:
 
 stdenv.mkDerivation rec {
-  name = "hackrf-${version}";
+  pname = "hackrf";
   version = "2018.01.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 3ff73c4ef2ab181caa56bd7a40e3b472fcced5e4..4e69b11efbf7055da50f532fe3b211b74945b041 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -7,7 +7,8 @@ let
   version = "19.04.0";
 
 in stdenv.mkDerivation {
-  name = "limesuite-${version}";
+  pname = "limesuite";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "myriadrf";
diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix
index 8d179e8eed118d36f89fd31358ff743fddfc4a08..55cd14cf70da97d41355c5cfcf45701f51934089 100644
--- a/pkgs/applications/radio/minimodem/default.nix
+++ b/pkgs/applications/radio/minimodem/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   version = "0.24-1";
   pname = "minimodem";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "kamalmostafa";
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix
index 13755b88c6580486af5079eb162a85d4bdd6a7a9..f624359c16327a355ec390fc9e062e81a592519b 100644
--- a/pkgs/applications/radio/multimon-ng/default.nix
+++ b/pkgs/applications/radio/multimon-ng/default.nix
@@ -3,7 +3,8 @@ let
   version = "1.1.8";
 in
 stdenv.mkDerivation {
-  name = "multimon-ng-${version}";
+  pname = "multimon-ng";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "EliasOenal";
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 40a168675f67f6d7931abeccf0206a7d4cbea3f0..a1c1f625bea181d451c7741d7d85e59901e61331 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -8,7 +8,8 @@ let
   version = "0.5.0";
 
 in stdenv.mkDerivation {
-  name = "qradiolink-${version}";
+  pname = "qradiolink";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "kantooon";
diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix
index c8401cdbf49e14f4d2da2a60f6cce6ddb40f853c..db1bfbb3f89ee7eb73285a2eecefbe3255dbb40c 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/applications/radio/qsstv/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "9.2.6";
-  name = "qsstv-${version}";
+  pname = "qsstv";
 
   src = fetchurl {
     url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz";
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index a4d5b2cad1e9e750a5083e2636b31bbd1195f36e..4e9badaa6c51de6e9781c44c021f98bda2d78f01 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "rtl-sdr-${version}";
+  pname = "rtl-sdr";
   version = "0.6.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 88dc64471ec728e189942b929bb5c5cfe8e8f69c..a06ac2d7a03871f58f2dd7fd649f2a0e4ef8ae1a 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
 
   version = "18.12";
-  name = "rtl_433-${version}";
+  pname = "rtl_433";
 
   src = fetchFromGitHub {
     owner = "merbanan";
diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix
index 1d8056ca1e81a6fa6aae12da5982381d70f9d97a..eacbe66e5e5a28bebd6f2173f0b67af3f07b9b7a 100644
--- a/pkgs/applications/radio/soapyairspy/default.nix
+++ b/pkgs/applications/radio/soapyairspy/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.1.2";
 
 in stdenv.mkDerivation {
-  name = "soapyairspy-${version}";
+  pname = "soapyairspy";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix
index 5472254b19dcca36ddefea4f6f4719acbdb35f7d..0bb05a204da75300d08f91e621671e67bffa285d 100644
--- a/pkgs/applications/radio/soapybladerf/default.nix
+++ b/pkgs/applications/radio/soapybladerf/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.4.1";
 
 in stdenv.mkDerivation {
-  name = "soapybladerf-${version}";
+  pname = "soapybladerf";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix
index 2c5dd058ced35c5e77d2629c4e86b4cab3376785..5ab4c3363f48dd7ce8edb4affa071ca13dce600b 100644
--- a/pkgs/applications/radio/soapyhackrf/default.nix
+++ b/pkgs/applications/radio/soapyhackrf/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.3.3";
 
 in stdenv.mkDerivation {
-  name = "soapyhackrf-${version}";
+  pname = "soapyhackrf";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix
index a0057978ea33cd73e30e938f3f8094a7fe126cb3..2f73403a168bb039ca9514b3bce0fcbbfd5b8648 100644
--- a/pkgs/applications/radio/soapyremote/default.nix
+++ b/pkgs/applications/radio/soapyremote/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.5.1";
 
 in stdenv.mkDerivation {
-  name = "soapyremote-${version}";
+  pname = "soapyremote";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix
index d85fe347cd7460b96444b1a79e7fd1efa5a2d45b..8bf473cb36a3c3a1825dffbf40f02e8d5e856cd0 100644
--- a/pkgs/applications/radio/soapyrtlsdr/default.nix
+++ b/pkgs/applications/radio/soapyrtlsdr/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.3.0";
 
 in stdenv.mkDerivation {
-  name = "soapyrtlsdr-${version}";
+  pname = "soapyrtlsdr";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 6754e8f2a55cbc39867fa46157051218da696415..5e4a78cfbd22f7f7a75f24049155a885cb30e698 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -13,7 +13,8 @@ let
   extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
 
 in stdenv.mkDerivation {
-  name = "soapysdr-${version}";
+  pname = "soapysdr";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix
index 6ed88e0431e37eb5fee0dc65c74cfe65173e6793..9e910584158dfad448dff1c426ffaf024d89b6f4 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/pkgs/applications/radio/soapyuhd/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.3.6";
 
 in stdenv.mkDerivation {
-  name = "soapyuhd-${version}";
+  pname = "soapyuhd";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "pothosware";
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix
index fd0bd8d5d75f8cfbd728ed407abe67ac61ef7f68..b3ff0f51f1182665417fb024084fb0ad19c13597 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@@ -21,7 +21,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "uhd-${version}";
+  pname = "uhd";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "EttusResearch";
diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix
index 2aeba5fb5f4a969fe8642318c4a35cabd377bce0..fe31fd133e79842332e9b91920b689ce1bab99ff 100644
--- a/pkgs/applications/radio/unixcw/default.nix
+++ b/pkgs/applications/radio/unixcw/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}:
 stdenv.mkDerivation rec {
-  name = "unixcw-${version}";
+  pname = "unixcw";
   version = "3.5.1";
   src = fetchurl {
     url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index acf0226c0db557a2232b18651202f45ed0ca90db..c6b09595c20292bcce6a7bc1aea6f9409436836f 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -7,7 +7,8 @@ let
 
 in stdenv.mkDerivation {
 
-  name = "welle-io-${version}";
+  pname = "welle-io";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "AlbrechtL";
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index 3150d41ca9f661b098761a239668ce64c8490360..32d89866b5aef5377929d8dffe2ff579f19e0f64 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "astrolabe-generator-${version}";
+  pname = "astrolabe-generator";
   version = "3.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 9f65c63f7a6fa837bbf1b845c55d170575d5c3ea..968d8769caa3453551b3410ca29768ad3c121e4e 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -9,7 +9,7 @@ in
 stdenv.mkDerivation rec {
   srcVersion = "jul19a";
   version = "20190701_a";
-  name = "gildas-${version}";
+  pname = "gildas";
 
   src = fetchurl {
     # For each new release, the upstream developers of Gildas move the
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
index 9bacf6d90417ffec94846ba5662f56abbe9333b0..ff273ab8e95b50fe37eed49e61dc5387b0979cd3 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -6,7 +6,8 @@
 let
   version = "2.2.1";
 in stdenv.mkDerivation {
-  name = "gpredict-${version}";
+  pname = "gpredict";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2";
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix
index dc7c7c920a176c6aafd9dc0e0a37186fce006961..cfdd320d201ca4abd17601c23d54abed42f124bd 100644
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.11.1";
-  name    = "openspace-${version}";
+  pname = "openspace";
 
   src = fetchFromGitHub {
     owner  = "OpenSpace";
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e3c66199f11cc9bf770dacf9b2a9833108658d73..ecca9141d9fba328819e19637e2db751c61a7970 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "stellarium-${version}";
+  pname = "stellarium";
   version = "0.19.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index fef4ca1907fd30a1b916bfa836270e33614399b8..e9fc06079981897f8bd8804cb6e0043e3f413982 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, imake, gccmakedep, libXt, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "xearth-${version}";
+  pname = "xearth";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://xearth.org/${name}.tar.gz";
+    url = "http://xearth.org/${pname}-${version}.tar.gz";
     sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
   };
 
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 539d7c224463d9fb30b3d838e103f3914f72290e..d8ffbb74e6b02eae9944e6842f8774314ceeb952 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "bcftools";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg";
   };
 
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index 2cdd7fda38ef54778f4802e0dae9129cf52dd81b..b5bc3b622b91952421ae5dc9f8019a54be605da4 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}:
 
 stdenv.mkDerivation rec {
-  name = "bedtools-${version}";
+  pname = "bedtools";
   version = "2.28.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix
index 24a6e052df9ef388b7b2c42cf6dad94724917afe..1582910493473d2e5c8f81478d4bcdf22855cdce 100644
--- a/pkgs/applications/science/biology/bftools/default.nix
+++ b/pkgs/applications/science/biology/bftools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, fetchzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "bftools-${version}";
+  pname = "bftools";
   version = "5.9.2";
 
   src = fetchzip {
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index 21e2f56bdf97578fcbd3210fcef0f3f7b4c94c77..962428d67cf9c6c6ed5eff11c4aaa78a02d9bf04 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "bowtie2";
   version = "2.3.5.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "BenLangmead";
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix
index d1dbacf053fb69f48a3d06d04a9fe34d3e67a7d0..5e39320bf8355b131f462156cdfee3d2bc214fa2 100644
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/pkgs/applications/science/biology/bwa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name    = "bwa-${version}";
+  pname = "bwa";
   version = "0.7.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2";
+    url = "mirror://sourceforge/bio-bwa/${pname}-${version}.tar.bz2";
     sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy";
   };
 
diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix
index 3464e134ee85375e73fb35e998d7840f437b2afe..00acc25028c03b63c49062a270192a5e60713b91 100644
--- a/pkgs/applications/science/biology/clustal-omega/default.nix
+++ b/pkgs/applications/science/biology/clustal-omega/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
-  name = "clustal-omega-${version}";
+  pname = "clustal-omega";
 
   src = fetchurl {
-    url = "http://www.clustal.org/omega/${name}.tar.gz";
+    url = "http://www.clustal.org/omega/${pname}-${version}.tar.gz";
     sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6";
   };
 
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix
index 0e2b5d8b25fecc53af783e8210335e1aadf85a85..63d51de9930fe9ad71f483412fafb80fd547991b 100644
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.20190410";
-  name = "dcm2niix-${version}";
+  pname = "dcm2niix";
 
   src = fetchFromGitHub {
     owner = "rordenlab";
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index 1a15dcf6197d01c96a0ad0505370318c2fdb8147..e1e84c9423bbd861b9c7083f0cc5ae8f3e125928 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
-  name    = "freebayes-${version}";
+  pname = "freebayes";
   version = "2017-08-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
index 9d41fed069112d49b1d0df4c1fb74aa71a1b570c..824856301145b93bb27f0446c9ddfa978254d3df 100644
--- a/pkgs/applications/science/biology/hisat2/default.nix
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, which, python, perl}:
 
 stdenv.mkDerivation rec {
-  name = "hisat2-${version}";
+  pname = "hisat2";
   version = "2.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix
index e43d48db55f31fd5cba20269007a5b7a7fd12e6e..3adbaf0079ef1fa07837761b2ef5e226b814ab90 100644
--- a/pkgs/applications/science/biology/hmmer/default.nix
+++ b/pkgs/applications/science/biology/hmmer/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.1";
-  name = "hmmer-${version}";
+  pname = "hmmer";
 
   src = fetchurl {
-    url = "http://eddylab.org/software/hmmer/${name}.tar.gz";
+    url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
     sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5";
   };
 
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 95dc2b612e2239b9bf2272563815f84fd2b7af09..412b55f5916349dad0ce2dc68113b9f9cac34888 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "igv-${version}";
+  pname = "igv";
   version = "2.4.19";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix
index 0c8c7313bf2a3a95b9ed69ddb6fff32d3f015f98..1ba8cdf22ba02d3d6005adb7133cdda1b0bb94a0 100644
--- a/pkgs/applications/science/biology/itsx/default.nix
+++ b/pkgs/applications/science/biology/itsx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.1";
-  name = "itsx-${version}";
+  pname = "itsx";
 
   src = fetchurl {
     url = "http://microbiology.se/sw/ITSx_${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index d80ffea9a780b25ae4954a84670a3d944262c6b2..16639db17816359cbf3ffa321fbbdc1744667d53 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, hdf5, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "kallisto-${version}";
+  pname = "kallisto";
   version = "0.43.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix
index dbbf8d39a93c1312259e8de26d567408929c298d..d485666f393133791a71dd24c2425e54536310d6 100644
--- a/pkgs/applications/science/biology/messer-slim/default.nix
+++ b/pkgs/applications/science/biology/messer-slim/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.1"; 
-  name = "messer-slim-${version}";
+  pname = "messer-slim";
 
   src = fetchurl {
     url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 84c65feb09373171eac514de241306be3c6312bd..bff2bcf428b53b4825280f94f6ed21b9662436c4 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "minimap2";
   version = "2.17";
 
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 1bdb31616e4dd5d364a95bbfffcda5e05b5e8dac..717b8c3ab2f3fc411a3116c239185daee3b52df7 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -16,7 +16,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "mosdepth-${version}";
+  pname = "mosdepth";
   version = "0.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 875e98499f5377330646c304af09d7aa6aa70a3d..4e6d3494c7216f9221daefbaed0828cdd8764c01 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "neuron-${version}";
+  pname = "neuron";
   version = "7.5";
 
   nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix
index 9f1cb8db43d5260225282e13dd4ee9ee459008ca..6379f2c32826a93c6ac8a5f590b63a3413555ec0 100644
--- a/pkgs/applications/science/biology/niftyreg/default.nix
+++ b/pkgs/applications/science/biology/niftyreg/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname   = "niftyreg";
   version = "1.3.9";
-  name    = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/nifty_reg-${version}/nifty_reg-${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix
index e7221855503c27edc98fc02e1c07880af038435a..689d3e42c979355b7d703a2d4b909d56e717a538 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/pkgs/applications/science/biology/niftyseg/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname   = "niftyseg";
   version = "1.0";
-  name = "${pname}-${version}";
   src = fetchurl {
     url    = "https://github.com/KCL-BMEIS/NiftySeg/archive/v${version}.tar.gz";
     sha256 = "11q6yldsxp3k6gfp94c0xhcan2y3finzv8lzizmrc79yps3wjkn0";
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix
index 0a2074a06e970ede544999289ea72f0d015acb57..9d81e08d7293ace010be3f28f8c7079728116933 100644
--- a/pkgs/applications/science/biology/octopus/default.nix
+++ b/pkgs/applications/science/biology/octopus/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "octopus";
   version = "0.6.3-beta";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "luntergroup";
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 68efc2030e533398bd986a96e657d1a9c998ca60..161188f7ef169b5965f123e61d1ba903271a56d7 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.9i";
-  name = "paml-${version}";
+  pname = "paml";
   src = fetchurl {
     url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
     sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw";
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index e6a5ab741d940abbad1ef817286a0dc661d0d7fd..2a57febe8f5db1b68ab26e8cc26e2deb595176bb 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "picard-tools-${version}";
+  pname = "picard-tools";
   version = "2.20.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
index 323ca90f0a2a7b6020d7ab0c5604ce52e324b391..fc6cfbb158c3396bf739fe21a9eafab77d090907 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -3,7 +3,7 @@
 let python = python27.withPackages (ps: with ps; [ cython ]);
 
 in stdenv.mkDerivation rec {
-  name = "platypus-unstable-${version}";
+  pname = "platypus-unstable";
   version = "2018-07-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix
index 2efb59f536f66b727857170f7b3b7463d22d524a..52f8f70b7796ae4edbb2e0fe0f34d7fe0d766e7d 100644
--- a/pkgs/applications/science/biology/plink-ng/default.nix
+++ b/pkgs/applications/science/biology/plink-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, openblas, darwin}:
 
 stdenv.mkDerivation rec {
-  name = "plink-ng-${version}";
+  pname = "plink-ng";
   version = "1.90b3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index 3bb9ea06fd46f5cf2cdccd760c087622275c4399..8a19ae135e87dcbf03f10ad81b62323a5644d4ca 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -3,7 +3,6 @@
 pythonPackages.buildPythonPackage rec {
   pname = "poretools";
   version = "unstable-2016-07-10";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = pname;
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index 140f7032319406258770d87398a6f03ff991af73..d7ee54bfbcf0358990d2fddb12b913144b01e93a 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "RAxML";
   version = "8.2.12";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "stamatak";
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index c4b4bb522c40dbde5ddae99ed906ced202e412da..dd1a53472dbc9e860f4a8d0718ba0501d59d399f 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "samtools";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8";
   };
 
diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
index a811bc4412f2b8a32124d35d490989259707bf9c..72d125ef8b6f3f1f2fa7014ebf816d79701d4a65 100644
--- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
+++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "samtools";
   version = "0.1.19";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samtools/${name}.tar.bz2";
+    url = "mirror://sourceforge/samtools/${pname}-${version}.tar.bz2";
     sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4";
   };
 
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix
index 17cf903ae49c6d02d826e0371afdb966cc38f357..69dece88c2769933f9647d15e34de5764d0274d5 100644
--- a/pkgs/applications/science/biology/seaview/default.nix
+++ b/pkgs/applications/science/biology/seaview/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.7";
-  name = "seaview-${version}";
+  pname = "seaview";
 
   src = fetchurl {
     url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index dc2246903349575f3e950fbb289d14d4c1664a35..d700ee50a9c6b585d251bf57125cafb6b8c1b340 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre, unzip, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "snpeff-${version}";
+  pname = "snpeff";
   version = "4.3t";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix
index 4bbd6a3200357dcd751ca5518208460509f0c521..1961c71f43bb0ab26d677c3b346448b6ec350c37 100644
--- a/pkgs/applications/science/biology/somatic-sniper/default.nix
+++ b/pkgs/applications/science/biology/somatic-sniper/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, zlib, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "somatic-sniper-${version}";
+  pname = "somatic-sniper";
   version = "1.0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
index e7f5eab8bfaffc882c7d2cabdead795d62ccabc5..84c90d895566c556e0ed446d2004f1a0ad4cfd44 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, zlib, python2}:
 
 stdenv.mkDerivation rec {
-  name = "strelka-${version}";
+  pname = "strelka";
   version = "2.9.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix
index f685031e87e445711d89405320763bf938dbb9d9..697a444193b11dfa7299b205820ebff99b877c0a 100644
--- a/pkgs/applications/science/biology/varscan/default.nix
+++ b/pkgs/applications/science/biology/varscan/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "varscan-${version}";
+  pname = "varscan";
   version = "2.4.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix
index a6f52ae97b59252aa4f413d8ea0fefd95c21a850..f6c9ad029c1355e9907740bc3778ae2f51a85b4b 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/pkgs/applications/science/biology/vcftools/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "vcftools";
   version = "0.1.16";
 
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 92f997900d53f7650b1101d4e39ecbab1b336fde..12007c940b3dd74ed7108709a32e1f2ae709c461 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -4,7 +4,8 @@ with stdenv.lib;
 
 let version = "2.48"; in
 stdenv.mkDerivation {
-  name = "gwyddion-${version}";
+  pname = "gwyddion";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz";
     sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 948aed03fe5e7f3f29a6a767214e753d5eb96ef2..391ed54dfcb466861471f4bc5d2e4f6fa752ae1a 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -3,7 +3,6 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "marvin";
   version = "19.1.0";
 
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 46a1d96d8d0fa1c6be518380370166f1697196c7..87dae3b14d9e23b92dbafba0dc2ce395c023d69f 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.2";
-  name = "molden-${version}";
+  pname = "molden";
 
   src = fetchurl {
     url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index bc6301e1fd421eac56c477f9d25b67bca2aca6ef..487558a23c19b46e70ccfe600429447f8bd0f22c 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -11,7 +11,8 @@ let
   python = python3.withPackages (ps : with ps; [ six pyparsing ]);
 
 in stdenv.mkDerivation {
-  name = "openmolcas-${version}";
+  pname = "openmolcas";
+  inherit version;
 
   src = fetchFromGitLab {
     owner = "Molcas";
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 5e1c77e24751d449ec83f9ca8ae5b9a717e90df0..ea80e9fd5ca7f1d9a2bdda334feab9bcfa02f38e 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.4.1";
-  name = "quantum-espresso-${version}";
+  pname = "quantum-espresso";
 
   src = fetchurl {
     url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index eb17a68b8aae72276d83decd9d068470f5021bac..a27355afdc8e3d73eca3088ab05e85b99fc061af 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.1-b3";
-  name = "siesta-${version}";
+  pname = "siesta";
 
   src = fetchurl {
     url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz";
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
index 236225959f7a479a704d08ee8665a87b19712b95..8b95e73b8913b52b22e70dcf88b8eacf86842489 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.3.6";
-  name = "adms-${version}";
+  pname = "adms";
 
   src = fetchFromGitHub {
     owner = "Qucs";
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index 63bc0911d251335f2955a73660a536cd1536b265..b351c892c2cf5f8ff635b616996ddf1c540b1e86 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "alliance-${version}";
+  pname = "alliance";
   version = "5.1.1";
 
   src = fetchurl {
-    url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${name}.tar.bz2";
+    url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2";
     sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1";
   };
 
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 8f81a03044bea935b49147a892c1f4dffd12fc6d..ff41a498ae71efa12b121e73d256c57c006806a3 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
 
 stdenv.mkDerivation rec {
-  name = "caneda-${version}";
+  pname = "caneda";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 55e8a7b4ffe97feb5641827494fd3edf16140a01..d188365db1dcc7e404570db9387b07361bca78e6 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -4,7 +4,7 @@ libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
 }:
 
 stdenv.mkDerivation rec {
-  name = "dsview-${version}";
+  pname = "dsview";
 
   version = "0.99";
 
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
index c42b70c041afb9e1e55efeae2d9cfa82ecf156d3..8aa8275510c942ca75f0f57d843803e79778bddd 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
@@ -6,7 +6,7 @@ systemd, alsaLib, dsview
 stdenv.mkDerivation rec {
   inherit (dsview) version src;
 
-  name = "libsigrok4dsl-${version}";
+  pname = "libsigrok4dsl";
 
   postUnpack = ''
     export sourceRoot=$sourceRoot/libsigrok4DSL
diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
index 214f776634342c28787d745292d6c6194513cc43..12d375cf88aa31c51237530d1f78de369ff18347 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
@@ -5,7 +5,7 @@ glib, check, python3, dsview
 stdenv.mkDerivation rec {
   inherit (dsview) version src;
 
-  name = "libsigrokdecode4dsl-${version}";
+  pname = "libsigrokdecode4dsl";
 
   postUnpack = ''
     export sourceRoot=$sourceRoot/libsigrokdecode4DSL
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index ba1b9e174beaf1fc8c01da082a5c742d496d8ae8..3168fc19d055ba52d50d949d9ae7c806445d7ec5 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -12,7 +12,7 @@ let
     ];
   in
   stdenv.mkDerivation rec {
-    name = "eagle-${version}";
+    pname = "eagle";
     version = "9.4.2";
 
     src = fetchurl {
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
index 69b111562ab2b4fa7d8efb0ad186cc5a33d516b5..a9528b05a3119c915528f2545b68c0df07efc659 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle7.nix
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "eagle-${version}";
+  pname = "eagle";
   version = "7.7.0";
 
   src =
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix
index e6e7219ff871f2bf1d338d5ff710531e2f4e400b..a3b2945ac3d9b1f4a854203fb0d5394726b984ea 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/pkgs/applications/science/electronics/fped/default.nix
@@ -5,7 +5,7 @@
 
 with lib;
 stdenv.mkDerivation rec {
-  name = "fped-${version}";
+  pname = "fped";
   version = "unstable-2017-05-11";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index ab50885431027dc0f134e1bb0cf98e1e650a8b2e..127e9c05624d94b50e861583ef9805505d6a3a5c 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fritzing-${version}";
+  pname = "fritzing";
   version = "0.9.3b";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index 93fe7b6ba77ac71de7efeb2ab79b11a18d7cf558..71101d7cd74a334695572f2d267d631a93c2bf11 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }:
 
 stdenv.mkDerivation rec {
-  name = "geda-${version}";
+  pname = "geda";
   version = "1.8.2-20130925";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index c0821c8a9ab998e219c78e031f1c2b1ead619b0a..3f61a13eab8c4eb98b048a8cf76f66765e0b6e11 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gerbv-${version}";
+  pname = "gerbv";
   version = "2015-10-08";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 4830e2a032a990c0fd7e899c4cbc6997da9ea232..8dffe580cc65ca9a5c0ff3d950aec7dd14737858 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
 
 stdenv.mkDerivation rec {
-  name = "gtkwave-${version}";
+  pname = "gtkwave";
   version = "3.3.101";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
+    url    = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
     sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz";
   };
 
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 6608661364a06b4aa93317b8793cb68d93cf2e82..6f0d8e51448fdf00d5247d2a9baa4eba9320f4cf 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -26,7 +26,7 @@ let
   } // attrs);
 
 in stdenv.mkDerivation rec {
-  name = "kicad-${version}";
+  pname = "kicad";
   series = "5.0";
   version = "5.1.2";
 
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index a9a4c32a0b45e5427eb270d708714c54cabb1db3..7475170d6a72c1a0da9a3cb07e7243e4c6730062 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -11,7 +11,7 @@ assert ngspiceSupport -> libngspice != null;
 
 with lib;
 stdenv.mkDerivation rec {
-  name = "kicad-unstable-${version}";
+  pname = "kicad-unstable";
   version = "2018-06-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 277574ce2f17794512922d01d6984d8ac76c86ae..110552d1d64504f85164236cd633a808205cff34 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qttools, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "librepcb-${version}";
+  pname = "librepcb";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 194804a21a67386e5df6645e2af1e3b95a66b93b..78240a40bacab17905ba51982766520d2965c12b 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -2,7 +2,7 @@
 , readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }:
 
 stdenv.mkDerivation rec {
-  name = "ngspice-${version}";
+  pname = "ngspice";
   version = "30";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index b9bbcd695f1722cb3a81c8365848b08cb13d14d5..7514aed9f243a4d53d5a773869a2a8768c373e15 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pcb-${version}";
+  pname = "pcb";
   version = "20140316";
 
   src = fetchurl {
-    url = "http://ftp.geda-project.org/pcb/pcb-20140316/${name}.tar.gz";
+    url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz";
     sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42";
   };
 
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 1a5fbf90d10b19fe67530334276867a775857be7..1bfe6df5ff5345054801c23c4e4c3d8acbdaa110 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.0.19";
-  name = "qucs-${version}";
+  pname = "qucs";
 
   src = fetchFromGitHub {
     owner = "Qucs";
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index b531563c5c1cb6e7c16c1228d333b777797a6ed8..9a989919250556d517dc8c9d82e276708c14580d 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name    = "verilator-${version}";
+  pname = "verilator";
   version = "4.016";
 
   src = fetchurl {
-    url    = "https://www.veripool.org/ftp/${name}.tgz";
+    url    = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
     sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
   };
 
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index e233b91bbc91509aa65f0af5a9af867134492cf5..e8ae4d01a6d6a4b2db3e2d42115246161ca0cd5c 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -2,13 +2,13 @@
 , intltool, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "drgeo-${version}";
+  pname = "drgeo";
   version = "1.1.0";
 
   hardeningDisable = [ "format" ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/ofset/${name}.tar.gz";
+    url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz";
     sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
   };
   patches = [ ./struct.patch ];
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index b655cc48c731e2e93f59779269ce0914550c2249..7be0103304a4779d32a143a6f902b1c29b85c305 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.5.0"; in
 stdenv.mkDerivation {
-  name = "tetgen-${version}";
+  pname = "tetgen";
+  inherit version;
 
   src = fetchurl {
     url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index 6e7a3cfc88ac0d740cc86fa8b3e5ad2427def201..fd50fc825a06b59a204fd877a3c32752d62b43f6 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, readline, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "abc-verifier-${version}";
+  pname = "abc-verifier";
   version = "2018-07-08";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index bc23454edfc760a0fec858b6d1978b6cfab1deb6..7078fd454a0af80809715ee3798f6613403c8724 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, rsync, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "abella-${version}";
+  pname = "abella";
   version = "2.0.6";
 
   src = fetchurl {
-    url = "http://abella-prover.org/distributions/${name}.tar.gz";
+    url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz";
     sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi";
   };
 
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix
index 03524fc6b2228117df3c061c1513013bf0a047c3..10d94e2bb8c7cc1f00cad202a8474a9c2785e175 100644
--- a/pkgs/applications/science/logic/aiger/default.nix
+++ b/pkgs/applications/science/logic/aiger/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, picosat }:
 
 stdenv.mkDerivation rec {
-  name = "aiger-${version}";
+  pname = "aiger";
   version = "1.9.9";
 
   src = fetchurl {
-    url    = "http://fmv.jku.at/aiger/${name}.tar.gz";
+    url    = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz";
     sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y";
   };
 
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 234b74749977a3148e707779104612c1ff0403a9..f83480cfbafcd3a6d97bdb944f4e0d73e68f289e 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, which, dune, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "alt-ergo-${version}";
+  pname = "alt-ergo";
   version = "2.3.0";
 
   src = fetchurl {
-    url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
-    name   = "${name}.tar.gz";
+    url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz";
+    name   = "${pname}-${version}.tar.gz";
     sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz";
   };
 
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
index 6c2d2f0a062fe6b1b59c1e95e7704f130f2b98c7..668fd9fea72d6ae6d729ac74241e2e3cf4525f59 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, zlib, boost }:
 
 stdenv.mkDerivation rec {
-  name = "avy-${version}";
+  pname = "avy";
   version = "2017.10.16";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index 8e0ad22bba180f8a4c56b5f647387fc0735756be..f1f74bcb581044f09a5126499496efa319ebddff 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "boolector-${version}";
+  pname = "boolector";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix
index ed3d9e63812161c7e92b30f65373572941d8d734..9d6c866faea36963b8afd89d67e976542c2c7cdc 100644
--- a/pkgs/applications/science/logic/btor2tools/default.nix
+++ b/pkgs/applications/science/logic/btor2tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "btor2tools-${version}";
+  pname = "btor2tools";
   version = "pre55_8c150b39";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix
index ae57724e4f88d7f740e55ddac80de5bddd53f7e8..e2f48b34029218a563d205c3cef9ef195950c75d 100644
--- a/pkgs/applications/science/logic/clprover/clprover.nix
+++ b/pkgs/applications/science/logic/clprover/clprover.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "clprover-${version}";
+  pname = "clprover";
   version = "1.0.3";
 
   src = fetchzip {
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 10fe722d7e9a17eee132e720b22aa489563315b9..dfe1277d5ac9807536cafa9bf4f3a63eb0a48bd4 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -39,7 +39,8 @@ let
     substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
   '' else "";
 self = stdenv.mkDerivation {
-  name = "coq-${version}";
+  pname = "coq";
+  inherit version;
 
   passthru = {
     inherit coq-version;
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
index d76462ca93805f65fb904beb1bb8032083588dc0..bebf81b030d64102703bd7e3bce6c6c532d7ae00 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "coq2html-${version}";
+  pname = "coq2html";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/xavierleroy/coq2html";
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index c9516a135c0672491d9a2767924f4799127b87a0..b4c4cb7c047d45eec098ad2b01765f5cfac39445 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python3, xxd, boost }:
 
 stdenv.mkDerivation rec {
-  name = "cryptominisat-${version}";
+  pname = "cryptominisat";
   version = "5.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 09801f54e7eed94096af3644bc6cdaf060599fa8..6877060d36d61d0135a1b18548fb62898f1b4bc5 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "cryptoverif-${version}";
+  pname = "cryptoverif";
   version = "2.01pl1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index 91eaaeeb0e4001faceeea5a35fc013a939151a62..cd41e1ca64b9f051822c024c290fd3714968c1eb 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cubicle-${version}";
+  pname = "cubicle";
   version = "1.1.2";
   src = fetchurl {
     url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index 703ce6fd50868f733b5e989be33bdc4f2b318ea5..dfb04ad90e9293d823b9acce7bfbf330f0422134 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison, gmp, perl }:
 
 stdenv.mkDerivation rec {
-    name = "cvc3-${version}";
+    pname = "cvc3";
     version = "2.4.1";
 
     src = fetchurl {
-      url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
+      url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
       sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
     };
 
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index cddcbef7a0358c6eeffbc070c4bbfc870a5bd225..c0c7a53ebd441fdf44fafcdafe91d2d4c336ea52 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cvc4-${version}";
+  pname = "cvc4";
   version = "1.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index dab509706a82a55e03365f952e43dffb489cfd5d..1f6fced223351d24af71c91b932a4eff8456b5d7 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which }:
 
 stdenv.mkDerivation rec {
-  name = "eprover-${version}";
+  pname = "eprover";
   version = "2.3";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix
index bc8d372ce42c3401db18f80aa9e6218325d56e35..0a8fad484da73530c8e66f5bc80714ca9d29b101 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/pkgs/applications/science/logic/glucose/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib }:
 stdenv.mkDerivation rec {
-  name = "glucose-${version}";
+  pname = "glucose";
   version = "4.1";
 
   src = fetchurl {
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   makeFlags = [ "r" ];
   installPhase = ''
     install -Dm0755 glucose_release $out/bin/glucose
-    mkdir -p "$out/share/doc/${name}/"
-    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
+    mkdir -p "$out/share/doc/${pname}-${version}/"
+    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix
index 30af3216737cb7b28626cc503f8b6df6a81cfd65..816f8504a52e373fa28aba5845a37a54b6652310 100644
--- a/pkgs/applications/science/logic/glucose/syrup.nix
+++ b/pkgs/applications/science/logic/glucose/syrup.nix
@@ -1,6 +1,6 @@
 { stdenv, zlib, glucose }:
 stdenv.mkDerivation rec {
-  name = "glucose-syrup-${version}";
+  pname = "glucose-syrup";
   version = glucose.version;
 
   src = glucose.src;
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   makeFlags = [ "r" ];
   installPhase = ''
     install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
-    mkdir -p "$out/share/doc/${name}/"
-    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
+    mkdir -p "$out/share/doc/${pname}-${version}/"
+    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 46b29e3dd271a6bc09ef5958e461b1a36eeaec5f..85fe52239ad9826b0038bb429731ddd675db2441 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, eprover, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "iprover-${version}";
+  pname = "iprover";
   version = "2018_Jul_24_11h";
 
   src = fetchurl {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
     cp iproveropt "$out/bin"
 
-    mkdir -p "$out/share/${name}"
-    cp *.p "$out/share/${name}"
+    mkdir -p "$out/share/${pname}-${version}"
+    cp *.p "$out/share/${pname}-${version}"
     echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
     chmod a+x  "$out"/bin/iprover
   '';
diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
index a95d1201cbd63c0c1968305f27cd3be8f36f5a70..61ca78d85ed1bacf1e45901489efcf154d3b0f9d 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv, smlnj, which }:
 
 stdenv.mkDerivation rec {
-  name    = "jonprl-${version}";
+  pname = "jonprl";
   version = "0.1.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix
index d7f047b84e0fa2378c0a6f3abc33d4b7276146e4..4775384a3ddcfdc42d06c4b57403216c9531601c 100644
--- a/pkgs/applications/science/logic/lci/default.nix
+++ b/pkgs/applications/science/logic/lci/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, readline}: 
 stdenv.mkDerivation rec {
   version = "0.6";
-  name = "lci-${version}";
+  pname = "lci";
   src = fetchurl {
-    url = "mirror://sourceforge/lci/${name}.tar.gz";
+    url = "mirror://sourceforge/lci/${pname}-${version}.tar.gz";
     sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e";
   };
   buildInputs = [readline];
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 407244ef1830d6eb93128530e89a4f19d55be4dd..9bf54a5f094068a7dbe430fa18f40fd29f012f4b 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "lean-${version}";
+  pname = "lean";
   version = "3.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 4e1415d3961db52700a0428c1045a1f8b0f3a0b0..22177798647be95a48438ca8c42f7f5034510c12 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -2,7 +2,7 @@
 , gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "lean2-${version}";
+  pname = "lean2";
   version = "2017-07-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index be337a1c258e716e1a360b2f910536bdf18dd7eb..b50848a18205a56ada1e688f892d3fc1b0228565 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "leo2-${version}";
+  pname = "leo2";
   version = "1.6.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix
index 000587a22e67b8ddfcaea06e7f70c26263092fcb..dbd34f1da6e6db7cc92358b39d56150314af4f2b 100644
--- a/pkgs/applications/science/logic/lingeling/default.nix
+++ b/pkgs/applications/science/logic/lingeling/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lingeling-${version}";
+  pname = "lingeling";
   # This is the version used in satcomp2018, which was
   # relicensed, and also known as version 'bcj'
   version = "pre1_03b4860d";
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index db784237ea91892a6b3dc04a08bb65dfff7a9fbe..d6a1207b5d6091764f309d72ed0d74b40ef38c93 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -3,7 +3,8 @@
 let version = "2.7.1"; in
 
 stdenv.mkDerivation {
-  name = "logisim-${version}";
+  pname = "logisim";
+  inherit version;
   
   src = fetchurl {
     url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index c77e0327fb6be3a62b113fd9be8417866912d7ec..02e9844115eff7fdfd8c7766eb26ca6617334072 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ltl2ba-${version}";
+  pname = "ltl2ba";
   version = "1.2";
 
   src = fetchurl {
-    url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
+    url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz";
     sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx";
   };
 
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index dc32e84279a80829dc7efd1d1de6cb917f00bb49..93212c5b8546a0abd5f04555f675a7475a6d599f 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "201707";
   build_nr = "1";
-  name = "mcrl2-${version}";
+  pname = "mcrl2";
 
   src = fetchurl {
     url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 1601a74e1899367bc92de773ee4af95ae534c659..7e46dbeb0743107f178157d98f42e99403adb4fe 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl, mlton }:
 
 stdenv.mkDerivation rec {
-  name = "metis-prover-${version}";
+  pname = "metis-prover";
   version = "2.3.20160713";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix
index 4b2116680d50879d7ba23468376c8be704198f5a..34051a1da4044c58464b42fc04da8bf8dd5b44e3 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/pkgs/applications/science/logic/minisat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "minisat-${version}";
+  pname = "minisat";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "http://minisat.se/downloads/${name}.tar.gz";
+    url = "http://minisat.se/downloads/${pname}-${version}.tar.gz";
     sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
   };
 
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix
index f9f021b15f0702949ea10828e316470f14c91f25..9e5ebe008b8f3df66bcb3a93d23f0ad0d6736123 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/pkgs/applications/science/logic/opensmt/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensmt-${version}";
+  pname = "opensmt";
   version = "20101017";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index d21487ef92faa9c3398b850d743206238a1e657e..40c66dd699d87df41041a5512800413a49c3108a 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "ott-${version}";
+  pname = "ott";
   version = "0.28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index 638996e853b8156425ec6021fd449dbcd1af5718..547bd31e8b42974abbe1945f51fc13303ea4c47c 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "picosat-${version}";
+  pname = "picosat";
   version = "965";
 
   src = fetchurl {
-    url = "http://fmv.jku.at/picosat/${name}.tar.gz";
+    url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz";
     sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
   };
 
diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index 2f765572f9ad8e7aa11d2a032781bf9e7eb6f870..c833b22e49b665c555d787a304a0f23f5a557e0c 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, gmp, cmake, python}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libpoly";
   version = "0.1.7";
 
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index 4abfdf9162c0c54d9e05fc84e2de21afb233d213..2b368a0e673052dd8e73744a0da0dc5868f08e8d 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchzip, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "clingo";
   version = "5.3.0";
 
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 1f6620a2872d58c630c26818b71ceb44700d6ea6..d4feb5c9e28558167aaf9631e104dcf13f50a6e1 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "prooftree-${version}";
+  pname = "prooftree";
   version = "0.13";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix
index aca06ffbfb76b9d128ddbcbbc874484c5b673992..931ad2fc4f39774a8832d72d6a73701db968118e 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/pkgs/applications/science/logic/proverif/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "proverif-${version}";
+  pname = "proverif";
   version = "2.00";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index b9dd90f601f513edfa309c08673f25652ecc3967..7249eb991d387b44b9965cf6caf8853d6aabdd0f 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}:
 stdenv.mkDerivation rec {
-  name = "satallax-${version}";
+  pname = "satallax";
   version = "2.7";
 
   buildInputs = [ocaml zlib which eprover makeWrapper coq];
   src = fetchurl {
-    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
+    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
     sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
   };
 
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 32ebdad51d940fdb099284086a9324f41e30b4e9..3f8305ff4030f46343e82abca7aab05f7c1fc0c7 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -23,7 +23,7 @@ let
     };
 in
 stdenv.mkDerivation rec {
-  name    = "saw-tools-${version}";
+  pname = "saw-tools";
   version = "0.1.1-20150731";
 
   src = saw-bin;
diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix
index 2bb2b911d4912d6a494c88c73596868487a2d3e3..2645aa102d9228d3cc9c6f4e879d7ec808cfbbb5 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/pkgs/applications/science/logic/spass/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "spass-${version}";
+  pname = "spass";
   version = "${baseVersion}.${minorVersion}";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix
index 9676b991679c56a006d95bcae56b0ea71f112875..e0efb28819d27524903dfb7c7e60559e57857af3 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/pkgs/applications/science/logic/statverif/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "statverif-${version}";
+  pname = "statverif";
   version = "1.86pl4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix
index b1eb171b20b1a4dbce88cc35b4ab1528ff69b8dd..b1c72d7c5ee75b4e502c38476788ceb713e495ec 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/pkgs/applications/science/logic/tlaplus/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tlaplus-${version}";
+  pname = "tlaplus";
   version = "1.5.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 7d35f5f91df3f4421ec43286f6346672c2eac0dd..7c8389688d95d602cbb7a97a506753bb30dc3ea3 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tlaps-${version}";
+  pname = "tlaps";
   version = "1.4.3";
   src = fetchurl {
     url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix
index 7d39aae6e3ced7d8c72b0e27aad57476706094ee..91666e85d9235297ab5d4fbfa2924960d58c560b 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -21,7 +21,8 @@ let
 
 
 in stdenv.mkDerivation {
-  name = "tla-toolbox-${version}";
+  pname = "tla-toolbox";
+  inherit version;
   src = fetchzip {
     url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
     sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm";
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 7f68a8e647e941d1b731e1bdfaec5091a050dee5..4c63f8e72a36df34f522d53d0ce25470a9e803e2 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, yap, tcsh, perl, patchelf }:
 
 stdenv.mkDerivation rec {
-  name = "TPTP-${version}";
+  pname = "TPTP";
   version = "7.2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix
index 74f8875fcebebf06e67ff16163ccb8e02bcfaa39..161da6e4b2357346c3a2ea8848dd695a2916cf58 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/pkgs/applications/science/logic/twelf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, smlnj, rsync }:
 
 stdenv.mkDerivation rec {
-  name = "twelf-${version}";
+  pname = "twelf";
   version = "1.7.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 360f75cc6f07ba0ade6b96ecd0d0383c4d5e68da..3e3e26708618de30b58a5a360f7fc745335e4f00 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -19,11 +19,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name    = "verifast-${version}";
+  pname = "verifast";
   version = "18.02";
 
   src = fetchurl {
-    url    = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz";
+    url    = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz";
     sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e";
   };
 
diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index ca3673d7bf971c64bc13644f79c8492c67311e54..a04ab46c669be6a37f0f9610d2e051d1eff0676a 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, gmp, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "veriT-${version}";
+  pname = "veriT";
   version = "2016";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index bd538dc6c75711e57a2c91b5079e80e8b4e6a744..3cb14d7da21e4c72b82ca77e13888c22b2f1c3dd 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,7 +2,7 @@
 , ocamlPackages, coqPackages, rubber, hevea, emacs }:
 
 stdenv.mkDerivation rec {
-  name    = "why3-${version}";
+  pname = "why3";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 313fe5a9f1dd68c71331b6dcb50941b9cf1accd9..2f972c92b52137da54891d63ce88eb22f3eb1e21 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "workcraft-${version}";
+  pname = "workcraft";
   version = "3.1.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 40a4c391e1d587d4784d6d54a62e6ba6988a0f73..76ed934fb39e3788231210227f40e1bd97048dae 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }:
 
 stdenv.mkDerivation rec {
-  name    = "yices-${version}";
+  pname = "yices";
   version = "2.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index c0536b36cfe3a13e0d04eb63a5d7229990f496ce..7bcc915daec9add30d6ca39eb37d2415fee0f4d4 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -15,7 +15,7 @@ else assert licenseAccepted;
 let maps = callPackage ./maps.nix {};
 in stdenv.mkDerivation rec {
   version = "4.7.1";
-  name = "sc2-headless-${version}";
+  pname = "sc2-headless";
 
   src = fetchurl {
     url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip";
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 8de78092bd84fa214953a117d2f2f3a294fae43f..be15bba979ff13024b2811766452381ed0877a23 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -16,7 +16,6 @@ assert opencvSupport -> opencv != null;
 stdenv.mkDerivation rec {
   pname = "shogun";
   version = "6.0.0";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = pname + "-toolbox";
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix
index e0b0bc11f05f30f6dd5ee0b941146c3b80ff8a70..6909cfd8ef650af1b1736e831931a32375fbfe19 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/pkgs/applications/science/math/LiE/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.2";
      # The current version of LiE is 2.2.2, which is more or less unchanged
      # since about the year 2000. Minor bugfixes do get applied now and then.
-  name = "lie-${version}";
+  pname = "lie";
 
   meta = {
     description = "A Computer algebra package for Lie group computations";
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
index 61eb1fd3ce4e0dcb18ff1fcfd4290b10cba82f55..74adcab4e70598094d027b027aed122eb49c07e7 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "bcal-${version}";
+  pname = "bcal";
   version = "1.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix
index 1b7a97360079238e609afc6513b1a9b9609af3eb..37504fceb14160c2804faf18fbf088ae1157c131 100644
--- a/pkgs/applications/science/math/bliss/default.nix
+++ b/pkgs/applications/science/math/bliss/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "bliss-${version}";
+  pname = "bliss";
   version = "0.73";
 
   src = fetchurl {
-    url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip";
+    url = "http://www.tcs.hut.fi/Software/bliss/${pname}-${version}.zip";
     sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84";
   };
 
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index e8171bcb256a637bfa81a47fccd1a9ba6e4b3552..5068abbf30767e6cb298edf273485668598f68fd 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -36,7 +36,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caffe-${version}";
+  pname = "caffe";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 348c1e75086751e76c5d0e83b0a2dc7bca1b9492..0d149eca3b631fd492e2812944bed0c4a47eb932 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -2,13 +2,13 @@
 , enableReadline ? true, readline, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "calc-${version}";
+  pname = "calc";
   version = "2.12.7.2";
 
   src = fetchurl {
     urls = [
-      "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
-      "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
+      "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
+      "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
     ];
     sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp";
   };
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix
index 0beee1eb29150bf97e10144d00e5c543cf30db02..0eb57c7569279a78180e2ea19cfba7bb387bbe29 100644
--- a/pkgs/applications/science/math/clp/default.nix
+++ b/pkgs/applications/science/math/clp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.17.2";
-  name = "clp-${version}";
+  pname = "clp";
   src = fetchurl {
     url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz";
     sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz";
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 465c7318c0e3f1c25da57ebf5794f3d113c271d1..c20a6954c3cbcbb31973afb372e04c5069720ad4 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -17,7 +17,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "CNTK-${version}";
+  pname = "CNTK";
   version = "2.7";
 
   # Submodules
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
index 94e0a44226d46be3adba9c5db0fab006babf13a3..13a75ce4db2d036c197ef48d6890b36e55dc2fff 100644
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
 
   pname = "ColPack";
   version = "1.0.10";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "CSCsw";
diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix
index a14839d3eccc76db3357b86294672fcdb479e406..ec13f5252f13cf7dfeebee6213f641d8fb3bbfea 100644
--- a/pkgs/applications/science/math/cplex/default.nix
+++ b/pkgs/applications/science/math/cplex/default.nix
@@ -8,7 +8,7 @@
 # different for every user.
 
 stdenv.mkDerivation rec {
-  name = "cplex-${version}";
+  pname = "cplex";
   version = "128";
   
   src =
diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix
index 23ab2184266a12343007022fa095f881561df7f8..eb42315f015bfbe62d4ae572e5f22d0ca5a97dcc 100644
--- a/pkgs/applications/science/math/form/default.nix
+++ b/pkgs/applications/science/math/form/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.2.1";
-  name = "form-${version}";
+  pname = "form";
 
   # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
   src = fetchurl {
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 3232d08aa339c65cb2099b078c65d85f347c0473..8f38a24f40d119999b1b284b67eb0e75d433f7b4 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }:
 
 stdenv.mkDerivation rec {
-  name = "geogebra-${version}";
+  pname = "geogebra";
   version = "5-0-535-0";
 
   preferLocalBuild = true;
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 74e4b052fdb56964cec2f1398853b7390f93455a..3ccd89cf2c1369a3d3811440fe69a8a9951e7227 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "getdp-${version}";
+  pname = "getdp";
   version = "3.0.4";
   src = fetchurl {
     url = "http://getdp.info/src/getdp-${version}-source.tgz";
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index d2d1ddb6584684d5beb051ca8fe1c9d3a185e865..33b003b2b5625e7d8b212765c01bb4007b5264d3 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, gmp, mpir, cddlib}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "gfan";
   version = "0.6.2";
 
diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix
index ee9bdcc6f1b0d4e1d2e02d80acf61ac4b554283c..4ac7c411c2dc210bd38cfff8976ee7dd9e9bdded 100644
--- a/pkgs/applications/science/math/gurobi/default.nix
+++ b/pkgs/applications/science/math/gurobi/default.nix
@@ -3,7 +3,7 @@
 let
   majorVersion = "8.1";
 in stdenv.mkDerivation rec {
-  name = "gurobi-${version}";
+  pname = "gurobi";
   version = "${majorVersion}.0";
 
   src = with stdenv.lib; fetchurl {
diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix
index 9eab9ca39992b236c85f53a71c838f918791df97..45a13d0288949673b53f3471af588fdc0800bdc6 100644
--- a/pkgs/applications/science/math/hmetis/default.nix
+++ b/pkgs/applications/science/math/hmetis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "hmetis-${version}";
+  pname = "hmetis";
   version = "1.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 0cf834c8cdeac7e077153aebce95ce7177080c19..f39c6a04d1907a456b99bc6c6f3021f357abde70 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "lp_solve-${version}";
+  pname = "lp_solve";
   version = "5.5.2.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix
index 9e02b08c8ad07e81787bd73b941ce80b78d85e58..eecb37dd743f63589f956e82a83d1ad72b02c6b0 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/pkgs/applications/science/math/lrcalc/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.2";
   pname = "lrcalc";
-  name = "${pname}-${version}";
 
   src = fetchFromBitbucket {
     owner = "asbuch";
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index c6802c3719e9c1aa9499eef0fdd807928389393b..4204b1399137e7ca73cd3c06491f18ab802cec3a 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -26,7 +26,7 @@ in
 stdenv.mkDerivation rec {
   version = "10.0.2";
 
-  name = "mathematica-${version}";
+  pname = "mathematica";
 
   src = requireFile rec {
     name = "Mathematica_${version}_LINUX.sh";
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index e2e4ba63b07e05297fc44f024225fd1c8982fc0f..bd4725ce73c62460f17d72e70405a12ed843a903 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -7,7 +7,7 @@
 assert cudnnSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
-  name = "mxnet-${version}";
+  pname = "mxnet";
   version = "1.4.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 226e13c004d731f2530e031b1317fcb7187d7a25..c86354234e3fc380b2516a268092cc32ac863915 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 }:
 stdenv.mkDerivation rec {
-  name = "nauty-${version}";
+  pname = "nauty";
   version = "26r11";
   src = fetchurl {
     url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 86bd2e8436783a04d697d3c605b95fc02e0a8ea9..e743c8ae95b68f0051c4e147e65e8322accd6cb3 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "gp2c-${version}";
+  pname = "gp2c";
   version = "0.0.11pl2";
 
   src = fetchurl {
-    url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
+    url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
     sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g";
   };
 
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix
index 3e7d9898a656c40cafae4cfebda1c8906ce9b0f1..167ab9275faf399bd85fc1b8b0d62f988d43b2e8 100644
--- a/pkgs/applications/science/math/pcalc/default.nix
+++ b/pkgs/applications/science/math/pcalc/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcalc-${version}";
+  pname = "pcalc";
   version = "20141224";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix
index 4fba231f094d3321392b2430a6cad003001796eb..fdc4de7b0286fb936cc517625bde71c8866b2ef4 100644
--- a/pkgs/applications/science/math/polymake/default.nix
+++ b/pkgs/applications/science/math/polymake/default.nix
@@ -7,7 +7,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "polymake";
   version = "3.2.rc4";
 
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
index 2dd4778234dfa0baa91545b28ceb12b9cd1349ee..71d16fb626cd250db4b6a05b307ad13ced28d7a8 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, gmp }:
 stdenv.mkDerivation rec {
-  name = "ratpoints-${version}";
+  pname = "ratpoints";
   version = "2.1.3.p4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 5e0b7fc300ba7f7848297783b3fd18cad11a3f1e..a42a5b710ce062c6fb996268cb28b3614041f042 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -17,7 +17,8 @@ let
   version = "1.0";
 in
 stdenv.mkDerivation {
-  name = "ripser-${version}";
+  pname = "ripser";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Ripser";
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 0cd5b5d976a16584c117e539dc0292c10250ff5a..856d604d7518eca4e3fe93795ef0cc11568f3e9d 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -25,7 +25,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sage-tests-${version}";
+  pname = "sage-tests";
   inherit src;
 
   buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index e4b1aeae016a6e9bf3581193fa59ceb78ab48141..524085e8c01282ea452a77f4756c6a5f55c9f550 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -87,7 +87,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sage-with-env-${version}";
+  pname = "sage-with-env";
   src = sage-env.lib.src;
 
   inherit buildInputs;
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index f6dc21d00184432c2081f5d7cb17ba6ea2e5057e..4fa8ae6270ba476e4b3ba2b1f8a9e6daf2d4d99b 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -21,7 +21,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sage-${version}";
+  pname = "sage";
   src = sage-with-env.env.lib.src;
 
   buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 91c880673a12f701883d13a56f3d2d6fc5377a7f..bf618fe64f45f4c64f99d0ff3c331697608ac7cd 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = src.version;
-  name = "sagedoc-${version}";
+  pname = "sagedoc";
   src = sage-with-env.env.lib.src;
 
 
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 1040d6d4ba15a79e0f13bdcacef0508b84473c20..6eac84aaa8658ddf4414b25c4256f9c1cbb671de 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -60,7 +60,7 @@
 buildPythonPackage rec {
   format = "other";
   version = src.version;
-  name = "sagelib-${version}";
+  pname = "sagelib";
   src = sage-src;
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix
index 01fb58403cad9c9f2d3fa694b09c32b31383762f..432280a18fb2ccb896fe7be6c2077fff3cbdb297 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@@ -13,9 +13,9 @@
 
 stdenv.mkDerivation rec {
   version = "4.1.2";
-  name = "scilab-${version}";
+  pname = "scilab";
   src = fetchurl {
-    url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz";
+    url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz";
     sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc";
   };
 
diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index 8fa020ba07c970ffbbdc269d468bf0a815286f50..610f1ef05c0fec9d9fd447067be83197141d1f57 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.0.4";
-  name = "scotch-${version}";
+  pname = "scotch";
   src_name = "scotch_${version}";
 
   buildInputs = [ bison openmpi flex zlib ];
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 24063216db049163ebab707f42133c3c58d5d294..ccb139203acb72f6dd5207caf65163827d154899 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "singular-${version}";
+  pname = "singular";
   version = "4.1.1p2";
 
   src = let
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index d36b135531c2457558c5217bbc49d46bc0ddf109..67561658eb256f4e7e09c97e801e214e103d6adb 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
 
 mkDerivation rec {
-  name = "speedcrunch-${version}";
+  pname = "speedcrunch";
   version = "0.12.0";
 
   src = fetchgit {
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index bc971606cd085c80bf47b8853b8ef860879853c8..18daabb9e7e2a0f562ce20c20f5173d6d892b099 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 }:
 stdenv.mkDerivation rec {
-  name = "symmetrica-${version}";
+  pname = "symmetrica";
   version = "2.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 3bfb22dad93634682cea92f2668efdfdf2c29cf5..90278a744f1514f29a572b96007f4c07c974ab59 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, unzip, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "weka-${version}";
+  pname = "weka";
   version = "3.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
+    url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip";
     sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
   };
 
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 13ccd70c83f9b8cb7fbd139227e25871cf91e613..406d74c4cd34c64f0394c8cbb240394ac2bf9f9c 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -3,7 +3,7 @@
 , maxima, wxGTK, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "wxmaxima-${version}";
+  pname = "wxmaxima";
   version = "19.03.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index c02ef73df119bf2b1030db6340bd97abaa7e9eae..bae0d9a18c67cd73aa93dd4763c620d2be6b7126 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yacas-${version}";
+  pname = "yacas";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index d1da5a74e858733e7fe20b494e920b4db07df03d..c806b558da0ec97ce34f71c84552a78fc97cd0e5 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -9,10 +9,10 @@ in
 
 stdenv.mkDerivation rec {
   version = "${majorVersion}.${minorVersion}";
-  name = "boinc-${version}";
+  pname = "boinc";
 
   src = fetchFromGitHub {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${majorVersion}/${version}";
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 2262e342fc95e7785870c1f9e267006a3f66e982..2e19012af874647f96469e5a453be66381b00714 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "cytoscape-${version}";
+  pname = "cytoscape";
   version = "3.7.1";
 
   src = fetchurl {
-    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k";
   };
 
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index b81f188a91bfb769a5677fb8821c036c7cbf0cd1..17b2fe27f2970b172dff3e54749259b97a55e1cd 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -28,7 +28,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "gephi-${version}";
+  pname = "gephi";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 8b6c7497e547cbc0ee314cd93bb55c61e563afb8..b394639fd0cc9e21c7de703c2d9636df59f6b627 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -2,11 +2,11 @@
 , proj, boost, cmake, python2, doxygen, graphviz, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "gplates-${version}";
+  pname = "gplates";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";
+    url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";
     sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";
   };
 
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
index 8cd119c7b7b0ac653c141de88a15f68a398ce646..59f5afb2f437683071ef57d4734aa36b63e87a26 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.92"; in
 stdenv.mkDerivation rec {
-  name = "megam-${version}";
+  pname = "megam";
+  inherit version;
 
   src = fetchurl {
     url = "http://hal3.name/megam/megam_src.tgz";
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix
index 76f958cc3a81e8fe889f0c598767790320b1746b..b412c4ef81a717f560d2de6450d56d38cdb25f41 100644
--- a/pkgs/applications/science/misc/netlogo/default.nix
+++ b/pkgs/applications/science/misc/netlogo/default.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "netlogo-${version}";
+  pname = "netlogo";
   version = "6.0.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 4139c88ffb021a14d1d70e843a4913396679cef0..121e953f43af9702e53027c8cc5e407ce2a33e6e 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "openmvg-${version}";
+  pname = "openmvg";
 
   src = fetchgit {
     url = "https://www.github.com/openmvg/openmvg.git";
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
index 0199373b082c36a70babbc8930490ce0de9f6ced..2145d7e71d33295d5a4cdd1708af848c180d9d5f 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -3,7 +3,7 @@
 , Cocoa, OpenGL, noSplash ? false }:
 
 stdenv.mkDerivation rec {
-  name = "root-${version}";
+  pname = "root";
   version = "5.34.36";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 2ec1ded68a26933c90cedb2bc742b86dc68905f8..690dc920d5c8e11be3670e864df360f669beb2a6 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -3,7 +3,7 @@
 , Cocoa, OpenGL, noSplash ? false }:
 
 stdenv.mkDerivation rec {
-  name = "root-${version}";
+  pname = "root";
   version = "6.12.06";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 1f644ad0f20f7dad798c96bd3edb22110752a36d..509cdeaee611255173ba63c3a130b427a22dde3d 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -3,10 +3,11 @@
 
 let version = "5.2.1"; in
 stdenv.mkDerivation rec {
-  name = "tulip-${version}";
+  pname = "tulip";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/auber/${name}_src.tar.gz";
+    url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz";
     sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
   };
 
diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
index 1986f3b75ec16e347127dff33eba117cab51e5ac..c7692dde13aa8abdfd4582c02ee0c3b5b6193d49 100644
--- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.10";
-  name = "DL_POLY_Classic-${version}";
+  pname = "DL_POLY_Classic";
 
   src = fetchurl {
     url = "https://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/574/8924/dl_class_1.10.tar.gz";
diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index f4491053e4c8e666f873a5fc5fb37f73c1908303..83f8b88ba318b9c9f5fe7e85c02ee742c7cfe91b 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -13,7 +13,7 @@ in
 stdenv.mkDerivation rec {
   # LAMMPS has weird versioning converted to ISO 8601 format
   version = "stable_22Aug2018";
-  name = "lammps-${version}";
+  pname = "lammps";
 
   src = fetchFromGitHub {
     owner = "lammps";
diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix
index ad86ff61471cefc2b036dbe8a3c072e1336e14c4..b22b9d412fdc37f1ccf81f69b8ae0fde22363e27 100644
--- a/pkgs/applications/science/physics/quantomatic/default.nix
+++ b/pkgs/applications/science/physics/quantomatic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "quantomatic-${version}";
+  pname = "quantomatic";
   version = "0.7";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index d43a05f1c6166b0bec0f78d47c8841ce35699c53..dd092a2ce9a9e529789fa0d21fb13d0af5a70591 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sacrifice-${version}";
+  pname = "sacrifice";
   version = "1.0.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index 1d61c612563fcb812053e860d2976806daf7735f..045a77cea27f404d07f686cebd901f11ced9600e 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "sherpa-${version}";
+  pname = "sherpa";
   version = "2.2.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix
index ae5307f155bd8e2291728eda00b85067eee31b1b..2af93961e02b81830b07e5346a6c69a0692345aa 100644
--- a/pkgs/applications/science/physics/xfitter/default.nix
+++ b/pkgs/applications/science/physics/xfitter/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }:
 
 stdenv.mkDerivation rec {
-  name = "xfitter-${version}";
+  pname = "xfitter";
   version = "2.0.0";
 
   src = fetchurl {
-    name = "${name}.tgz";
-    url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${name}.tgz";
+    name = "${pname}-${version}.tgz";
+    url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz";
     sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515";
   };
 
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix
index c454ad377686b8c5a5e022f5ebe95cface97bb36..ebfb6471c6323847f0977503268fde216186ffdf 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation rec {
   major = "2";
   minor = "5";
   version = "${major}-${minor}";
-  name = "plm-${version}";
+  pname = "plm";
 
   src = fetchurl {
     url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar";
     sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc";
-    name = "${name}.jar";
+    name = "${pname}-${version}.jar";
   };
 
   buildInputs = [ makeWrapper jre gcc valgrind ];
diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix
index 152b71217743efe8ddf480c82efbc3fc8f7d3aea..6623f5def4cb7f573a076fe7be8ba3a8397341f3 100644
--- a/pkgs/applications/science/programming/scyther/cli.nix
+++ b/pkgs/applications/science/programming/scyther/cli.nix
@@ -1,7 +1,8 @@
 { stdenv, glibc, flex, bison, cmake
 , version, src, meta }:
 stdenv.mkDerivation {
-  name = "scyther-cli-${version}";
+  pname = "scyther-cli";
+  inherit version;
 
   inherit src meta;
 
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
index e0993a5801936dd3210f86ca7d522958f65f6bcd..b4daae1afc0405689985a32a7fca35804ebfaccf 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -25,7 +25,8 @@ let
   };
 
   gui = stdenv.mkDerivation {
-    name = "scyther-gui-${version}";
+    pname = "scyther-gui";
+    inherit version;
     inherit src meta;
     buildInputs = [
       python27Packages.wrapPython
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 98ccd92c4ee58fff9269cb96ef9ef5305f336c2b..a3ebda463b91315bc95e0613f4b0ad306c303eaa 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -24,10 +24,10 @@
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "gazebo-${version}";
+  pname = "gazebo";
 
   src = fetchurl {
-    url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2";
+    url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2";
     sha256 = src-sha256;
   };
 
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index eae5d3766d6db59b03fd64f74db5e97755a83100..1863757adbcf819fd328a03cdefae4225f4c5497 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgroundcontrol-${version}";
+  pname = "qgroundcontrol";
   version = "3.3.0";
 
   qtInputs = [
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 507481cddab28aa9860522ce8a30b6a8a8f6fc93..d14c0bb0fe81e3fe4d603f9239168d943744fa95 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yarp-${version}";
+  pname = "yarp";
   version = "2.3.70.2";
   src = fetchFromGitHub {
     owner = "robotology";
diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix
index 69fc0e76932cae8ba405d639044d57a4c567c8dc..06b2aee0392052d797d0951831a1d5d82422c650 100644
--- a/pkgs/applications/search/grepcidr/default.nix
+++ b/pkgs/applications/search/grepcidr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "grepcidr-${version}";
+  pname = "grepcidr";
   version = "2.0";
 
   src = fetchurl {
-    url = "http://www.pc-tools.net/files/unix/${name}.tar.gz";
+    url = "http://www.pc-tools.net/files/unix/${pname}-${version}.tar.gz";
     sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231";
   };
 
diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix
index 99c149b79d9daebc3e9053af6685ed13048e58a9..f3fc1e24401d529f56074b98e878b5af031aa6e6 100644
--- a/pkgs/applications/search/grepm/default.nix
+++ b/pkgs/applications/search/grepm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perlPackages, mutt }:
 
 stdenv.mkDerivation rec {
-  name = "grepm-${version}";
+  pname = "grepm";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index 26397380d57f591ad783135fc3fdd20aead8646e..e092a604142ced9884b21bcb8233cfec92b20f38 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -3,7 +3,7 @@
 , libtomcrypt, libtommath, lz4 }:
 
 stdenv.mkDerivation rec {
-  name = "bitkeeper-${version}";
+  pname = "bitkeeper";
   version = "7.3.1ce";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index 5bcc3f991a1cb7eb17000b0bbb825d069dd86f1a..8c28a6789624cab22d4df1caae151e5fe088f083 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "1.20181219";
   pname   = "blackbox";
-  name    = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "stackexchange";
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
index 6301acdf13424d32bc6e64c3dcb2175d4bb7b3c9..7d1de378f53d6f2424c7e899c7a1ca182732bff0 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/pkgs/applications/version-management/bugseverywhere/default.nix
@@ -7,7 +7,7 @@
 #
 pythonPackages.buildPythonApplication rec {
     version = "1.1.1";
-    name = "bugseverywhere-${version}";
+    pname = "bugseverywhere";
 
     src = fetchurl {
       url =
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index aa3bcb2739492b519c232ed8e92b0a013246b6c9..71130a2e2830220448a26cce7920b5b55b51fa75 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, cvs, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "cvsps-${version}";
+  pname = "cvsps";
   version = "2.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
index fa6d4fe1890df216fb69c1527f8a9bb7c07a30db..fc591dd710eeca015775b346715a185e4677a3cd 100644
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -4,10 +4,10 @@ let
   inherit (python27Packages) pygtk python;
 in stdenv.mkDerivation rec {
   version = "0.4.8";
-  name = "diffuse-${version}";
+  pname = "diffuse";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
   };
 
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index d4b60a4f5386ca939ac383559b650d4700e01c97..cc02988113331de2957afe7a07306198a5fa5d0c 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fossil-${version}";
+  pname = "fossil";
   version = "2.9";
 
   src = fetchurl {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       [
         "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
       ];
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw";
   };
 
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index 0475a8ae76ca9d9c8f5560345c6428a479e1c340..350eea240ec85ca921cdb36aa96eec266eea2d26 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gerrit-${version}";
+  pname = "gerrit";
   version = "2.14.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6b25ef8518c9a99ca3ca3935fb88f700f1b434cc..203926550628878cdcbead2e8b8913d7b60a0c3d 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cgit-${version}";
+  pname = "cgit";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
+    url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
     sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 1af1870928ba7bb931c57952d7c42a531c3fded0..0e28258915f2e82793dcb679471d5e9e0bcdcb73 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
 
 stdenv.mkDerivation rec {
-  name = "darcs-to-git-${version}";
+  pname = "darcs-to-git";
   version = "2015-06-04";
 
   src = fetchgit {
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 599c6bb4308ec90920813df802afbefb8af16592..1bbbbe22d9a808c3789de590e6a750418e072b6a 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -1,7 +1,7 @@
 {stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
 
 stdenv.mkDerivation rec {
-  name = "diff-so-fancy-${version}";
+  pname = "diff-so-fancy";
   version = "1.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 52494d4ab7ede1310d97d5b681e2cd4d13f0e68c..3c0653529ceab723e8a2e77d3c2af5e85321182c 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ghq-${version}";
+  pname = "ghq";
   version = "0.10.2";
 
   goPackagePath = "github.com/motemen/ghq";
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
index ba64a065d2812c576b5d8fd44e02f1d4971dca62..3118eaab19b437948ac9d674af3430d18b7f3900 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
 
 buildPythonApplication rec {
-  name = "git-annex-metadata-gui-${version}";
+  pname = "git-annex-metadata-gui";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 4d0f33730e45bd0a8afe3687d1835487e4df7f0a..55a9dd18f720e41289922284db0d13720d63743e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "git-annex-remote-b2-${version}";
+  pname = "git-annex-remote-b2";
   version = "20151212-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index c368dcd487e8e32ffb0b08d01ea88ea11f3822da..5d4d9b86d83f4e4f95ad0cc16abdc8461dd1eb7b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rclone, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "git-annex-remote-rclone-${version}";
+  pname = "git-annex-remote-rclone";
   version = "0.6";
   rev = "v${version}";
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
index 185ed38b5db0342a6a2cd802946c45cacb1e7a55..daa0af43879db9dfe2e39ce9d250aaae1a7f5942 100644
--- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-appraise-unstable-${version}";
+  pname = "git-appraise-unstable";
   version = "2018-02-26";
   rev = "2414523905939525559e4b2498c5597f86193b61";
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 0baf09918d4422951a5fcace75c0c08324713106..edc5f9d7bfb0a3de7cbe8379bee7af56b79229b4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-bug-${version}";
+  pname = "git-bug";
   version = "0.5.0";
   rev = "8d7a2c076a38c89085fd3191a2998efb659650c2";
   goPackagePath = "github.com/MichaelMure/git-bug";
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index c14a027b4abeaa20eeb73fb4fce4705889eada0f..e502c73adfd4d08c6d2c4018ea2a5ed1d6ef255c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -3,7 +3,7 @@
 , pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "git-bz-${version}";
+  pname = "git-bz";
   version = "3.2015-09-08";
 
   src = fetchgit {
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 316b664c07058c4525067064d95d4e7982a0a515..6945e24ee46b12bc579733fb623411b50830c1ce 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,7 +4,7 @@ let
   inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
 
 in buildPythonApplication rec {
-  name = "git-cola-${version}";
+  pname = "git-cola";
   version = "3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index c036a0ffe4b184c354475274c4978ff524abf799..09c9169e434e45a35a85f194a7c1d25e03fc9daf 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "git-extras-${version}";
+  pname = "git-extras";
   version = "4.7.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index ded9bcc2ffdfbe8ed6ec4912d1535c1e685192e0..193133d6d3e69d0138c94494b22ee57663bec5a9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "git-hub-${version}";
+  pname = "git-hub";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 10e786222710a66f832f0384bd5d774515074a32..76b29135f66cda9f621022c50abb8dd2a861b84d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "git-imerge-${version}";
+  pname = "git-imerge";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
index f8d871bdcf30655bac5be1f7849d7de7788a961f..a7abd1eeaf46804363b45f860d4a498162c61a49 100644
--- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "git-octopus-${version}";
+  pname = "git-octopus";
   version = "1.4";
 
   installFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index dc3fbbed19951f124c2610d9b0278b6ab99a0858..1cc3f365ea88436506ac3a44e11aa993493d78c3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -1,7 +1,7 @@
 {stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "git-open-${version}";
+  pname = "git-open";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index d72df802875916fdb409092eba6f46c6547acc4b..9fb9d4de6e3def6e4177d11c852370d290c93c7c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "git-radar-${version}";
+  pname = "git-radar";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index d1dce04697930a1e7aab4258de7fa3bca040ae61..ff0f702269c2bb3b9f3dfe197b5d3fdf8deee8aa 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-remote-gcrypt-${version}";
+  pname = "git-remote-gcrypt";
   version = "1.2";
   rev = version;
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
index 03435ec834ab4dcc04cee2d971d4ab67733940eb..c0de46264d05e9632ab280bd6b36152ce2cf2ffd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "git-reparent-${version}";
+  pname = "git-reparent";
   version = "unstable-2017-09-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index 211685c8edb40c1b3c9aaf33af2af0f0dfb7308a..c1a40b12cdea57d503e401718bfd2a405f5593b5 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "git-secrets-${version}";
+  pname = "git-secrets";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index 6a52983e83ce7414f5746a6a454d6a497f1ee3dc..e8eaf885c71ff12b14b90ea79290f377e5a4e945 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation rec {
-  name = "git-stree-${version}";
+  pname = "git-stree";
   version = "0.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 7ba7d8ec243468bac1abe393fb5266c5df82d90b..7fa15c668099eb61e5ee6ffa90a130cf7b5f31e4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-sync-${version}";
+  pname = "git-sync";
   version = "20151024";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
index 1150f008299c812e3c83c565a8435943feeced76..e55799c27521243dc4a46ade2afba0aa1a462815 100644
--- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, git }:
 
 stdenv.mkDerivation rec {
-  name = "git-test-${version}";
+  pname = "git-test";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 83e65bc171710ac6c4d944a9be546c3f349f6076..3a4fcc09934022f1614134bebb95595522f87804 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -21,18 +21,19 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.22.0";
+  version = "2.22.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
 in
 
 stdenv.mkDerivation {
-  name = "git-${version}";
+  pname = "git";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm";
+    sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac";
   };
 
   outputs = [ "out" ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 26f9f8c756ee34bf2f7f69c8f004fee94c42de5b..57af13f597a77f5d5ee1c53393d02d72431886de 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -5,7 +5,6 @@ with pkgs.lib;
 stdenv.mkDerivation rec {
   pname = "gitflow";
   version = "1.12.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "petervanderdoes";
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index b7828418db07e5d6d02ed5009e0a697dfc3bd937..e6b746233fe1ea3d9c4415f1d03071876c0e7527 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -3,7 +3,8 @@ let
   version = "0.3.1";
 in
 buildGoPackage {
-  name = "grv-${version}";
+  pname = "grv";
+  inherit version;
 
   buildInputs = [ ncurses readline curl libgit2 ];
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 34c367b20a438bf599f45d64edd3a5cb19b4e7f0..3c7784e8506201fa58b34bc666fe33da0371a881 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.0.16";
 in
 stdenv.mkDerivation {
-  name = "svn-all-fast-export-${version}";
+  pname = "svn-all-fast-export";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "svn-all-fast-export";
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index d00fdd0c29e07b09973b28abbc08f1778a81e15b..821ecf3e3d8f3c7f5294ab3de35c1b4b67e581a1 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.4.0";
 in
 stdenv.mkDerivation {
-  name = "svn2git-${version}";
+  pname = "svn2git";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 52f5551e204fc50326d629dfc2266530f56f445d..59354598d0083ce39c99a059ecd316cf18a18606 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -5,12 +5,11 @@
 stdenv.mkDerivation rec {
   pname = "tig";
   version = "2.4.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jonas";
     repo = pname;
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index cea588f76ca29a894d249d8149bee0d2180764da..3b8affb57edf516170295b56cd06fc0013536de9 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "transcrypt-${version}";
+  pname = "transcrypt";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
index fd999dc17d4d24fc63c1ec4746a61b1ef350dc09..ec03c5bed5b1c276eca4f17ac83e0c96dc2d5500 100644
--- a/pkgs/applications/version-management/git-crecord/default.nix
+++ b/pkgs/applications/version-management/git-crecord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "git-crecord-${version}";
+  pname = "git-crecord";
   version = "20161216.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 3cde046a2adff62e591cac036bb748a31aa4d6e6..e3190667259ea8d20aae116bc99b6588b162c586 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-lfs-${version}";
+  pname = "git-lfs";
   version = "1.5.6";
   rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
   
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 92ba57382501c03024309b1181004074b8ebaa3b..d9b5e17049766800a2ebf36f07e2f03d35aa1940 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "git-lfs-${version}";
+  pname = "git-lfs";
   version = "2.7.2";
 
   goPackagePath = "github.com/git-lfs/git-lfs";
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index 9c5ab20d364fdccf3d3cb83feb97d65913067be2..7a92679583b6047fc10830b63b31efb65ef54147 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "git-sizer";
-  name = "${pname}-${version}";
   version = "1.0.0";
 
   goPackagePath = "github.com/github/git-sizer";
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index f766ddbd42c9a6e1b38140d98cf98c248cc62f16..fa93ff41a4ae0b87d10900c5b885cbbfaf974358 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,7 +12,7 @@ let
   curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
 in
 stdenv.mkDerivation rec {
-  name = "gitkraken-${version}";
+  pname = "gitkraken";
   version = "6.1.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 184c6dc7f730c742cba9a2079565c1278e2cb54e..873d9f390905300ed4dbcc5b8877f1d3c8328c7a 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -18,7 +18,7 @@ let
   };
 in buildGoPackage rec {
   version = "1.53.2";
-  name = "gitaly-${version}";
+  pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index faeed38c918bfeecdf6e3afeac2b8e92b386dfe7..cd4784b36c8e743ff3b8e1d7c38fc75658c096ee 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "9.3.0";
-  name = "gitlab-shell-${version}";
+  pname = "gitlab-shell";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 23cf3483f7a95e5d43254015ce9eec07a7b1df21..12f354bc2fb965db568daea335030f5736ae23a6 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  name = "gitlab-workhorse-${version}";
+  pname = "gitlab-workhorse";
 
   version = "8.7.0";
 
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 42c0910078845d916120a41c3d70fa3656651909..7c157191ab97782fee3c00f2445ce3aad51c857a 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, git, nettools, perl }:
 
 stdenv.mkDerivation rec {
-  name = "gitolite-${version}";
+  pname = "gitolite";
   version = "3.6.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
index 64b6e2107f6a11d28cb04fb095cb2eee1943e765..5d29c8fcb6c300d3e380097edb51620f6bdcb48f 100644
--- a/pkgs/applications/version-management/gitstats/default.nix
+++ b/pkgs/applications/version-management/gitstats/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "gitstats-${version}";
+  pname = "gitstats";
   version = "2016-01-08";
 
   # upstream does not make releases
   src = fetchzip {
     url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip";
     sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59";
-    name = name + "-src";
+    name = "${pname}-${version}" + "-src";
   };
 
   buildInputs = [ perl python ];
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 0587bc9af767a09be037675c4b4565c7bb1c354c..c2153ebea89318d6e65478d48d67229664bfac14 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "gogs-${version}";
+  pname = "gogs";
   version = "0.11.86";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 0d2c4d7426725b106ed8eff51b434464a9810f02..0a24cfbb3a0da1eaf5dcc44905d88698baf36509 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.49";
-  name = "gource-${version}";
+  pname = "gource";
 
   src = fetchurl {
-    url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
   };
 
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 33d2eb89ad08c7a088ac34e7adc17d8d7e6ce6ac..0aa8afa936194a0ff287bdd1b89a2da32e2c89b0 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.0-mtn-head"; in
 stdenv.mkDerivation rec {
-  name = "guitone-${version}";
+  pname = "guitone";
+  inherit version;
 
   #src = fetchurl {
   #  url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz";
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 3c052a26cdeedaff60fb59f544dd5ad0becbc6b0..bee1c82e11b6790ef82cbd2278683699792d4b80 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -9,12 +9,12 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
     }; in
 stdenv.mkDerivation rec {
   version = "1.0.2";
-  name = "monotone-viz-${version}";
+  pname = "monotone-viz";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
   src = fetchurl {
-    url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
+    url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
     sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
   };
 
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 010d4d2f86ad56d1c51cb46dd066fddd360f01c4..7081e1a08996a09b3562990d974727368be94d86 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -11,7 +11,8 @@ in
 assert perlVersion != "";
 
 stdenv.mkDerivation rec {
-  name = "monotone-${version}";
+  pname = "monotone";
+  inherit version;
 
   src = fetchurl {
     url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
     openssl gmp bzip2 ];
 
   postInstall = ''
-    mkdir -p $out/share/${name}
-    cp -rv contrib/ $out/share/${name}/contrib
+    mkdir -p $out/share/${pname}-${version}
+    cp -rv contrib/ $out/share/${pname}-${version}/contrib
     mkdir -p $out/${perl.libPrefix}/${perlVersion}
     cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
   '';
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 8150203814d05f9f694e6ca287a410d55ad4f336..23278e9e748c585ccba07a58cf7bb3b4581c35e5 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mr-${version}";
+  pname = "mr";
   version = "1.20180726";
 
   src = fetchgit {
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index 1a6eda6a04e92d9f5cb9eff44485e641927ba7e4..8b2b15a00780e98510f5baf75a811febf4aa35f0 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -2,7 +2,6 @@
 
 with python2Packages;
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   version = "0.3.1";
   pname = "nbstripout";
 
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index 8fb1095dc581a1a7fef1420685c2c4c2fb336871..db9afdc0a74fd2e806ca9822736134150702e03d 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "nitpick";
   version = "1.1";
-  name = "${pname}-${version}";
 
   format = "other";
   disabled = !isPy27;
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index 314c379c4e6dd9866718a3ab86e9bad6b1d88912..0020c8c2189e47db153d8e858af6fad790d8892b 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "p4v-${version}";
+  pname = "p4v";
   version = "2017.3.1601999";
 
   src = fetchurl {
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index e799d5fac43b92587749d38cc00ba880f792e10b..60486e2011651b8b8b4249b90dc91fad638bbe1e 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
 
 stdenv.mkDerivation rec {
-  name = "rapidsvn-${version}";
+  pname = "rapidsvn";
   version = "0.12.1";
 
   src = fetchurl {
-    url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
+    url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz";
     sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
   };
 
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index 1fbc22f8776189530480dad2f8cc1801676182d3..a3ba418a1463da4cd81bbbac01de8ab076a13afd 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -11,10 +11,11 @@ let
   };
 in
   stdenv.mkDerivation rec {
-    name = "redmine-${version}";
+    pname = "redmine";
+    inherit version;
 
     src = fetchurl {
-      url = "https://www.redmine.org/releases/${name}.tar.gz";
+      url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
       sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
     };
 
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index ba1980c3d142d76547b3e0cd1b6e0838a46bbee0..0b1f64b58a1746d3b151eaeae12ebf69c73fce40 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -11,10 +11,11 @@ let
   };
 in
   stdenv.mkDerivation rec {
-    name = "redmine-${version}";
+    pname = "redmine";
+    inherit version;
 
     src = fetchurl {
-      url = "https://www.redmine.org/releases/${name}.tar.gz";
+      url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
       sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
     };
 
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 049f2756a5516b1510c0b2b670058ad8522e6747..a3fcd209efc0f046bede34119fc88bce681dd4ce 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, rcs, git, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "src-${version}";
+  pname = "src";
   version = "1.26";
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/src/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
     sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
   };
 
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 8753d4f6f57182f690fadaf0faa18a2751af9885..693af89d9785362d3427f4a48fcd673f66a01bc3 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.9.5_beta";
-  name = "srcml-${version}";
+  pname = "srcml";
 
   src = fetchurl {
     url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index c2bf0a4183c111c3d5d97de00547ecd57e126a4b..2ad6b6f2f62c594e843ed5c6fe451730a9106a41 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, autoconf, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "vcprompt-${version}";
+  pname = "vcprompt";
   version = "1.2.1";
 
   src = fetchhg {
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index 4089e68d85dcec612f2e7969dc70ef3cafaafdf6..577f2f014168cd5438b9030dbc27eb12cff3b055 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.20170915";       # date of commit we're pulling
-  name = "vcsh-${version}";
+  pname = "vcsh";
 
   src = fetchFromGitHub {
     owner = "RichiH";
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 6baeb5279c26530026b6ae5b952018b5709f780f..aed5cb807dc78457959eebb07f2676ddc9df6749 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.12.0"; in
 stdenv.mkDerivation {
-  name = "yadm-${version}";
+  pname = "yadm";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "TheLocehiliosan";
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 3df616824801719e55639a8d640770ce8afc642b..2734035b6de954f25afd3fac6347630e694ac173 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null);
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "aegisub-${version}";
+  pname = "aegisub";
   version = "3.2.2";
 
   src = fetchurl {
-    url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
+    url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
     sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
   };
 
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 4cbd506c177dd55031ad5cd9434f0415bc836159..c28d900dd9f150218da93902542dca91e08e7219 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -24,7 +24,7 @@ assert default != "qt5" -> default == "cli";
 assert !withQT -> default != "qt5";
 
 stdenv.mkDerivation rec {
-  name = "avidemux-${version}";
+  pname = "avidemux";
   version = "2.7.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index a76608bdd900e1fc82a7909e9ae9e4d1b6fbf121..3d598086329649f039b969acd662cc3b244755e0 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "avxsynth-${version}";
+  pname = "avxsynth";
   version = "2015-04-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix
index d98b39796608fdf957a1d7a1c387def8c89308e2..64b9613363c3605190ddcda355ea37f5f68de846 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/applications/video/bino3d/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "bino-${version}";
+  pname = "bino";
   version = "1.6.7";
 
   src = fetchurl {
-    url = "https://bino3d.org/releases/${name}.tar.xz";
+    url = "https://bino3d.org/releases/${pname}-${version}.tar.xz";
     sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k";
   };
 
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index 4b97db56e978ed4f088850e91a84257aa8e3ef0c..1cba1d0e94910d35e5c946ed334f2a0ac4cb7945 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -8,7 +8,7 @@ fetchpatch {
   url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
 }; in
 stdenv.mkDerivation rec {
-  name = "bombono-${version}";
+  pname = "bombono";
   version = "1.2.4";
   src = fetchFromGitHub {
     owner = "muravjov";
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index bbac1014034440b5c261d9bad8bb938881b62924..9ff65483f261fdc27e835b072fdbc3d23ba64c3b 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -30,7 +30,7 @@ assert cddaSupport -> libcdda != null;
 assert youtubeSupport -> youtube-dl != null;
 
 stdenv.mkDerivation rec {
-  name = "bomi-${version}";
+  pname = "bomi";
   version = "0.9.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index ea8cb5aa3ffac9f5228f1ba765abf713dd7089a6..0f1b185ed220b1b21c39f3a386019ae9ece67b30 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.3.alpha";
-  name = "byzanz-${version}";
+  pname = "byzanz";
 
   src = fetchgit {
     url = git://github.com/GNOME/byzanz;
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix
index 34c80e1050b4480c13c63e5e712df42c9c061bcb..53d257dd9d0703f4a48fd95e59c8b757c5ac78e5 100644
--- a/pkgs/applications/video/clickshare-csc1/default.nix
+++ b/pkgs/applications/video/clickshare-csc1/default.nix
@@ -24,7 +24,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "clickshare-csc1-${version}";
+  pname = "clickshare-csc1";
   version = "01.07.00.033";
   src = fetchurl {
     name = "clickshare-csc1-${version}.zip";
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 989000297a3354834a8d0d3fc0c644b05e87f26c..1872750deb003bb7be66d236696b283065f254f1 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -4,13 +4,13 @@
 }:
 
 mkDerivation rec {
-  name = "clipgrab-${version}";
+  pname = "clipgrab";
   version = "3.8.4";
 
   src = fetchurl {
     sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
-    url = "https://download.clipgrab.org/${name}.tar.gz";
+    url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 344c47eb934aa20cac3d98623d9678a2996d5602..61894bd22f8efa85632de228427313bde6031aec 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -28,11 +28,11 @@ let
     '';
 
 in stdenv.mkDerivation rec {
-  name = "dvd-slideshow-${version}";
+  pname = "dvd-slideshow";
   version = "0.8.4-2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz";
+    url = "mirror://sourceforge/dvd-slideshow/files/${pname}-${version}.tar.gz";
     sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
   };
 
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix
index 4712dfac7573120800b25fa27309d7833fadbbfe..54be20d5faffc3a2e4457f5045e93acc658a9867 100644
--- a/pkgs/applications/video/dvdbackup/default.nix
+++ b/pkgs/applications/video/dvdbackup/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
-  name = "dvdbackup-${version}";
+  pname = "dvdbackup";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dvdbackup/${name}.tar.xz";
+    url = "mirror://sourceforge/dvdbackup/${pname}-${version}.tar.xz";
     sha256 = "1rl3h7waqja8blmbpmwy01q9fgr5r0c32b8dy3pbf59bp3xmd37g";
   };
 
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index 24aeedd6760f3fe171ad22671309cae9e3a1bb4f..495501e0c187243f7924cd4680c21771a2f87260 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -13,7 +13,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "dvdstyler-${version}";
+  pname = "dvdstyler";
   srcName = "DVDStyler-${version}";
   version = "3.1.2";
 
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index fd8cc8d86306bf5a9f499b509d0556f1e2d69424..3e26b4d68c22914bf9f04dd75631bf2d9ab9ef76 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -2,7 +2,7 @@
 , libnotify, libpulseaudio, mplayer, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mplayer-${version}";
+  pname = "gnome-mplayer";
   version = "1.0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 1c625de0dbc08983ba5a697f1634061b766ca463..f81f394ed0b8a38585dc98b6f8e1fcbdc0c3d87c 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.0";
-  name = "gpac-${version}";
+  pname = "gpac";
 
   src = fetchFromGitHub {
     owner = "gpac";
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 02a0f275f570e3bdc518c0ee4e8e8fe9eb50d9c7..037331cad9e07f153e09382b08bf94fa08a31a60 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.3";
-  name = "k9copy-${version}";
+  pname = "k9copy";
 
   src = fetchurl {
-    url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz";
+    url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz";
     sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
   };
 
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index bc6cd015b865a35314e580c851a43859e26d70f6..7dc350da647565cace8cc2f2d3e34ae36afb1f5f 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gnome2, librsvg, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "key-mon-${version}";
+  pname = "key-mon";
   version = "1.17";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz";
     sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
   };
 
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 44313f9499f5ea050820238d55b0cff598883268..33ff1821640bf0701923cd63f924c9b209e410c3 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
   majorMinorVersion = "0.12";
   patchVersion = "0b";
   version = "${majorMinorVersion}.${patchVersion}";
-  name = "kmplayer-${version}";
+  pname = "kmplayer";
 
   src = fetchurl {
     url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2";
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index b4d4312c0fac1613bee1762f55431d342f83002b..0dc97410f5479bb814e5396f1b25babc84780398 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -20,7 +20,7 @@ let
 
   lightworks = stdenv.mkDerivation rec {
     version = "14.0.0";
-    name = "lightworks-${version}";
+    pname = "lightworks";
 
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -28,7 +28,7 @@ let
           url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";
           sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";
         }
-      else throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+      else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
 
     buildInputs = [ dpkg makeWrapper ];
 
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index 717853af745cf23b585fb053a306c0803a7e0c30..0a422bb7f50c2d1752c57dd7277af2139a5132f5 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8";
-  name = "linuxstopmotion-${version}";
+  pname = "linuxstopmotion";
   
   src = fetchgit {
     url = "git://git.code.sf.net/p/linuxstopmotion/code";
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 4dd2e019d1d3cea5b3fc5dfafc088b60731207a1..c302ae1730fea040f63bd3c78c5af80ca7aa0c17 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -13,7 +13,7 @@ with stdenv;
 mkDerivation rec {
 
   version = "0.6.1";
-  name = "mapmap-${version}";
+  pname = "mapmap";
 
   src = fetchFromGitHub {
     owner = "mapmapteam";
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index cceed556f9786bcd1ad55b856bd8b29a09e63e72..a5de209854b36d44afc7a47ce19bd8f8cca304f8 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "13.2.1";
-  name = "mediathekview-${version}";
+  pname = "mediathekview";
   src = fetchurl {
     url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
     sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 5ee437a19be58890dde6c83de8ea494c8db2e535..a9876da234f7a4d0cacb22413cc99d21aa7e73c1 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -6,7 +6,7 @@
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
 stdenv.mkDerivation rec {
-  name = "minitube-${version}";
+  pname = "minitube";
   version = "2.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 70dc156d68022bf2252fa405976a161f07100780..14db747d2ce7bc4cf803aa0b29fc8ea829d59fb2 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "mjpg-streamer-${version}";
+  pname = "mjpg-streamer";
   version = "unstable-2019-05-24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index e3dcf6b3d3b3450c11331d855d617de1de91a89c..684390d3c5c77c575ba6395d44f76bb594d560f0 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -2,7 +2,7 @@
 , ffmpeg, libjpeg, libmicrohttpd }:
 
 stdenv.mkDerivation rec {
-  name = "motion-${version}";
+  pname = "motion";
   version = "4.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 81b48e25b96b195665312f44c1b1554db9906c4a..efa495a45afe6662fbfdda0aff304de92c21a226 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }:
 
 stdenv.mkDerivation rec {
-  name = "mpc-qt-${version}";
+  pname = "mpc-qt";
   version = "18.08";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 6c21a6b2012b27107b6d0384017ca8b80dc9a7c6..bb0b92eee030da5fe841a1c807260b59990605e8 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -95,7 +95,7 @@ let
   luaEnv = lua.withPackages(ps: with ps; [ luasocket ]);
 
 in stdenv.mkDerivation rec {
-  name = "mpv-${version}";
+  pname = "mpv";
   version = "0.29.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 74167a67bd2b70e9c142986aba709bd34c324a2d..d5c46491cf415dafe654c50951011b62efea8924 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mythtv-${version}";
+  pname = "mythtv";
   version = "29.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 6299cd7e59375d41a9dc49c028264ecfbc192ad5..4617d1d17dc04605a6fe3792dd66f68a5b0943e4 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -12,7 +12,7 @@ let
   };
   seexpr = stdenv.mkDerivation rec {
     version = "1.0.1";
-    name = "seexpr-${version}";
+    pname = "seexpr";
     src = fetchurl {
       url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
       sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 983bdff106ed465a6efc43abd67cf948dc2886c2..cdcdea3dd26d39e345ca5359a57dbc4c1367bb53 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -36,7 +36,7 @@
 let
   optional = stdenv.lib.optional;
 in mkDerivation rec {
-  name = "obs-studio-${version}";
+  pname = "obs-studio";
   version = "23.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 14f40ad8901f467e2f25e10ea3078f9641def761..52aa57bf19861e48d84d5052a87447e1aadbd3c5 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "obs-linuxbrowser-${version}";
+  pname = "obs-linuxbrowser";
   version = "0.6.1";
   src = fetchFromGitHub {
     owner = "bazukas";
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 1c124df3023815ccd831ddd31ff7173530ff0a3b..bef9537b8067511a75c2a1b84160d55f65bccd13 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -12,7 +12,7 @@ let
   # don't bother exposing the package to all of nixpkgs.
   gst-transcoder = stdenv.mkDerivation rec {
     version = "1.14.1";
-    name = "gst-transcoder-${version}";
+    pname = "gst-transcoder";
     src = fetchFromGitHub {
       owner = "pitivi";
       repo = "gst-transcoder";
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index d55c3882f30c060e6b5f3945c0fb5eaca11ef0f6..a4f9d6222aa6da5a550db92ca05c19b4680b7317 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -35,7 +35,7 @@ let
     };
   };
 in mkDerivation rec {
-  name = "plex-media-player-${version}";
+  pname = "plex-media-player";
   version = "2.40.0.1007";
   vsnHash = "5482132c";
 
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index ea4816ad6d07b343045fae2c904ac604a18df025..327a2034265e19f5f996bb21b98790744485f752 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -5,10 +5,9 @@
 stdenv.mkDerivation rec {
   pname = "qstopmotion";
   version = "2.4.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";
     sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
   };
 
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index c3204cc9c0ce81734d6cd79b0d0df2cf66a44e7a..8f9e3131d8aaef23d08af735f1de561cc9845f01 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libquvi-${version}";
+  pname = "libquvi";
   version="0.9.4";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 603534be4c8be54524f40f72cc07a7cfce370e8f..e54fc0eae4ba08d46715c9e227be0edc6eb82e2e 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "quvi-scripts-${version}";
+  pname = "quvi-scripts";
   version="0.9.20131130";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 333f4e6ab4de9cff1ec272727f08fc06e6b5cd6d..972e08bb61be1f7f86b8f88f76890c24511b025d 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "quvi-${version}";
+  pname = "quvi";
   version="0.9.5";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix
index 8797ad8f953bc72070e1fc8ee9c177225fa973a1..e4d6e14d098dfc26cbfd3b891c20142b7ea751bd 100644
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/pkgs/applications/video/recordmydesktop/default.nix
@@ -2,7 +2,7 @@
 , libICE, libSM, libX11, libXext, libXfixes, libXdamage }:
 
 stdenv.mkDerivation rec {
-  name = "recordmydesktop-${version}";
+  pname = "recordmydesktop";
   version = "0.3.8.1-svn${rev}";
   rev = "602";
 
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index 984b623cee7ef26c7179d378ce3bbd53e96b899d..d59b02d4b0ae27e82fc72933d9dc7c4642f52010 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -5,7 +5,7 @@ let
   binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
 
 in stdenv.mkDerivation rec {
-  name = "gtk-recordmydesktop-${version}";
+  pname = "gtk-recordmydesktop";
   version = "0.3.8-svn${recordmydesktop.rev}";
 
   src = fetchsvn {
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index 5608013515153c62f1215241efdcf0e5c6068c3a..0864edfcf38e3ef5c785673931cde8e8f2e4566f 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -5,7 +5,7 @@ let
   binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
 
 in stdenv.mkDerivation rec {
-  name = "qt-recordmydesktop-${version}";
+  pname = "qt-recordmydesktop";
   version = "0.3.8-svn${recordmydesktop.rev}";
 
   src = fetchsvn {
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 2f0b54edc8fb7b2cb2cabf51316c0748bd745e20..176c4be4946d3e7871003c80675635ef6e42aa9a 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
 assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 mkDerivation rec {
-  name = "shotcut-${version}";
+  pname = "shotcut";
   version = "19.08.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index c3ef5eae676ad63e171c9a9e749f188a4aede151..29ad928e27cd124daca61a60fca20f7bddd45f9b 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -3,7 +3,7 @@
 }:
 
 mkDerivation rec {
-  name = "simplescreenrecorder-${version}";
+  pname = "simplescreenrecorder";
   version = "0.3.11";
 
   src = fetchurl {
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 59e541892eefcbf964df3c8091e0f6cd525233bc..352569e5ab39dc9bfb3257bf6b748acf600f696e 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -2,10 +2,10 @@
 
 mkDerivation rec {
   version = "19.6.0";
-  name = "smtube-${version}";
+  pname = "smtube";
 
   src = fetchurl {
-    url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
   };
 
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 79f092a882c7fefe73652a3928afdda65f4acfe8..a5efddc9f1a8fabe9d80ea4675a7abbb767b12ce 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.1.1";
-  name = "streamlink-${version}";
+  pname = "streamlink";
 
   src = fetchFromGitHub {
     owner = "streamlink";
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index ea51471d9aa41d10dd605c151473ac4be7f3dd72..03fc1f5399af3884642f66c6dbdadd610868ed1c 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "subtitleeditor-${version}";
+  pname = "subtitleeditor";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "kitone";
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index 83ca41e201c96fafcf981e7881a47387ad9f05d9..bc6561a0bbd087b537bef9a48d68b91e4258a70a 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -6,7 +6,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "tivodecode-${version}";
+  pname = "tivodecode";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz";
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index dda70d797e5e9af85d881d89970c65816fc320da..a38076ca42b61ba1ed381fd290ad5bed5de33180 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -24,11 +24,11 @@ with stdenv.lib;
 assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);
 
 stdenv.mkDerivation rec {
-  name = "vlc-${version}";
+  pname = "vlc";
   version = "3.0.8";
 
   src = fetchurl {
-    url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
+    url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
     sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6";
   };
 
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 2bf74da3d0f22cff14b50832deddcd679e219525..3c4f607c6affbbb068eda34fbcab7292b114cbe6 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "w_scan-${version}";
+  pname = "w_scan";
   version = "20170107";
 
   src = fetchurl {
-    url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
+    url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2";
     sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
   };
 
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 0c28b4d57372d8d554eb48b24ac87821f147dd36..8258f8583090dd9b887a9d31a931847cf8e05dc3 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -38,7 +38,7 @@
     udev
     ]);
   in stdenv.mkDerivation rec {
-    name = "webtorrent-desktop-${version}";
+    pname = "webtorrent-desktop";
     version = "0.20.0";
 
     src =
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 64fcf0ba04a51f49e57d4851ed4d56981166123d..176d9a87aed0d2c12dbe527a9611608a66e2a79b 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "wxcam-${version}";
+  pname = "wxcam";
   version = "1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz";
     sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
   };
 
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index ae048f1bdac4062b75e80bf531d94ae75be0ef0e..ba72763cdaf280a749ee678d4ef28888373de5b9 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "xscast-unstable-${version}";
+  pname = "xscast-unstable";
   version = "2016-07-26";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 15d98dc9be50b9ec0b64619ebd414b5a2f4160c1..6e61ef098f357b3aee997c149dde4f3bcb9d014c 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null);
 
 stdenv.mkDerivation rec {
 
-  name = "8086tiny-${version}";
+  pname = "8086tiny";
   version = "1.25";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
index e7cd5b7bde68be4250e858088d999e7a0e682b50..02fb256b38cea7df9d29473259044ecffa56297a 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aqemu-${version}";
+  pname = "aqemu";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index f9d7128330fbbe7a338eff5fd73a7b6f55a52727..72db4f1e5aa50dd94b5421cf8e0a863e6197db65 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -18,11 +18,11 @@ assert curlSupport -> (curl != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "bochs-${version}";
+  pname = "bochs";
   version = "2.6.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
     sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
   };
 
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
index 13060a50290b8ff0dbd9887d2f6ec10070976d97..9cdaec1c698af0c802520f2cc2f4d3df658a99e7 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, iasl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "cbfstool-${version}";
+  pname = "cbfstool";
   version = "4.9";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index d21bc8cc32b52e3fe2338f4726b52ba952816750..b770c6ed0a5995f2b7f545302805bcf9e162c644 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "containerd-${version}";
+  pname = "containerd";
   version = "1.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix
index 0af9abc852ef9c9d98b857d61d997b782d649fa2..ed4db853c3892700e3123a0f1a36b6b7b888d362 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/pkgs/applications/virtualization/docker/distribution.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "distribution-${version}";
+  pname = "distribution";
   version = "2.6.2";
   rev = "v${version}";
 
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 946014e5cc9a66671cfded5f5f52430c8e6ee2e3..351353ceb96e998e96cf2a741ca9e094ff585b82 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, p7zip }:
 stdenv.mkDerivation rec {
-  name = "win-virtio-${version}";
+  pname = "win-virtio";
   version = "0.1.141-1";
 
   phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index cce5a674f7cdcc43f6b8855532b6ca9bc25e4cbc..6f35257b50fd36e20d2aeebf6ad1736821109d51 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dynamips";
   version = "0.2.21";
 
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index ab971fe64c983e3f8fcfd55d702158526732d35f..691c74301e3933779f6a9827d38c7acc25c76117 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name    = "${pname}-${version}";
   pname   = "amazon-ecs-agent";
   version = "1.18.0";
 
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index 58f4dd48cc8b9ed8dbb71ad8d457f39f10ba5baf..0f53a5c4f14d6d47fe836362308e64b46ffd49cf 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "looking-glass-client-${version}";
+  pname = "looking-glass-client";
   version = "B1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index 197b3045cf2736c791fa7ebfbd21d6afc5460768..b58a5108ebad0fb535c9a6477f352de436307568 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -25,7 +25,7 @@ with lib; let
   };
 
   nvidia-container-runtime-hook = buildGoPackage rec {
-    name = "nvidia-container-runtime-hook-${version}";
+    pname = "nvidia-container-runtime-hook";
     version = "1.4.0";
 
     goPackagePath = "nvidia-container-runtime-hook";
@@ -46,7 +46,7 @@ with lib; let
   });
 
 in stdenv.mkDerivation rec {
-  name = "nvidia-docker-${version}";
+  pname = "nvidia-docker";
   version = "2.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
index 46b8e3ba43c35ccfc8b732f3a88e71b66cad30af..71c02ab4de50ffa730ade12b7c8c778e37677c70 100644
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -12,7 +12,7 @@ with lib; let
   };
 
 in stdenv.mkDerivation rec {
-  name = "libnvidia-container-${version}";
+  pname = "libnvidia-container";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 200542f4de84b9e1fc8783a6400af1e9239c0c64..ee241abda7f87efb22653323d45c2da9c5621c53 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -5,7 +5,7 @@
   withX ? true }:
 
 stdenv.mkDerivation rec {
-  name = "open-vm-tools-${version}";
+  pname = "open-vm-tools";
   version = "10.3.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index f7ea6df8493b70d2b24e756dd74076cd57e18e5b..ff768cb7878c07ae70cc979a2f833564fa0d411b 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "podman-${version}";
+  pname = "podman";
   version = "1.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 8777f7cc2db2b3b6dbdea839b6edea4d5c54caec..d8a2878e3f79a03e252148c13787b8df304dee69 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "remotebox-${version}";
+  pname = "remotebox";
   version = "2.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 0f53ede188ce68d85aae729666996c402da9c7e3..fd0bd92faa6076485053700c7d29448924a56256 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -13,8 +13,8 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.30.0";
-  name = "rkt-${version}";
-  BUILDDIR="build-${name}";
+  pname = "rkt";
+  BUILDDIR="build-${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "coreos";
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 10c7d17209c32d4dc2cba3bcb460ea5955283358..6357f9fadff9985a088eb7f9ec26baa9cea2a9ea 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "runc-${version}";
+  pname = "runc";
   version = "1.0.0-rc8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index 5aa73528e9d72f569ff0121ff390f9c08fac2b06..32528627a3c848c29518d50f3a7e03ab4799eb25 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "seabios-${version}";
+  pname = "seabios";
   version = "1.11.0";
 
   src = fetchurl {
-    url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
+    url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz";
     sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
   };
 
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index e146086b55490ccd3fef08b536f0f9b6b67a4edb..60825063cabcb768bb666ef8311a80ae963d1774 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -14,7 +14,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "singularity-${version}";
+  pname = "singularity";
   version = "3.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 25c19cd79c7f8743f70483eb08c75a7b7dff4689..39508412333c3ee3ad9db12cbec011a48694846c 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.18.0";
-  name = "tini-${version}";
+  pname = "tini";
 
   src = fetchFromGitHub {
     owner = "krallin";
diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix
index a8f113307251e6878ab9b7294a45e647017e2754..224f77ed32d407b6283626d4e45ac394a6f64ca9 100644
--- a/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/pkgs/applications/virtualization/tinyemu/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, openssl, curl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "tinyemu-${version}";
+  pname = "tinyemu";
   version = "2018-09-23";
   src = fetchurl {
-    url = "https://bellard.org/tinyemu/${name}.tar.gz";
+    url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz";
     sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
   };
   buildInputs = [ openssl curl SDL ];
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index c1dbad94250a546d6bdd736162418f4396184590..5a98e71c91662fb62479c6fc55c9dc5b4514ea0e 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "virt-manager-qt-${version}";
+  pname = "virt-manager-qt";
   version = "0.70.91";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 493307d0d07837685dde9d7c0774dde0f71de6a2..382ebba3c57e96ba48e36ec58f7cf53fe8f73afc 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ocamlPackages, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "virt-top-${version}";
+  pname = "virt-top";
   version = "2017-11-18-unstable";
 
   src = fetchgit {
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
index 8a339ac83224524880a12dfe63bb0b5494e74a5b..7ea83b015592130356d9384e9a4aacecc414eb22 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "virt-what-${version}";
+  pname = "virt-what";
   version = "1.19";
 
   src = fetchurl {
-    url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+    url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
     sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk";
   };
 
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 8222fb50a8f934bc3620c17fa7d7bec1dcd7392b..6931e492e99c7146fd0c2fb8bec71a5ebcb4e2ea 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
 let version = "0.600.4"; in
 
 stdenv.mkDerivation rec {
-  name = "virtinst-${version}";
+  pname = "virtinst";
+  inherit version;
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1a6ba5ac527357fd17add66021c24a709e1c16a3..20930b865370021e4b4b64734cc5b55b9e4ae241 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -24,7 +24,8 @@ let
   main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv";
   version = "6.0.8";
 in stdenv.mkDerivation {
-  name = "virtualbox-${version}";
+  pname = "virtualbox";
+  inherit version;
 
   src = fetchurl {
     url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 3d6efcfc84438f1927cd23f3e6b5333b3381e6b6..464fe46b499c802ffa3ccab98c2d41e4e09b110a 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, glibc }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "vpcs";
   version = "0.8";
 
   src = fetchurl {
-    name = "${name}.tar.bz2";
-    url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
     sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
   };
 
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 59d6421083747466133409bb978b02a5e04a26af..ea8a24e57a3435fdc1fcd91b92c3d3794a903151 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
 stdenv.mkDerivation rec {
-  name = "x11docker-${version}";
+  pname = "x11docker";
   version = "6.0.0";
   src = fetchFromGitHub {
     owner = "mviereck";
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index d3990a70bcac81107e2626aa54ee490827636114..26b55b364f17e989a36bc3a2099fc21be6aba0db 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:
 
 stdenv.mkDerivation rec {
-  name    = "xhyve-${version}";
+  pname = "xhyve";
   version = "20190124";
 
   src = fetchurl {
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 116180f5ec3681191c589a081142b21ae11a2099..4b61fe3d7e6c49e6bf924a5a730e2c05f435462c 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2";
-  name = "2bwm-${version}";
+  pname = "2bwm";
 
   src = fetchFromGitHub {
     owner  = "venam";
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 46a86da1d66bf8cc6253cd9522da294e16e50393..5fcbff26b15444c81005a9922006deb9edba0d7f 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "afterstep-${version}";
+  pname = "afterstep";
   version = "2.2.12";
   sourceName = "AfterStep-${version}";
 
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 5c897926432e7a40bf07401bed154c33cbeac7f1..2551ea80550efa7002c7887f9cc24cd4e73180fe 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -13,7 +13,7 @@
 assert gtk3Support -> gtk3 != null;
 
 with luaPackages; stdenv.mkDerivation rec {
-  name = "awesome-${version}";
+  pname = "awesome";
   version = "4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
index 582f9cb61f8e079ab625dc778767fbb150c3dbd3..40cebb572af35528da6a47baf1359950d90755ce 100644
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
 
 stdenv.mkDerivation rec {
-  name = "bevelbar-${version}";
+  pname = "bevelbar";
   version = "16.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index b81f662543774f0f7144aa01cd474d5c23e0ec21..e863a382470f0c114acd10f12a892ff79ab3e803 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bspwm-${version}";
+  pname = "bspwm";
   version = "0.9.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
index f55c55110a292c654459ccd304636ce74e087156..cf90b1fad63b4f20d187792d034912924965271a 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "btops-${version}";
+  pname = "btops";
   version = "0.1.0";
 
   goPackagePath = "github.com/cmschuetz/btops";
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index 0c13691a36ac82df0edb66211654a439b42bb143..cf45dfa86407fcef62f164092b8edfe475e0e485 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fbpanel-${version}";
+  pname = "fbpanel";
   version = "6.1";
   src = fetchurl {
-    url = "mirror://sourceforge/fbpanel/${name}.tbz2";
+    url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2";
     sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
   };
   buildInputs =
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index c92b70153a72f941ca62f319b9d82fa3cb54aa6d..404044fa3fa13fc96c1016f63bfdbd1732d37e7c 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -7,11 +7,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "fluxbox-${version}";
+  pname = "fluxbox";
   version = "1.3.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fluxbox/${name}.tar.xz";
+    url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz";
     sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
   };
 
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 20a95f36cee3ab1507171f0b873419f4ce4eb330..27657c10a7e3c498574d896c6f5fcb076ea0d3be 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -10,10 +10,9 @@ assert gestures -> libstroke != null;
 stdenv.mkDerivation rec {
   pname = "fvwm";
   version = "2.6.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
   };
 
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index 83fe3ef163a3634459ee7f64a36b4ace2281fef9..c62edd6d71a18dd6dd8adf3fb8356747791208a7 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -12,7 +12,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "i3blocks-gaps-${version}";
+  pname = "i3blocks-gaps";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index bd088db8a366cc654f0b91bf5e1cf25b05b05236..2246d77173a04ceb7f2c4be0e56a39514e67a8fe 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "i3blocks-${version}";
+  pname = "i3blocks";
   version = "unstable-2019-02-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index d72e56d2489a4225f62d32d1a422f9d3a5ddd8aa..31a96ba1788b2327d6d3dbdae1c64598506e62ce 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,11 +4,11 @@
 , xorgserver, xvfb_run }:
 
 stdenv.mkDerivation rec {
-  name = "i3-${version}";
+  pname = "i3";
   version = "4.17";
 
   src = fetchurl {
-    url = "https://i3wm.org/downloads/${name}.tar.bz2";
+    url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf";
   };
 
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 54f238317068ffabb5bbef110cd788b086493059..33aac1cf4b6599395b453e56be08058d487c1cc2 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "i3ipc-glib-${version}";
+  pname = "i3ipc-glib";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fa88a7e26befa93c6c0b8d344382e6334ef08f67..2fb6fb44833d983abac8057649f0b71faa6f838d 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.12.c";
-  name = "i3lock-color-${version}";
+  pname = "i3lock-color";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 9d02dbafa5deae62a446c286d9210f8864e4a88f..3e976f8919f81ebf4e696bd1d115bf278fe781f5 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -2,11 +2,11 @@
   xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-${version}";
+  pname = "i3lock";
   version = "2.12";
 
   src = fetchurl {
-    url = "https://i3wm.org/i3lock/${name}.tar.bz2";
+    url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2";
     sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh";
   };
 
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 2f6199122f145ead5f1c15c377f7109ed40546c0..71a4ec3549a7c2481177fd74aafb03d073aa0a6c 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "icewm-${version}";
+  pname = "icewm";
   version = "1.4.2";
 
   buildInputs =
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 6a7c1436b09df6db5b48edc962633dfc6612ce4e..3668b344be50856ea8e8c805324a0a504b5cbf7f 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -4,7 +4,7 @@
   librsvg, freetype, fontconfig }:
 
 stdenv.mkDerivation rec {
-  name = "jwm-${version}";
+  pname = "jwm";
   version = "1685";
   
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index 3b764e7095be9b8501a59cb9a25dc953fce14fb3..7df2847669f56bc819a88289a1de56d1a7f6a1bc 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
 
 stdenv.mkDerivation rec {
-  name = "jwm-settings-manager-${version}";
+  pname = "jwm-settings-manager";
   version = "2018-10-19";
   
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 9abbd891e3107ab732787e7e5500ce31e74bb2ff..3c537d6c931b34323006d2bf3dc04647cffe9ccd 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "matchbox-${version}";
+  pname = "matchbox";
   version = "1.2";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix
index 722566ea2e9eead75a405c87d77a5a49cf57224c..026ee2e1287e6a50e90d50ed435e1c4ab0768c3a 100644
--- a/pkgs/applications/window-managers/neocomp/default.nix
+++ b/pkgs/applications/window-managers/neocomp/default.nix
@@ -23,7 +23,7 @@ let
   rev   = "v0.6-17-g271e784";
 in
 stdenv.mkDerivation rec {
-  name    = "neocomp-unstable-${version}";
+  pname = "neocomp-unstable";
   version = "2019-03-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 8c6926dd2c69d8245d052f0ea8d449679ca8d3f4..c8d526b6d28826610453bff3dde97e90635fd544 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -3,7 +3,7 @@
 , imlib2, pango, libstartup_notification, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-${version}";
+  pname = "openbox";
   version = "3.6.1";
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "http://openbox.org/dist/openbox/${name}.tar.gz";
+    url = "http://openbox.org/dist/openbox/${pname}-${version}.tar.gz";
     sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
   };
 
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 00ff62520105bd5c56f62a3943f70cbe755b034c..d449fc91c0d386c9d047d942a9c579ea9aa5c2c5 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "oroborus-${version}";
+  pname = "oroborus";
   version = "2.0.20";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
index b2677218e856eaab23f097a6b6c1afdee256ac41..38255dce72246ebfa682e58030d6760670cc7c1f 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "pekwm-${version}";
+  pname = "pekwm";
   version = "0.1.17";
 
   src = fetchurl {
-    url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2";
+    url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2";
     sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";
   };
 
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 0a1a095e0ced1654bddaf95f999c043740c924fb..11a69020ee623721e70baa2aca5315cfecdfcb01 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ratpoison-${version}";
+  pname = "ratpoison";
   version = "1.4.9";
 
   src = fetchurl {
-    url = "mirror://savannah/ratpoison/${name}.tar.xz";
+    url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz";
     sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
   };
 
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index d8bb58c21b6630eb80f3ef2342446b50bb25b504..f9bcb28e45579802c7e5c1ec824e3a45158e0e3e 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -10,7 +10,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
 
-  name = "sawfish-${version}";
+  pname = "sawfish";
   version = "1.12.90";
   sourceName = "sawfish_${version}";
 
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 81901be0e60b9348342d42cad9dc5a87a4fee386..7233ff2410bd19baf563069f94b03c4c1ec78efa 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "spectrwm-${version}";
+  pname = "spectrwm";
   version = "2.7.2";
 
   src = fetchurl {
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix
index 64fa600765b3f14a1412eee67f5002f664901f79..f0f724d6cf0e46c274db32b14b3604ad30fa4263 100644
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/pkgs/applications/window-managers/stalonetray/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "stalonetray-${version}";
+  pname = "stalonetray";
   version = "0.8.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/stalonetray/${name}.tar.bz2";
+    url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2";
     sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n";
   };
 
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix
index 56d2515ed7b212ab94baf1bb7327cd57c511fd67..a6f2961ed3fc86ffd4346f4355f4e070850f3aaa 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/pkgs/applications/window-managers/stumpish/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "stumpish";
   version = "0.0.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "stumpwm";
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix
index 595197a3f6f0d12194d665304569c4c02d21b050..86301492c4687f264165ed63a3e83f6cdc686e96 100644
--- a/pkgs/applications/window-managers/sway/bg.nix
+++ b/pkgs/applications/window-managers/sway/bg.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swaybg-${version}";
+  pname = "swaybg";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index c9daed461c55c6c501b28c198c0ec15b6e81e43e..bc917e76f97413f594eef8f5d76d278caad7da2a 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swayidle-${version}";
+  pname = "swayidle";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index 80d6ed4e0729d608c52eaf6e3c592e751cda1135..fe445a6b7adfe70602dde8f936238472b805594c 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swaylock-${version}";
+  pname = "swaylock";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index 817184d6cb0017b15663bbf19ffa179a43851827..2404129b165d94313b740fae5e2832fd3f2cb4f8 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sxhkd-${version}";
+  pname = "sxhkd";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/way-cooler/wlc.nix b/pkgs/applications/window-managers/way-cooler/wlc.nix
index 3f2891ffd510c187bd045d85ed3958a33b68781f..03d0b3023f718499f8c67556000fd1be37f79b43 100644
--- a/pkgs/applications/window-managers/way-cooler/wlc.nix
+++ b/pkgs/applications/window-managers/way-cooler/wlc.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "wlc-${version}";
+  pname = "wlc";
   version = "0.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index a88281369e8f32ac8735cf44a37518d4d283f5d5..99416fcf778a117223bf1c37833d05f13298a87e 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -9,11 +9,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "weston-${version}";
+  pname = "weston";
   version = "6.0.1";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
   };
 
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
index caf97c6510de4f1cf65502ada2fad022e9afaf9a..d0a1de7f6006e9447cb5f6f3e0e37dc9b41d69ac 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.40"; in
 stdenv.mkDerivation {
-  name = "windowlab-${version}";
+  pname = "windowlab";
+  inherit version;
 
   src = fetchurl {
     url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index d83c4493accb34eac361786c7ef322a02a005edf..8ad63999289e6a671c56f0f3b0c5f1f7e605dc7f 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -3,7 +3,7 @@
 , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
 
 stdenv.mkDerivation rec {
-  name = "windowmaker-${version}";
+  pname = "windowmaker";
   version = "0.95.8";
   srcName = "WindowMaker-${version}";
 
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix
index d615b4fe010cc4bb5e5c86c472e31c7b75859617..ad611f8dabe184f7268c673e258e57d5ce4ef84a 100644
--- a/pkgs/applications/window-managers/wmfs/default.nix
+++ b/pkgs/applications/window-managers/wmfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnumake,
   libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
 stdenv.mkDerivation rec {
-  name = "wmfs-${version}";
+  pname = "wmfs";
 
   version = "201902";
 
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 5a8b68df364ad69ab28fc87bb3e839a4052b4a85..e0f2243827c5da7f8daf41df4930b2bf22756c74 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   rev = "2823";
   version = "hg-2012-12-09";
-  name = "wmii-${version}";
+  pname = "wmii";
 
   src = fetchurl {
     url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip;
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index 678ebad75dd21e8cec4cf3a3e0aaf80772c1cccf..f7867882d2229a070185865813f95d9d206d392c 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -5,7 +5,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "yabar-${version}";
+  pname = "yabar";
+  inherit version;
 
   src = fetchFromGitHub {
     inherit rev sha256;
diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix
index aca4e340e267a5a9c3d2e55fb3a74377b1133b16..d93001884982f80bb4561aaeae62bb7093dfdb8c 100644
--- a/pkgs/build-support/templaterpm/default.nix
+++ b/pkgs/build-support/templaterpm/default.nix
@@ -1,7 +1,7 @@
 {stdenv, makeWrapper, python, toposort, rpm}:
 
 stdenv.mkDerivation rec {
-  name = "nix-template-rpm-${version}";
+  pname = "nix-template-rpm";
   version = "0.1";
 
   buildInputs = [ makeWrapper python toposort rpm ];
diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix
index 51ebe704beac8cf815fb89f30e52a99baa5c5191..a53ead29c1e8f0187d4442314525de8983ea707b 100644
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, python, zip, fop }:
 
 stdenv.mkDerivation rec {
-  name = "bgnet-${version}";
+  pname = "bgnet";
   version = "3.0.21";
 
   src = fetchurl {
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index c4ce27501721afc58dd2136009d89356bd653d4c..8b0696408e63cf635d6dcd3d2a8bb804b2c554db 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-${version}";
+  pname = "man-pages";
   version = "5.02";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
+    url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
     sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
   };
 
diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix
index 08690b7cecfcb5d5c8dfa8caf52adaf78b0bfd0b..b2a6eaa1535286b5b969d31ca18b02812ab55651 100644
--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/pkgs/data/documentation/mustache-spec/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mustache-spec-${version}";
+  pname = "mustache-spec";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 25df45258a6f21833ea29e87a46200aac1bdf517..81fa0ea945d3533061cf8ced61b1d998eea4dc4e 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, curl, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "stdman-${version}";
+  pname = "stdman";
   version = "2018.03.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 9bca390f96e222d8b3c986ba15298ecbfbf2a90b..2566b162d65929e123eeab6bddd3f8a1dca40825 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -3,7 +3,7 @@
 , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:
 
 mkDerivation rec {
-  name = "zeal-${version}";
+  pname = "zeal";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index e563d201ff3df5d5649875ade1e138c0241bb2d4..38a2d8fe56ca205a678c631e03590f6403ebedd3 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -24,7 +24,8 @@ let
   };
 
   full-ttf = stdenv.mkDerivation {
-    name = "dejavu-fonts-full-${version}";
+    pname = "dejavu-fonts-full";
+    inherit version;
     nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF];
 
     src = fetchFromGitHub {
@@ -44,14 +45,16 @@ let
   };
 
   minimal = stdenv.mkDerivation {
-    name = "dejavu-fonts-minimal-${version}";
+    pname = "dejavu-fonts-minimal";
+    inherit version;
     buildCommand = ''
       install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf
     '';
     inherit meta;
   };
 in stdenv.mkDerivation {
-  name = "dejavu-fonts-${version}";
+  pname = "dejavu-fonts";
+  inherit version;
   buildCommand = ''
     install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf
     ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
index 27306a0ef05ced3dae19cf6702d2d905fd1daf2f..061bbb445fb2466b09a2f7d43bb7f57d597cd9e6 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.92";
-  name = "dina-font-pcf-${version}";
+  pname = "dina-font-pcf";
 
   src = fetchurl {
     url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 4837425d19a7e40aca2a89322a86bf68aeefd5b8..81a1b5649b36858cfa2b2841fdc538f9122ea7af 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "dosemu-fonts-${version}";
+  pname = "dosemu-fonts";
   version = "1.4.0";
 
   src = fetchurl {
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index 3e71352f8025cfff8a8e3059e6f2137bbc3a4084..171ec10c8f16f7f2f3f3b76cc0903ffed799dd3e 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
 
 stdenv.mkDerivation rec {
-  name = "emojione-${version}";
+  pname = "emojione";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 59ac4ec850b1ad14047c9236cdc0204cb387ee1c..1f861afcf83f8c11e65fe8d5995ff81558e51214 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gohufont-${version}";
+  pname = "gohufont";
   version = "2.1";
 
   src = fetchurl {
-    url = "http://font.gohu.org/${name}.tar.gz";
+    url = "http://font.gohu.org/${pname}-${version}.tar.gz";
     sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
   };
 
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index d743d2ccbd42471943b7afa4726bdf0bd6b5f450..707beb41231d94e537513ca3c6707639a9c2c9b0 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "google-fonts-${version}";
+  pname = "google-fonts";
   version = "2019-07-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 7eded5deab48ed89cdac7c10a93cb85a86da49fe..94c43b11285ee8d3c22a90074ab5156502b72eb6 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, google-fonts }:
 
 stdenv.mkDerivation rec {
-  name = "inconsolata-${version}";
+  pname = "inconsolata";
 
   inherit (google-fonts) src version;
 
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix
index 8b557008175754584e4bcbb8e4d7975728b04f67..aec48b12086077fce501355b08f259d865bf1184 100644
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, fontforge}:
 
 stdenv.mkDerivation rec {
-  name = "inconsolata-lgc-${version}";
+  pname = "inconsolata-lgc";
   version = "1.3";
 
   src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
     find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
-    install -m444 -Dt $out/share/doc/${name} LICENSE README
+    install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index 4910ef21f9ab62d279d14d7adb307d9c19028af6..d079ae59b0d6f6de6c52df34757f8774c7b7d378 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, requireFile, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "input-fonts-${version}";
+  pname = "input-fonts";
   version = "2017-08-10"; # date of the download and checksum
 
   src = requireFile {
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index 6ed540121a2c57aff1a2f833b7ef833b10b13fe6..cf89a8fcb8f123f9a052d5dc8afeb4f0a91a32f7 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -3,7 +3,8 @@
 let version = "20030809";
 in
 stdenv.mkDerivation {
-  name = "kochi-substitute-${version}";
+  pname = "kochi-substitute";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";
diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix
index ec932ab978c2193faa08d25b15fe5dd0e24010f8..7a68c9deb5a62889900e4266d3021c7474daf6b3 100644
--- a/pkgs/data/fonts/libre-caslon/default.nix
+++ b/pkgs/data/fonts/libre-caslon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libre-caslon-${version}";
+  pname = "libre-caslon";
   version = "1.002";
 
   srcs = [
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
     cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
     cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
-    cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name}
+    cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version}
   '';
 
   outputHashAlgo = "sha256";
diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix
index d9e7ec66ee67deeba405807e36a0c331b42fc34d..773b53c889218f8067bfc12120987ae2212682a7 100644
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/pkgs/data/fonts/lobster-two/default.nix
@@ -50,15 +50,15 @@ let
 in
 
   stdenv.mkDerivation rec {
-    name = "lobstertwo-${version}";
+    pname = "lobstertwo";
     version = "1.006";
 
     phases = ["installPhase"];
 
     installPhase = ''
       mkdir -p $out/share/fonts/opentype
-      mkdir -p $out/share/doc/${name}
-      cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name}
+      mkdir -p $out/share/doc/${pname}-${version}
+      cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name}
       cp -v ${bold.file} $out/share/fonts/opentype/${bold.name}
       cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name}
       cp -v ${italic.file} $out/share/fonts/opentype/${italic.name}
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index f990575def0fc748b14653a98072205a1314f855..a041f9ce907a0fb9bdee86a60c4fd434bf8a2f71 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
   version = "1.2.1";
 
-  name = "meslo-lg-${version}";
+  pname = "meslo-lg";
 
   meslo-lg = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
-    name="${name}";
+    name="${pname}-${version}";
     sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h";
   };
 
   meslo-lg-dz = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true";
-    name="${name}-dz";
+    name="${pname}-${version}-dz";
     sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
   };
 
diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix
index 228952aaa56dd337be3a2894852aa75589a35d2d..8a089ea9e79f507897b76c898e8413cfc164e650 100644
--- a/pkgs/data/fonts/migmix/default.nix
+++ b/pkgs/data/fonts/migmix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "migmix-${version}";
+  pname = "migmix";
   version = "20150712";
 
   srcs = [
diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix
index 193e98d01a4bde2c633afcae36c9239b47835c2a..775d1766894cc0628152e6711a5ae2e7d3b16bee 100644
--- a/pkgs/data/fonts/migu/default.nix
+++ b/pkgs/data/fonts/migu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "migu-${version}";
+  pname = "migu";
   version = "20150712";
 
   srcs = [
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
index 2bc5a82fa94f1e5c265063b18133442c44fd8028..c4cf4f142516a261819f5ddd3f5dc27495865505 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, fontforge }:
 
 stdenv.mkDerivation rec {
-  name = "monoid-${version}";
+  pname = "monoid";
   version = "2016-07-21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index c08630335d4a1771daa5f14b183168bcac5cebfe..59b0f89e45ed02bfbbb3b68d86f357e4a69a87b6 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "nerdfonts-${version}";
+  pname = "nerdfonts";
   src = fetchFromGitHub {
     owner = "ryanoasis";
     repo = "nerd-fonts";
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 5043e031c08f961fdb0dedfaa107356e27aa5475..0acb8e2c7bed32dd61b2525ce31e221b68b39f65 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -90,7 +90,8 @@ rec {
     };
   };
   noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation {
-    name = "noto-fonts-emoji-${version}";
+    pname = "noto-fonts-emoji";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "googlei18n";
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index 376a47434e1815198a32747343c0fea2e101c39e..f4c36f34074c71d5d5cac17ec6a8492cb9ce941f 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,8 +1,8 @@
 { fetchFromGitHub, pythonPackages, lib }:
 
 pythonPackages.buildPythonPackage rec {
+  pname = "nototools";
   version = "unstable-2019-03-20";
-  name = "nototools-${version}";
 
   src = fetchFromGitHub {
     owner = "googlefonts";
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix
index 2667562b1b0202daed824797f5efb5ca2ce0d1a0..ab794992e45fd8e9e3d0965f3a4bfc633b5bfe98 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, google-fonts, migu, fontforge, which }:
 
 stdenv.mkDerivation rec {
-  name = "ricty-${version}";
+  pname = "ricty";
   version = "4.1.1";
 
   src = fetchurl {
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index 2bdb96228d9c9915504df48fe7de86b833d4083b..2e83d5b12d4cdf4bab28d9535dfa2bf632665818 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fontforge, pythonFull }:
 
 stdenv.mkDerivation rec {
-  name = "rictydiminished-with-firacode-${version}";
+  pname = "rictydiminished-with-firacode";
   version = "0.0.1";
   src = fetchgit {
     url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index 175acb22d7b233def89ba6c7004aa237d2e0faff..d55e3b753dd75706d0b51e2de484f6b2a3065548 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -5,7 +5,7 @@ let
   commit = "883939708704a19a295e0652036369d22469e8dc";
 in
 stdenv.mkDerivation rec {
-  name = "roboto-mono-${version}";
+  pname = "roboto-mono";
   version = "2016-01-11";
 
   srcs = [
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index c5ce13ad7ae4e895ea68ef503e50b4ea885b07f3..548414152ddb195151bd74caf3a524cc82c1282d 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -5,7 +5,7 @@ let
   commit = "883939708704a19a295e0652036369d22469e8dc";
 in
 stdenv.mkDerivation rec {
-  name = "roboto-slab-${version}";
+  pname = "roboto-slab";
   version = "2016-01-11";
 
   srcs = [
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 57356398004ed21839751da6e6a385d9b2a589fd..358ab959cd0ed02e274519e6433f5bd0179a107f 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -2,11 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "terminus-font";
-  version = "4.48";
-  name = "${pname}-${version}"; # set here for use in URL below
+  version = "4.48"; # set here for use in URL below
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
   };
 
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix
index 494f48fd36e00d546a7b9eaaecfef68ea1c48f14..787009928313ba0d6295d08a2d4651491071e1cc 100644
--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/pkgs/data/fonts/tlwg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, fontforge }:
 
 stdenv.mkDerivation rec {
-  name = "tlwg-${version}";
+  pname = "tlwg";
   version = "0.6.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 996d11923972b0145238d1accff20916d07a6d9a..f1545e3d5b45f075249d58874e5e54139b59f9bc 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "ucs-fonts-${version}";
+  pname = "ucs-fonts";
   version = "20090406";
 
   srcs = [
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index b3c6d585b8bb1cd5d4593b08cf4d001d411b8efb..a80beee342b3bcd9be2f16bbd86fade7f0390c3b 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, mkfontscale, mkfontdir }:
 
 stdenv.mkDerivation rec {
-  name = "unifont-${version}";
+  pname = "unifont";
   version = "12.1.03";
 
   ttf = fetchurl {
-    url = "mirror://gnu/unifont/${name}/${name}.ttf";
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
     sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p";
   };
 
   pcf = fetchurl {
-    url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
     sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
   };
 
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index 6d169e940cf9535fde5b96e434a897ec0ba9fab4..cd4d0dc42cddf01e18636c6dc693cae00413dde2 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "unscii";
   version = "1.1";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
+    url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
     sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
   };
   nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 553c1dbde221fe802551e40e15d710c5a769fd27..24e9f2a393571141798b895fd20b215826a73a90 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, fontforge }:
 
 stdenv.mkDerivation rec {
-  name = "xits-math-${version}";
+  pname = "xits-math";
   version = "1.200";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix
index ce7bb11522ba581b7f6abd57b591201b04a4c306..2e99c3d9232763b7f742c9d89b79411ed6a76608 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }:
 
 stdenv.mkDerivation rec {
-  name = "bibata-cursors-${version}";
+  pname = "bibata-cursors";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 4b42f0b6ee9f6b811f24b6b96f824220e05ec4de..f276b573019fd663ac9e105b87f70bb18fec3223 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "elementary-xfce-icon-theme-${version}";
+  pname = "elementary-xfce-icon-theme";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix
index a4ffefe1f26dabf20f4298c2956b9b8a7340b6d1..99488a26f2b6f8054e7618421aeac27cc91382e0 100644
--- a/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "faba-mono-icons";
   version = "2016-04-30";
 
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index ee45a186f290fdeaedad54eef32687ca9eac36c1..f7015621853c8dd9633095d11b1684daacd56dbd 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "iconpack-obsidian-${version}";
+  pname = "iconpack-obsidian";
   version = "4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index 7b4ed7a66809bda438ff4e4df68a256bbb1d8d5c..49d289cac3910c8aca593258bc0b8a53672a712a 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "maia-icon-theme-${version}";
+  pname = "maia-icon-theme";
   version = "2018-02-24";
 
   src = fetchFromGitLab {
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 17892679a7eaa9369cf44cec3da9ce58ee32dfac..83c4b19472a3238dba31cc981035bff5146c3a8b 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "moka-icon-theme";
   version = "5.4.0";
 
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 1a2eb6504d9d19f786790626a555855c9d642167..e41373f536ffec1dae2688d7f9f063fd363f6785 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "numix-icon-theme";
   version = "18.07.17";
 
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index de808e44ea6ca3f7353990472dff4604c345ab84..5359b2229f3926e27886dc42eb0a0a14d61af4fd 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "paper-icon-theme";
   version = "2018-06-24";
 
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index b6def37def6f855f8788c52950bc6138a80681c7..c4a8fd44a6100fb7e2feea7fa4ef8c723e5179a7 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "vanilla-dmz-${version}";
+  pname = "vanilla-dmz";
   version = "0.4.4";
   src = fetchzip {
     url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz";
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix
index 18331b5ada9dae3fc4a9de5dce2e5d6780435c01..5df7343f3be7ac3763e7a7872b56beac80406a62 100644
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "combinatorial_designs-${version}";
+  pname = "combinatorial_designs";
   version = "20140630";
 
   src = fetchurl {
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index fec422b33acf0dc3ec86b60d098281b41eac5aad..48b538fe18332cb6518ab2313591e679067154b0 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "conway_polynomials-${version}";
+  pname = "conway_polynomials";
   version = "0.5";
 
   pythonEnv = python.withPackages (ps: with ps; [ six ]);
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 528486328c68f262da9071c59211f782e3626b3c..49b8736b08462cecc193871dc1d9892110a0e9c0 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
   pname = "elliptic_curves";
   version = "0.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 309ae47a85161c0f9e98a11a35da8b952ffe715d..38662bef0af330e3ede39e7e4b83465195a9f0ad 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -7,7 +7,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "geolite-legacy-${version}";
+  pname = "geolite-legacy";
   version = "2017-12-02";
 
   srcGeoIP = fetchDB
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix
index aea5feef46c7d0c8e7f35a8a49cfe7f06f34c306..14551c6a4a47812f67ccc2a7f26b5ab0d0d764bc 100644
--- a/pkgs/data/misc/graphs/default.nix
+++ b/pkgs/data/misc/graphs/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "graphs";
   version = "20161026";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix
index 343071fcf59cc64ee7c061b1b406344fdad4dff6..cb446e9b0bc1b02dfe5228ff359b32e1c73afb37 100644
--- a/pkgs/data/misc/libkkc-data/default.nix
+++ b/pkgs/data/misc/libkkc-data/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "libkkc-data";
   version = "0.2.7";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz";
+    url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz";
     sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
   };
 
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
index 222fd2f887070bb846c3868c816634cb724ba2fc..1b6b60f104e0537c4aff359ad147821bd930b777 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20080411";
-  name = "pari-galdata-${version}";
+  pname = "pari-galdata";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz";
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
index 967122c1bd4d4595b43f064aeb9b7c48ccd3ddec..2d3d52f697ed3a5c0d8651a735010eccca17d862 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20090618";
-  name = "pari-seadata-small-${version}";
+  pname = "pari-seadata-small";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz";
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix
index 85f2cff09db2459316189b8568f2b02119d953a5..8fec9a85426082f29f9a28948c7dd0e4c08810d8 100644
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "polytopes_db";
   version = "20170220";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index c90b8aa7e37da14c83149bbcedcfd7490b8c816a..f15a7534e267e3e8b077395b94e9a715b91635a2 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "scowl";
   version = "2018.04.16";
 
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 6d29d8760734dc00fd4fb3ecb2100aa94b979554..79924c4832f652d7d0ff5a715997c7e7ca6ddfcc 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.12"; in
 stdenv.mkDerivation rec {
-  name = "shared-mime-info-${version}";
+  pname = "shared-mime-info";
+  inherit version;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz";
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix
index 043d3d65b84e468f45fa0d8e021cfd169e4fad4e..355a2c2c577af09fb81903e78397da848c829393 100644
--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "sound-theme-freedesktop-${version}";
+  pname = "sound-theme-freedesktop";
   version = "0.8";
 
   src = fetchurl {
     sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
-    url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+    url = "https://people.freedesktop.org/~mccann/dist/${pname}-${version}.tar.bz2";
   };
 
   nativeBuildInputs = [ intltool ];
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0d19d8c9dcab3edbedc011872be0713721a56eb2..c1f9153c5854191fb647f71a0e5c270c737596a2 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPackages }:
 
 stdenv.mkDerivation rec {
-  name = "tzdata-${version}";
+  pname = "tzdata";
   version = "2019a";
 
   srcs =
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
index e113629926083256bf795d497c4dd517346be454..12acc424b9d178523c77ff25c3df5b0434a027c2 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, pkgconfig, xorgproto}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "rgb";
   version = "1.0.6";
 
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 762ab3eac3e593fc3cf29a6f583f70609017e08c..09ca8897a21610f1c7f4e6d5d2ba6a78c545dc3e 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "matcha-${version}";
+  pname = "matcha";
   version = "2019-06-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
index c4265875390efc8947ca00844bf1db9e0cbe3325..d1cfb800001b75bcb6661bad1962612c910347e1 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "nordic-polar-${version}";
+  pname = "nordic-polar";
   version = "1.5.0";
 
   srcs = [
diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index 1f0e110488b7927840f4a977fb4829590556f271..5172b2992ccc785ba49d72d86c9e992165a4f1e2 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "nordic-${version}";
+  pname = "nordic";
   version = "1.6.5";
 
   srcs = [
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index ee0c81d7d39ef7e0a942ed06707e6173a6b8b4bd..3a0695f3fb842a6a54a17a4eb9cb7018ddba325b 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dbus-factory";
   version = "3.1.17";
 
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's:/share/gocode:/share/go:' Makefile
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Generates static DBus bindings for Golang and QML at build-time";
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index 608096951b60a14b77c351e7299f59c7be567bc6..b052a1042403b12d47ea561a1a0f8086f1cc97f6 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -23,7 +23,6 @@
 }:
 
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "dde-api";
   version = "3.18.4.1";
 
@@ -114,7 +113,7 @@ buildGoPackage rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Go-lang bindings for dde-daemon";
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 0d25d9083ebb1cef0256f78bee3c5b8f8d4d5852..427cb1249c907fdf52ca515e8a4d2269dca624d0 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -3,7 +3,6 @@
 }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-calendar";
   version = "1.2.10";
 
@@ -38,7 +37,7 @@ mkDerivation rec {
       -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Calendar for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
index 88c3639ff2e639c0be120da21b4bdb1d4e385279..0871e004e5f984260899550195ee7ae80d89b361 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -7,7 +7,6 @@
 }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-control-center";
   version = "4.10.11";
 
@@ -100,7 +99,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Control panel of Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 4fb0272a3cefdb8094b1ea34ea87e1a09b01dd43..19089a6b050e5a6ddeba7110363db29d984a4065 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -7,7 +7,6 @@
   deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:
 
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "dde-daemon";
   version = "3.27.2.6";
 
@@ -122,7 +121,7 @@ buildGoPackage rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Daemon for handling Deepin Desktop Environment session settings";
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index 21c8221bd13b9f87ac68676fa6b68d47d7f34ec6..fc25d007f2007f1372da043868ba35c4991ef9e2 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -6,7 +6,6 @@
 
 let
 unwrapped = mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-dock";
   version = "4.10.3";
 
@@ -69,7 +68,7 @@ unwrapped = mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Dock for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
index 3580eeb43045153f254f07f673d61643d8e0a678..081c93a65c868d098d72f89f7aa87712c0bc2f19 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -9,7 +9,6 @@
   xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-file-manager";
   version = "4.8.6.4";
 
@@ -239,7 +238,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "File manager and desktop module for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
index f8a05b869802fd77869155e67d1c54dfdfad1041..b36d87604e74f638305926c6dd3c7e1a96acfa30 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -4,7 +4,6 @@
   which, xdg_utils, wrapGAppsHook }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-launcher";
   version = "4.6.13";
 
@@ -64,7 +63,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin Desktop Environment launcher module";
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index 4fd08749ee4965ff62e78fe75fe097fe01aef439..5397439949b3fedafd972fe237a69b7bb30e3207 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -2,7 +2,6 @@
   dde-qt-dbus-factory, proxychains, which, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-network-utils";
   version = "0.1.4";
 
@@ -42,7 +41,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # for debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin network utils";
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index d1f1bed2775ae46c6911dbb0f167145c9f7f9bcd..9d181c188d4d22f2e76bc56eb356e31d4aeeb814 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -2,7 +2,6 @@
   dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-polkit-agent";
   version = "0.2.10";
 
@@ -39,7 +38,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "PolicyKit agent for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index 0d063cbd8485c1ceec8dc3e50c8c289a16867b3d..a0e1e35ad85973a0deb89f116ba6ba4c905d8159 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, qmake, python3, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-qt-dbus-factory";
   version = "1.1.5";
 
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt DBus interface library for Deepin software";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index 8302e8e97bcd9d47e76d6638926e3c5ecf20f7ea..d6713fb3688e6a883bec90ef4d0370b45e0b3f4d 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -6,7 +6,6 @@
   xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dde-session-ui";
   version = "4.9.12";
 
@@ -115,7 +114,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin desktop-environment - Session UI module";
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index c768fa60ce705c0fcb9e59b2d3b9592f9609f385..619c66d9f5f8069c797f5119efc12bccfaf22043 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -2,7 +2,6 @@
   dtkcore, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-anything";
   version = "0.1.0";
 
@@ -52,7 +51,7 @@ mkDerivation rec {
     searchHardCodedPaths $modsrc  # for debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin file search tool";
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
index 51f0b666cb1e701b6bdf22462216870fffdc4383..97d2b53da70a2b68a89f5e54ddc6dd115137ffa6 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -2,7 +2,6 @@
   dtkwidget, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-calculator";
   version = "1.0.11";
 
@@ -37,7 +36,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Easy to use calculator for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index f43909f37dc18292d7f4368d89cb1522e87dbdba..ba826eb9063f67a4570459d4dad31a6405980abe 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, deepin-wallpapers, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-desktop-base";
   version = "2019.06.19";
 
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
     ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Base assets and definitions for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index 5849bc78ac0bd07a7d54ec826bd96ea9fe2ea153..b6c20ef71297aaaed034422c3e879d1543c7985f 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -2,7 +2,6 @@
   deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-desktop-schemas";
   version = "3.13.6";
 
@@ -57,7 +56,7 @@ stdenv.mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "GSettings deepin desktop-wide schemas";
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index d9a6f3701688e3d8bd9c1197f00f9958809746a8..f4f4ae2971a48246d8726d3d1570da6e67f542b5 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-gettext-tools";
   version = "1.0.8";
 
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin Internationalization utilities";
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 469a43efe329f61b8ad2f68d3f46e7012ca10fdf..4c0643a7ce5c0c2af8a53987e9c04c3262c35ffd 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-gtk-theme";
   version = "17.10.11";
 
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder ''out''}" ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin GTK Theme";
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index c5cf9e9ad3a8ef4ce75c824d054248d06008eb2f..8ecb25f5a2e7e3837e26b442217665dd207d22b0 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-icon-theme";
   version = "15.12.71";
 
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
     cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Icons for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index 89ef62475047880197a2db7d0dde3ad7a187090f..733f4846f5cf8caaf043120773592a4f05ef95a0 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -4,7 +4,6 @@
 }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-image-viewer";
   version = "1.3.17";
 
@@ -42,7 +41,7 @@ mkDerivation rec {
       -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Image Viewer for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 4292fb2d212b730f69aa47a1ddfcd16b1698af79..9aef8a15eb9479c2b4c52e36ee7349f279ed107c 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -2,7 +2,6 @@
   qt5integration, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-menu";
   version = "3.4.8";
 
@@ -35,7 +34,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin menu service";
diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix
index a4aede5857c97d182b458da3b5638a003ab9d2e1..18f5422330196f588c4116092333d04401b76e6f 100644
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@@ -4,7 +4,6 @@
   deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-metacity";
   version = "3.22.24";
 
@@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "2D window manager for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 6e14f0fd804e7b5dc9b2d1f9fe2d2e511a6a3eb7..046f589263bd73b57b960f89832079c08658bb09 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -3,7 +3,6 @@
   libdvdnav, libdvdread, xorg, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-movie-reborn";
   version = "3.2.24";
 
@@ -45,7 +44,7 @@ mkDerivation rec {
     sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin movie player";
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
index 83afe1ee24f729b9cd1356dddea7f572029c3ffb..9f2e8068d555b36956239cae202e19f915b2fbf4 100644
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -5,7 +5,6 @@
   deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-mutter";
   version = "3.20.38";
 
@@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Base window manager for deepin, fork of gnome mutter";
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 256744828db84df382e4746df42314b306fd8b7b..e77aa5e68c63ba6d532188a20edf0f9843b3b323 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -3,7 +3,6 @@
   deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-screenshot";
   version = "4.2.1";
 
@@ -49,7 +48,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Easy-to-use screenshot tool for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index 8c482d534052e6e7eb4d133a69185da43fbcb563..62c6c7ed9259d015d3dc19f221b95189799262e8 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -2,7 +2,6 @@
   qt5integration, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-shortcut-viewer";
   version = "1.3.5";
 
@@ -26,7 +25,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Pop-up shortcut viewer for Deepin applications";
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index bb752cc1ca90d539cf8e94b1f8cf63fa0a8e074a..398be55398bf0729b64727a254fab969a8108f70 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-sound-theme";
   version = "15.10.3";
 
@@ -14,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder ''out''}" ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin sound theme";
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 51156554f99911c2c3826bb88b93a0c72e6c9d64..59789bd84bbeb94dfa6a6e0f95899e5d436b7e0e 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -5,7 +5,6 @@
   libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-terminal";
   version = "3.2.6";
 
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
     "-DVERSION=${version}"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Default terminal emulator for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index 1fe930ea490d9e29712cd691332597de6b7d087c..299db5336746509eec70592e5072ae566b8c4881 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -1,7 +1,6 @@
 { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-turbo";
   version = "0.0.3";
 
@@ -32,7 +31,7 @@ mkDerivation rec {
     searchHardCodedPaths $out  # for debugging
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "A daemon that helps to launch applications faster";
diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
index f99974ba9c26f91773fc263e704ec3e433a1e3fe..e822cf6269ddb34687e06645cdcb0bc27e895a5b 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, dde-api, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-wallpapers";
   version = "1.7.7";
 
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
       $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Wallpapers for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix
index 986bee2f0dd26df9248ea500d0d980e66dffd5db..13b115e7042fbf25da46d4375b6c366e73e2f9f3 100644
--- a/pkgs/desktops/deepin/deepin-wm/default.nix
+++ b/pkgs/desktops/deepin/deepin-wm/default.nix
@@ -4,7 +4,6 @@
   deepin-desktop-schemas, wrapGAppsHook, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "deepin-wm";
   version = "1.9.38";
 
@@ -64,7 +63,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin Window Manager";
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index 4baa2262cd6e6744453be967c5103d49d8fbd548..f645be0f4d9bc8f04f5ba4bbec68e40b2202b28a 100644
--- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
@@ -2,7 +2,6 @@
   dde-polkit-agent, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dpa-ext-gnomekeyring";
   version = "0.1.0";
 
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
     fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "GNOME keyring extension for dde-polkit-agent";
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 2a527e3cc19ca99404ae79bc00fc4d300433d5b3..2ed10f9936812bd34bdc251a00c5102304300cb2 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -1,7 +1,6 @@
 { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dtkcore";
   version = "2.0.14";
 
@@ -43,7 +42,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin tool kit core modules";
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 8487509e73b2ec17da6770032b43ca1bc9611ba1..54c4163fcd1df6a11eb166f0960a9f2d14a5ba4f 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -3,7 +3,6 @@
   dde-qt-dbus-factory, dtkcore, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dtkwidget";
   version = "2.0.14";
 
@@ -41,7 +40,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index c05eedd8857a273300255ffc2c9b130372c42d25..4807c3d312b5f3e2f8887bf9665de05d75589e5d 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -2,7 +2,6 @@
   deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dtkwm";
   version = "2.0.11";
 
@@ -31,7 +30,7 @@ mkDerivation rec {
     "LIB_INSTALL_DIR=${outRef}/lib"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index 044d5e2a2eafb521910b3037573e0d59302fd85f..1d97991dffd02a6673aa1ca890f57883ac00f211 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-dbus-factory";
   version = "0.9.0";
 
@@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's:/share/gocode:/share/go:' Makefile
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "GoLang DBus factory for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 92cf3960c736ae59970ec306f9d53fc831a9b8ca..2c63fd5ebe62cb10413b33ebccc2c4cc621308fe 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, go, go-lib, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-dbus-generator";
   version = "0.6.6";
 
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
     "GOCACHE=$(TMPDIR)/go-cache"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Convert dbus interfaces to go-lang or qml wrapper code";
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 4b79969970a82e4be63d449911d02f5e1c818424..68504d756b175ca61916e7167901399e03d1a277 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -2,7 +2,6 @@
   libgudev, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-gir-generator";
   version = "2.0.2";
 
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
     "GOCACHE=$(TMPDIR)/go-cache"
   ];
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Generate static golang bindings for GObject";
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index 6f3a851eb2f1c7d5f246d2d44790440e1a74230a..fff92b595f8b17c985bb154f544d91ff4ccf6dfb 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -2,7 +2,6 @@
   mobile-broadband-provider-info, deepin }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "go-lib";
   version = "1.10.2";
 
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
     rm -r $out/share/go/src/pkg.deepin.io/lib/debian
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Go bindings for Deepin Desktop Environment development";
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index b275174fa9f11d7cc038770fb8bdd67115a6a3b0..ffbc230d2e2a132c2919fa91f2402e588851a030 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -39,7 +39,6 @@ let
 in
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qcef";
   version = "1.1.6";
 
@@ -91,7 +90,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt5 binding of Chromium Embedded Framework";
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index f2e6eb0d1233c01ddc8ddb79a2532f6dac8087f3..d76bed1b9b7baa21b5e3cfca5c58dd3457fdec7a 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -2,7 +2,6 @@
   mtdev, cairo, deepin, qtbase }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qt5dxcb-plugin";
   version = "1.2.2";
 
@@ -31,7 +30,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt platform theme integration plugin for DDE";
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 8302e701b3867eecf2f4247de820c5f9b6349207..97e60be6d6781faef1369bf886998d4eb3426eb8 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -3,7 +3,6 @@
   qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qt5integration";
   version = "0.3.12";
 
@@ -41,7 +40,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "Qt platform theme integration plugins for DDE";
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index e7f735a4256ac2bb99c19c91a20506f298df1cd8..51c38f6d3474130bca079c85de4d11b567c964e9 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -1,7 +1,6 @@
 { stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "udisks2-qt5";
   version = "0.0.1";
 
@@ -29,7 +28,7 @@ mkDerivation rec {
     searchHardCodedPaths $out
   '';
 
-  passthru.updateScript = deepin.updateScript { inherit name; };
+  passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
 
   meta = with stdenv.lib; {
     description = "UDisks2 D-Bus interfaces binding for Qt5";
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index 8e73682065d3878849a14eeb4299126e32a780f5..93b0cb59650b8ca442b35a7f0763eb8d727a68fa 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "econnman-${version}";
+  pname = "econnman";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
+    url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz";
     sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
   };
 
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 409b3f7bb8dd2aa605e8ee12f0091a3b59776436..f1455f68338f2ddb11b5ef419e04423ee22a392e 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ephoto-${version}";
+  pname = "ephoto";
   version = "1.5";
 
   src = fetchurl {
-    url = "http://www.smhouston.us/stuff/${name}.tar.gz";
+    url = "http://www.smhouston.us/stuff/${pname}-${version}.tar.gz";
     sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
   };
 
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index 31dd985af2a7ec05dc661b9e1c818e7141fe3890..7d8365337aa8725fdcab6528d0f898e554f151cc 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   ver_maj = "2.32";
   ver_min = "0";
   version = "${ver_maj}.${ver_min}";
-  name = "gnome-python-desktop-${version}";
+  pname = "gnome-python-desktop";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   # gnome-python-desktop expects that .pth file is already installed by PyGTK
   # in the same directory. This is not the case for Nix.
   postInstall = ''
-    echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth
+    echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 03440c02c14f5620041ed14511e68ff385afd53c..87d2931d274475f43afc5f7670ab66cc6c625b69 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
+  pname = "gtksourceview";
   version = "2.10.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2";
     sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
   };
 
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index ac9a87299ab8b5ad8fa186d4459fc5200266d285..10b99e4eb5d238d5fdac72907faa37cf6d2be83a 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   rev = "9ae8768";
   version = "5.4";
-  name = "mail-notification-${version}";
+  pname = "mail-notification";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index df3de11e738d5902f5a2c7bb8b05b06ea9616307..1a1848491b167344e42cf7983777e72e93480d4b 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gconf-${version}";
+  pname = "gconf";
   version = "3.2.6";
 
   src = fetchurl {
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 3ea04048accce9f8ac0f7741a39a65b0760db983..33c2abef0fab70fd895e33cd219b8ce3c44e56a5 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.10.0";
-  name = "gtkhtml-${version}";
+  pname = "gtkhtml";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz";
     sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index f21e81237b2635160b3c6fe1962e6a5d931b2639..b18e58f6f56ffdda976e650584167c6f69456d89 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -5,11 +5,11 @@
 , adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "cheese-${version}";
+  pname = "cheese";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 733b8ecca92031f337f4ab0a986f662d125f7298..267a7f2f7d203bbb049f61e3cd37b9dee1c21352 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -2,11 +2,11 @@
 , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
 
 stdenv.mkDerivation rec {
-  name = "file-roller-${version}";
+  pname = "file-roller";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 2dcd265e2e481fd2a23312b165424b12cce96524..35d97a87a86f13ca79eff303e30393e31d1bc99d 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -5,11 +5,11 @@
 , gnome3, gspell, perl, itstool, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gedit-${version}";
+  pname = "gedit";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 4424eb4a3fd4ca10a4a152673b9aab7aac4e7dc5..92b38ed5eee450d7182746d9f68b794ea5f8abf8 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -4,11 +4,11 @@
 , gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "glade-${version}";
+  pname = "glade";
   version = "3.22.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 2a308a2da450a6b81fbd3d4f8f83f8eecea16da3..27ce5d0f078b6ffeb62f59bc22115bf25a9fe400 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -11,10 +11,11 @@
 let
   version = "3.32.1";
 in stdenv.mkDerivation rec {
-  name = "gnome-boxes-${version}";
+  pname = "gnome-boxes";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index d2845bef2a138912bcaaf6bf5b8bd9c720268fb1..38182f1f994f91c28f36ba49782b822bb3c45d31 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -5,11 +5,11 @@
 , gnome3, gdk-pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-clocks-${version}";
+  pname = "gnome-clocks";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index e8796d49e9a18612d25a284f5f89e1a55a3c5ba3..1301381e5aaf07d8b55fccf8dce657e5f2f08454 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -7,11 +7,11 @@
 , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-documents-${version}";
+  pname = "gnome-documents";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 4c215d3472993d96d5f31d218bcd06425ed5fa07..655e9e9fe34d73538bf640c386a6003b00b069f8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-getting-started-docs-${version}";
+  pname = "gnome-getting-started-docs";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index d46882deb41e5714e7d92e8922087c955ebece94..8681a3c866ce9f468072b9f9bb30b587bcbff2f6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -2,11 +2,11 @@
 , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-logs-${version}";
+  pname = "gnome-logs";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 4a34f12912f706de7e3b412627012df524f9364e..5978fb217e87e690a27f401e6eeabdb4c0378d63 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -7,7 +7,8 @@
 let
   version = "3.32.2";
 in stdenv.mkDerivation rec {
-  name = "gnome-notes-${version}";
+  pname = "gnome-notes";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index d21cfcfd72d24d17184adf5c3de493774420ec1f..1e5a641f08fd3578f38957f4b258e260e2114c6d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -2,11 +2,11 @@
 , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-weather-${version}";
+  pname = "gnome-weather";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index ae360d73b8794de7e8e13b93d33a5267df0c316b..c5377157ef0c97d5b13fc30aaf0b7a7864e98b67 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -2,11 +2,11 @@
 , libsecret, itstool, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "vinagre-${version}";
+  pname = "vinagre";
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 9ef94adcbd097893f3118036623dcf5027d31b24..a7f4a637b1785326c66143163e516ee7d4a122cf 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -2,11 +2,11 @@
 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "adwaita-icon-theme-${version}";
+  pname = "adwaita-icon-theme";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 73c3f65a968acb43f67e085cf920d1d43e476dc0..5e4bbf8cce17f5de225e8caac7519aa76a2b1607 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -10,11 +10,11 @@
 , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
 
 stdenv.mkDerivation rec {
-  name = "empathy-${version}";
+  pname = "empathy";
   version = "3.25.90";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 7b7b7f64aa4ddf916cbb15f2a5adb3b934f866ef..85f31bfdce5dd94e9c98f036b3ec0ff9f854f86c 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -5,11 +5,11 @@
 , gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
 
 stdenv.mkDerivation rec {
-  name = "epiphany-${version}";
+  pname = "epiphany";
   version = "3.32.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 078145e1231f3e75ebb9eae14c70640ee59ac20d..dda45a71fe2090bb7c6c1b51cf8e8d637874a7c0 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,13 +5,13 @@
 , glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-${version}";
+  pname = "evolution-data-server";
   version = "3.32.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   prePatch = ''
-    substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \
+    substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \
       --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas"
     patches="$patches $PWD/hardcode-gsettings.patch"
   '';
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 420a0d3e6b11c881140afe89f353b0c7d54e8b3c..a4d2fd2be5a51c79251561877857227676265673 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -4,11 +4,11 @@
 , librsvg, coreutils, xwayland }:
 
 stdenv.mkDerivation rec {
-  name = "gdm-${version}";
+  pname = "gdm";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 4e43d5f9d50cbea133ec82bbf972aa34a90cf325..303377b8631a63d870a79fda39ea245c94701bc2 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -3,11 +3,11 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gjs-${version}";
+  pname = "gjs";
   version = "1.56.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 1e332502db5d9d9fbfebbd33e7d8ec719499d8f2..e4c772cb1d40769f6c90064710d21f525ec6ee9c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-${version}";
+  pname = "gnome-backgrounds";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 9214aa0a9a79bd9f372a20eb5c5c2b5cf354cca8..df43371a4971870249d49c83d1412a9c2df50361 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -3,11 +3,11 @@
 , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-calculator-${version}";
+  pname = "gnome-calculator";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index d0ab339a504d6bf138e58670318e7c91ff8c41b4..f2eb65e50bbf9cdd68264354a7b65613d069b1bb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, gnome3, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-common-${version}";
+  pname = "gnome-common";
   version = "3.18.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 57cb90c7c4581d7df6b714fbeee7f8c81cf9860e..75a15a41f97b138dd288579a4d108fb703e21dcf 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -7,10 +7,11 @@
 let
   version = "3.32.1";
 in stdenv.mkDerivation rec {
-  name = "gnome-contacts-${version}";
+  pname = "gnome-contacts";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 4beeb190f0252fdc49789deef5f5fec8a254dd12..9d798c2811bdad0f7368044be933b6748c504e63 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -3,13 +3,13 @@
 , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-desktop-${version}";
+  pname = "gnome-desktop";
   version = "3.32.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 613de6c3c164ca8bc0156e2995f617d098d11223..98398311882bc18f617ea761a71dbf69089d5612 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -3,11 +3,11 @@
 , gnome3, gtk3, glib, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-dictionary-${version}";
+  pname = "gnome-dictionary";
   version = "3.26.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 8e09b152e83a29790dcf7d6031d05e6c8ac5be55..d6d9f927252865da4dc1174215535b8ec4750b49 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -4,11 +4,11 @@
 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-${version}";
+  pname = "gnome-disk-utility";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 317c7e91584117d922b8f81af4b09456363d99d5..976829acd4c637de5dd6a7a92baece88f2eb25f5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -3,11 +3,11 @@
 , wrapGAppsHook, gnome3, harfbuzz }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-${version}";
+  pname = "gnome-font-viewer";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index f36d3f4a6e0ae0e2b2b24db403ad6ff033e17560..4148843d4ab75fcb9c0299659faa0836da3c7c54 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -3,11 +3,11 @@
 , docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-keyring-${version}";
+  pname = "gnome-keyring";
   version = "3.31.91";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index ed4c1a3da13a89b2e53bd6378e8270b7ba785613..93da1f8abec92de3ea93dd2ae1df025ab44c9e63 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -3,11 +3,11 @@
 , tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-online-miners-${version}";
+  pname = "gnome-online-miners";
   version = "3.30.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 38adf7137f76c900e812933b94afee863b10f2ef..f13ad9f47aa6df7da0599295698231461da3e7b9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -3,11 +3,11 @@
 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-session-${version}";
+  pname = "gnome-session";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 6929f821e379a1189620489daf1dc9234025a2af..b9f33ce73a8aa1b9258f72b6b6cffe7517c7a62b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -95,6 +95,12 @@ stdenv.mkDerivation rec {
     "-Dudev_dir=${placeholder "out"}/lib/udev"
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
   postFixup = ''
     mkdir -p $out/bin/gnome-settings-daemon
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 21281f15a5c1929e1486f35260c1fc848a6cb123..76121660012026efaae63ca07bd0d187c57568b2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -2,11 +2,11 @@
 , gnome3, gnome-menus, substituteAll }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-${version}";
+  pname = "gnome-shell-extensions";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     # Fixup adapted from export-zips.sh in the source.
 
     extensiondir=$out/share/gnome-shell/extensions
-    schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/
+    schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/
 
     glib-compile-schemas $schemadir
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 1363cf6d6695987641adc0e08be2ac0badd9d374..a1d8f2c599a8da738eb325b6dfed88fbe5ffcabe 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,11 +13,11 @@ let
   pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
 
 in stdenv.mkDerivation rec {
-  name = "gnome-shell-${version}";
+  pname = "gnome-shell";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 6d48759790076163f629aeab9e3048739d004e10..12081bbae5b0f56f3e281c8fd4ab069e9b95f0bc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -10,11 +10,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnome-software-${version}";
+  pname = "gnome-software";
   version = "3.32.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 5c332c4135c5c74eb58dfca8ad61ba16ab318fa6..a9f8367a54843207e6f2065db7fcc439ac04d6e2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -3,11 +3,11 @@
 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-${version}";
+  pname = "gnome-system-monitor";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index c9f5229f870100c70261b4fe9d229a0c4a099c63..75d4b117e778425c720119083ec3d72b6f6f3d3b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -3,11 +3,11 @@
 , desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-terminal-${version}";
+  pname = "gnome-terminal";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 1a8582626e3a30181f3a78e569e32ff7b41c5050..7915e71a73c005e07c3174938cb69181dcff5a01 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-user-docs-${version}";
+  pname = "gnome-user-docs";
   version = "3.32.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
index cfdda920e27c7c246d7439c690561b032edb9b8e..56104aff4840fc8551371e01c4771fd5b4c1d0bc 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, gnome3 }:
 stdenv.mkDerivation rec {
-  name = "unicode-data-${version}";
+  pname = "unicode-data";
   version = "12.0.0";
   srcs = [
     (fetchurl {
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 4f57c5247d9710b5b2ae3322a6d98171c00ba307..de56b14d46fd830f5f2945fbcbaef9d8bb3cabf9 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -3,11 +3,11 @@
 , libxml2, sane-backends, vala, gnome3, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "simple-scan-${version}";
+  pname = "simple-scan";
   version = "3.32.2.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 5554dbdfe302a8a1b04d7d430ff7fef35a5f74ec..86675f21f06a9a82f6bf5d3877270e5d7da529fe 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -4,11 +4,11 @@
 , gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "sushi-${version}";
+  pname = "sushi";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 4953b7ec7a82ef9283c2e443b61a70639d630ca1..a5388f2eae19df02abb44660cc7971af7a936069 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -6,11 +6,11 @@
 , gdk-pixbuf, tracker, nautilus, xvfb_run }:
 
 stdenv.mkDerivation rec {
-  name = "totem-${version}";
+  pname = "totem";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index aac2162625847ea05699f6c400dac76a78d973d0..43863bf7f85610d4e24ac01217c9f6c6443b3fef 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-tools-${version}";
+  pname = "yelp-tools";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index f1a393117280f0f0155a61b6ba2e3254c112d513..fc5b0268df707f804a5102ee4137fd96fad0cf37 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -2,11 +2,11 @@
 , itstool, libxml2, libxslt, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-xsl-${version}";
+  pname = "yelp-xsl";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 24a49413960caa7bc46ceacd648a9a8e3bbb6894..7e326dd1657d388d8b6121bdd5429b443d0fef1f 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -4,11 +4,11 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-${version}";
+  pname = "yelp";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 89d0fd7a3b90737a2ca4387e5126313c09f37e11..5023ffce6b96e3486537233b92693a4d977ffb18 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -2,11 +2,11 @@
 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "zenity-${version}";
+  pname = "zenity";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index d1e5179063f33bf11b279ace1c550c40dd8f3975..573259b7e7d0978d29b839bd1e331367f298d39a 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -3,11 +3,11 @@
   itstool, python3, ncurses, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "anjuta-${version}";
+  pname = "anjuta";
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 80a3770b7030101511cba2af8185b154fb9f2665..23a58011e027666ad9ac21842576ad9fd32d296b 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -3,11 +3,11 @@
 , webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "devhelp-${version}";
+  pname = "devhelp";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 647e7163d0b996f721fd966f534bf94762467052..81f63941729f71d60cdd7984c37eb5a2086d9b48 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-devel-docs-${version}";
+  pname = "gnome-devel-docs";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index 9fbce7c6cc02e877cad18b57f17fcc4d6060368f..7ebacc99c5220e3defbc6a7be28e0faaf942a8fd 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -3,11 +3,11 @@
   gtksourceviewmm, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "nemiver-${version}";
+  pname = "nemiver";
   version = "0.9.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
   };
 
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 568a6cace7204478c795d1b24d864c859fe4615e..6f289fd74d9f766eb7fc6d4c67993efe00aeb8d6 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-appindicator-${version}";
+  pname = "gnome-shell-extension-appindicator";
   version = "29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
index afedd5f98e1ae69120766cfa87374761304dcd83..b7bde83915c1e270d396d672b5b099486e4dd0f9 100644
--- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-battery-status-${version}";
+  pname = "gnome-shell-extension-battery-status";
   version = "6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index e627bec8b931fa28348caadc6816b43daedcb5df..95a68505c7c8a275d27ef60b502cbaaa8b14acad 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext, bash }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-caffeine-${version}";
+  pname = "gnome-shell-extension-caffeine";
   version = "unstable-2019-04-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 755c8e1b02fb39f045f215b8184e72f61508a673..b4b184d4fa0350541d37557d93b762f38eb1a2a1 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -5,10 +5,11 @@ let
 
   inherit (python3.pkgs) python pygobject3 requests;
 in stdenv.mkDerivation rec {
-  name = "chrome-gnome-shell-${version}";
+  pname = "chrome-gnome-shell";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz";
     sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban";
   };
 
diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index e41227e85139caccad218ae84c189914775cfa35..0faadbcd2b68838f313e1d44673506831574645e 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-clipboard-indicator-${version}";
+  pname = "gnome-shell-extension-clipboard-indicator";
   version = "30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 06e7d27c5444b3a4d6c3f34e9716dfc5099325fd..e80149e500531ff2fec15daaf5d0642a7a968c06 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-dash-to-dock-${version}";
+  pname = "gnome-shell-dash-to-dock";
   version = "66";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 0d48b8359c919c16c19f339337bcadfe557b5090..30f9ad7d2ab1d767d24d46497ea173e7bf9581e2 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-dash-to-panel-${version}";
+  pname = "gnome-shell-dash-to-panel";
   version = "19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index dd2a02b6be8511e48323ad70815f924c8489b34d..0d9d54167ff27a8749ecfb1fe19c9aec1e74fc83 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -3,7 +3,7 @@
 , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-gsconnect-${version}";
+  pname = "gnome-shell-gsconnect";
   version = "23";
 
   src = fetchFromGitHub {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib"
-    "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+    "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
     "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
     "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
     "-Dopenssl_path=${openssl}/bin/openssl"
diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index d08e6f3a57dfe02f6e7f181da9dcd0774e3da0cc..8214300a5311f12c4dcc043d073e6a19f0957c54 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-icon-hider-${version}";
+  pname = "gnome-shell-extension-icon-hider";
   version = "23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index 24b4c1cf703fe23a10c88d5bb35279521b65ad54..b36f3489b57c0b2b615ceaa454e98dce65f4e058 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-impatience-${version}";
+  pname = "gnome-shell-impatience";
   version = "0.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
index 686d7be91a4726dec3843200a5aee96bf84819a8..f09822415a6eb9d2c26d12671e2c7905eeee1810 100644
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-mediaplayer-${version}";
+  pname = "gnome-shell-extensions-mediaplayer";
   version = "unstable-2019-03-21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
index 8c075a11bdcd73703b86823614813479f1e7458c..f9f72bd77f0278279737dc5e20aea1e860d82b8f 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-no-title-bar-${version}";
+  pname = "gnome-shell-extension-no-title-bar";
   version = "9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
index 21ff70140be14d3dd575205184e458d3e868c8c7..e2b5288e8869d2209d73ea5e43a6c5d6f8cc187b 100644
--- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-nohotcorner-${version}";
+  pname = "gnome-shell-extension-nohotcorner";
   version = "19.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
index 5faa55652d8a7f30c5f2d94f1a88a874cb696b16..d9ea670db09e8f8777c0053508e262f120614c6b 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-remove-dropdown-arrows-${version}";
+  pname = "gnome-shell-extension-remove-dropdown-arrows";
   version = "11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 7046e6737269c1f321039cb76e7e441f7b543628..285733d5f7c92be1b70002592637c8a9f454a5fb 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-system-monitor-${version}";
+  pname = "gnome-shell-system-monitor";
   version = "36";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index c72d72cce12689f8aba0598365c2094fd1e3ecca..745541b7cf43d8c94633b67968bbb0e0e9f956ee 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-taskwhisperer-${version}";
+  pname = "gnome-shell-extension-taskwhisperer";
   version = "12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
index 604b7433ccb48b488d55ea0f67048003427a102c..f841ef2403dce96f0d4a9a69d710ac78071da29f 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-timepp-${version}";
+  pname = "gnome-shell-extension-timepp";
   version = "unstable-2019-03-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index 9a151a6ac8f7d631ce1aba9e4809fb091dbce766..f0f6279fe2ee826f540a38121583ead47d533a5d 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extension-topicons-plus-${version}";
+  pname = "gnome-shell-extension-topicons-plus";
   version = "22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
index 19ced0b5252cd9ceea1b919fc84aae694f54aca6..072d31b84fedbf8784a47f49378fd6e60d67769c 100644
--- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-volume-mixer-${version}";
+  pname = "gnome-shell-volume-mixer";
   version = "844ed80ad448855d8f6218847183a80474b523c7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
index 10aee5cafe6e32dd670891ee029b24b11cca73f0..811e9911f6288b69c6a2772b6d1de9a5a9a568e4 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
+++ b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-workspace-grid-${version}";
+  pname = "gnome-shell-workspace-grid";
   version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b";
 
   src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 21f089b324ef567383bf56618763bdb461c97652..b4c6eaaec1bf9fdacaca6efa3d37356ba7d8fcd6 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -2,11 +2,11 @@
 , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }:
 
 stdenv.mkDerivation rec {
-  name = "five-or-more-${version}";
+  pname = "five-or-more";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 94428d6640d0f8ee59de8790568c69856af8617d..5b233c48385d6baae8e800a0ab31e3e54ab6bc7d 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -3,11 +3,11 @@
 , python3, ninja, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "four-in-a-row-${version}";
+  pname = "four-in-a-row";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index c6c24be4be8c18d2dc4c1c4c87a142e542582928..d7001e1c52791656782889328c5713a3405a50f5 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -2,11 +2,11 @@
 , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-chess-${version}";
+  pname = "gnome-chess";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index ee55b5a65a5de1be7f78972c743d092f89746974..9d173945cdd8cd86b0b24be9352495769124bc87 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mahjongg-${version}";
+  pname = "gnome-mahjongg";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index b2c8e99e82393f621694fe312bb5d1cfe4a1d1d4..1ac7e51357eb44838ec448978767d3b2a5eea641 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -2,11 +2,11 @@
 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mines-${version}";
+  pname = "gnome-mines";
   version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 3bea240ecb978f3be8ee2c040f3650bdd8ef6051..7b069922169685a7a88b7d786b6e1d0743d0f880 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -3,11 +3,11 @@
 , libxml2, libgee, libgnome-games-support }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-nibbles-${version}";
+  pname = "gnome-nibbles";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 2b40548d37ce68512bae50b7f21c5d0905b6b48e..46723867f8ad3145f37d7cbec9690f6f25cae27b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -3,11 +3,11 @@
 , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-robots-${version}";
+  pname = "gnome-robots";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 5c3fafd3d02a785331d4723d69158e4ed5275f86..a555ee31cf378327d0a827fa7e8ed202cecd4e3c 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -2,11 +2,11 @@
 , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-sudoku-${version}";
+  pname = "gnome-sudoku";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 06914d9817c7a36d5fd108e2f0f3a79667c64de2..b6c60362265d0f08990dc6a6c45c09934944d929 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-taquin-${version}";
+  pname = "gnome-taquin";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index ab0f0f0faf2d6478830a9ff277ffd85df448de89..291415302116603645e597eee237ea80230128a2 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-tetravex-${version}";
+  pname = "gnome-tetravex";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 86a1bd6485be8063a1a7e89de1986ffa501c0604..114551ed4ee1ab10ae600b81ed324536553dbb9a 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "iagno-${version}";
+  pname = "iagno";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 5801c2935632d6842d61b77d87615127b312f167..9c582f037a25eb7c6a27467a320a082cce65a300 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -3,11 +3,11 @@
 , meson, ninja, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "lightsoff-${version}";
+  pname = "lightsoff";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index f0da625316fa7e06403a15454134cb962f1cf344..f196ada38504c7cf6e75530269312cecc453ea9d 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tali-${version}";
+  pname = "tali";
   version = "3.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index c80c8b977cf518c717dc156a773dcdf5f449bdac..c8d26988391db4a5c576fa4153994df49941b6fd 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-autoar-${version}";
+  pname = "gnome-autoar";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index d819961d2819a0c70261af49529a3f1bf94dafb2..ea9a79de40e4755462018f28b8387a0fabf42766 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -2,11 +2,11 @@
 , gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-packagekit-${version}";
+  pname = "gnome-packagekit";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index a35067587e0462f6cf3fc282beba97a01dc9bf7e..d8a78686e4917d77a2765901501ec402a7b566dd 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.32.0";
-  name = "gpaste-${version}";
+  pname = "gpaste";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/gnome-shell/prefs.js \
       --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
     substituteInPlace src/libgpaste/settings/gpaste-settings.c \
-      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 543453a2bd3124291fbc109849ac140a5538a433..a607a6eb6a0782b0183fcec9688132c1e0310f39 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -2,11 +2,11 @@
 , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gtkhtml-${version}";
+  pname = "gtkhtml";
   version = "4.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
   };
 
diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 6ef87cece4e45738dcf5dcce1518aa2a462bfb80..5e7db35a7276b6b7f9092edb5b566499c2149150 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnustep-make-${version}";
+  pname = "gnustep-make";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index 6e8644b19b0cd1340221f777b5950befb7a5bbbd..550e98c9dcc86015694ccb12ef06453071117e16 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "lxmenu-data-${version}";
+  pname = "lxmenu-data";
   version = "0.1.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
     sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index ca601531b68f830ee2b6e317d6c2c00d709cb7bb..104ab20835fa2a34c832dd49c859a50ce38d55e0 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "lxtask-${version}";
+  pname = "lxtask";
   version = "0.1.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
     sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1";
   };
 
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index c1b29b161254745e211903551d8c4c69b9230f25..df717debbae8631216a6b102a01303601991e445 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -1,7 +1,6 @@
 { lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }:
 
 mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "qlipper";
   version = "5.1.1";
 
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 5ef080ef50be3e7a3bd797f16ca82afba66d4186..15dea9b101841e16a825881f0a78ec90c5b09b01 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "atril-${version}";
+  pname = "atril";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190";
   };
 
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 108e8fe1e0b15d83e1a7503653e3f8d6711ac2a6..ba21cb00d35d2ffe3072cd2fc3826c36010f0f3f 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "caja-extensions-${version}";
+  pname = "caja-extensions";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p";
   };
 
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 8fad6cac8799ca809edcf53e3632676b2939e0be..675648363f5275d70d0c892cf9e12ecb189adf30 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "engrampa-${version}";
+  pname = "engrampa";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk";
   };
 
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 72e509d59afdc23c71bc069890c091ee5f3b8aa0..cc683ab2db21aef7963e4fdfc0a85bbcc3a29779 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "eom-${version}";
+  pname = "eom";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4";
   };
 
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index bd6488d2c2ce8538538f6385398d54d44c7491c4..d6709c375e6dce626f87b265ca86c44f7102ddf6 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
 
 stdenv.mkDerivation rec {
-  name = "libmatekbd-${version}";
+  pname = "libmatekbd";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8";
   };
 
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index bf2a91971dd91769d34dff97c699513b24fc5338..17fee5d61cbeaccecb5d184306e4ec71a125d03f 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -5,11 +5,11 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "libmatemixer-${version}";
+  pname = "libmatemixer";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9";
   };
 
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 664b85fc287b24a7487068b4bc46abb46a3c01f7..e4976f71ae681a1f0d0468d0ce620b00ee32b9c2 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
 
 stdenv.mkDerivation rec {
-  name = "libmateweather-${version}";
+  pname = "libmateweather";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a";
   };
 
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 4f77b3035015844a212810e4406ffe7cad648a5a..9899256018a8ca800b14480e7b0ef8ef40fbe78c 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "marco-${version}";
+  pname = "marco";
   version = "1.22.2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
   };
 
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 7fbd192ac2ca821283e5a21b26add411927950ef..ec7ad2b4294d9f9213d102b34d250346dcd28aa4 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-applets-${version}";
+  pname = "mate-applets";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx";
   };
 
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index f5c151d01f7f575f6c94ba022cfaae87bf1d2685..2667c25959e65b9cd84f45f2e09903564b77c57d 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "mate-backgrounds-${version}";
+  pname = "mate-backgrounds";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9";
   };
 
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 85631f03e1d42ed4103555d05fea2fd3f4845cde..64ede5101c750dc6ddcd0beda165618d6ba56e5f 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-calc-${version}";
+  pname = "mate-calc";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
   };
 
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 3b154fd9812a9ee6e779eed460a7f7d56f1855bf..f85dd632bd16909d2f2c9254ba41b277f0334250 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mate-common-${version}";
+  pname = "mate-common";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z";
   };
 
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 6e54b137ba1d741a2a62ee9c2e2c9e59427c544b..a06c24b9c728c98794267713294812a437ab4fb5 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-control-center-${version}";
+  pname = "mate-control-center";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0";
   };
 
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 0bfcab58663532ce550e9355d765b7cc71593d5e..58515a492b5c142b922819c8c10505517c0f684e 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-desktop-${version}";
+  pname = "mate-desktop";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0";
   };
 
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index ba0cbd526f96269e645df984cc9dd74d3b4e2573..7db01f59816426af3a41d2eb907b0449e541e228 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "mate-icon-theme-faenza-${version}";
+  pname = "mate-icon-theme-faenza";
   version = "1.20.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
   };
 
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 8f0f15fac2dd657ee7b294ab22a68e7495f4a05c..9df0d0ce5a885ee9e0bda1ffc7d3254b87924b5b 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-icon-theme-${version}";
+  pname = "mate-icon-theme";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k";
   };
 
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index 623e7f240964736c985a19b898e8bdff521f6c05..e1a6e874d1d6190c3e7930c813aa3b16bdfe1a1d 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-indicator-applet-${version}";
+  pname = "mate-indicator-applet";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1";
   };
 
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 7185181d7476c6a9a4c5e1878ccadf2c62063723..93c765a9953378803ccc5d87aade8bbb939c759a 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-media-${version}";
+  pname = "mate-media";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2";
   };
 
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index bb09b0a4849d30ecf4eafd5af39abda4b0fd9b78..e37a270f9dcab4069578264f71ed30e6b87874b3 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-menus-${version}";
+  pname = "mate-menus";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c";
   };
 
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 049e0a4bb69ac5461994dedd087c47b793e801a7..51d23e475ff3449646a7099479b4ff2c709cf422 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-netbook-${version}";
+  pname = "mate-netbook";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64";
   };
 
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 45d483503aa7df7e3f2592f420d1dc12949b6c7b..d53ae8efa3563fe436e78f8b5d50abf1560dbcd3 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -2,11 +2,11 @@
   libnotify, libwnck3, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-notification-daemon-${version}";
+  pname = "mate-notification-daemon";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j";
   };
 
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index bbb49c203472b1865dc8ef7d044b57d93154d4ea..39d2c1812cbc8d98cc7c82a16b8277f836bfe50a 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-panel-${version}";
+  pname = "mate-panel";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma";
   };
 
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index f5b6d62dd590c4bcd08677aff7eadb7e6541a6c0..253472e3987ed65c8414370a728d3ebfa0dc719e 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
 
 stdenv.mkDerivation rec {
-  name = "mate-polkit-${version}";
+  pname = "mate-polkit";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0";
   };
 
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 7f4d1c850151cb1806fd6836afc4b21454a7bf2c..6ba6ac205ce19857cf325129e855967e43524b3d 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-power-manager-${version}";
+  pname = "mate-power-manager";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms";
   };
 
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 53a89bec4c1e2c18945f1f4c6413853acbbdf9e7..d1c1e481d7002c2f338148c44458f2a443fe2f4c 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-screensaver-${version}";
+  pname = "mate-screensaver";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc";
   };
 
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index c5ad4628c54f14cad80c38adc852069c659409f2..bd9ed9f6cbe7d1ba1299ab7e6951e6b196ff9a32 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-sensors-applet-${version}";
+  pname = "mate-sensors-applet";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3";
   };
 
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 3448e8327f5b4a519332e1f4208f74ff82e648d0..b7735ec77feceff1871ed9112b144a4ffcc13271 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mate-session-manager-${version}";
+  pname = "mate-session-manager";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig";
   };
 
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 00d967a2d5cf55a623f517f2f23af32d5b2df033..5ee995402ecdf59adccee6539d5c2ece52490fd0 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -4,11 +4,11 @@
   wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-settings-daemon-${version}";
+  pname = "mate-settings-daemon";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym";
   };
 
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index f7cdf036cebf88a356c383434302dec9d2d27f4c..6f5993cfc353b3d5285a630c278dccc1284522d5 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-system-monitor-${version}";
+  pname = "mate-system-monitor";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm";
   };
 
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 2339ad8fb1b3e86304cbad318cfc52d5d5ff09d6..7ec9944aa0e1b72c9bb573c74da43a62c2a764a8 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-terminal-${version}";
+  pname = "mate-terminal";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn";
   };
 
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index a4724049f7c19bbdda247216dd49d94fca876481..9ed5515ea3e76eb3a7b23fbf055e2a0cf5840c71 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -2,11 +2,11 @@
   gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "mate-themes-${version}";
+  pname = "mate-themes";
   version = "3.22.20";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
   };
 
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index eae425b18920d99f65083f8e80ace662cea9a59b..a9a0e1712312149755685a6d25ebd0e50c37504a 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, itstool, libxml2, yelp }:
 
 stdenv.mkDerivation rec {
-  name = "mate-user-guide-${version}";
+  pname = "mate-user-guide";
   version = "1.22.2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h";
   };
 
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index f152515d60e9a5145b008f8df250d8e81a7cc7bd..999bee2e5d10c8ad9435a1b4b60f487901285f59 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-user-share-${version}";
+  pname = "mate-user-share";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k";
   };
 
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 606a473cfaaccb53af0e6164def9893a00132867..7775173611e28ada8aa225f2817c0fc288b10496 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "mate-utils-${version}";
+  pname = "mate-utils";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg";
   };
 
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 171d8971c4e8fee103f7d3deab9c88805632de75..cfbe33dd380d727c6c7f5af03e2391c5b7532d6b 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "pluma-${version}";
+  pname = "pluma";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg";
   };
 
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index c3b39e85925d2a072fceb342ad2a33ac96494d05..42a8e328a161a31ffb7484c41b9f2d106fcb75d5 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "python-caja-${version}";
+  pname = "python-caja";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 8381796c4561798b103126abc6a430a4474dbc0b..67a67dd4b3d2c7c899123242f74239369f401818 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -150,6 +150,12 @@ stdenv.mkDerivation rec {
     "-Dudev_dir=${placeholder "out"}/lib/udev"
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = repoName;
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index d1bd9e957f7162f32f4fa1c307b48de839eef597..07c6805c689a93f4f90b81ad64f1021b841463ee 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -86,7 +86,7 @@ let
                 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
               ];
               platforms = lib.platforms.linux;
-              maintainers = with lib.maintainers; [ ttuegel ];
+              maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
               homepage = http://www.kde.org;
             } // (args.meta or {});
           in
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 034b57ec06a3de5d206cdb1ff0b90fbda34f9a6f..4efd493a3dd7a2983fd7ce65291a4911a920c7c2 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.4/ )
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 150b97be50d730d7f3ac3ca1bddfebbea2931b28..01e740f74c4bc397130a1d8f300e3c1dadf1177c 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   lm_sensors,
   kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
-  knewstuff, libksysguard, qtwebkit
+  knewstuff, libksysguard
 }:
 
 mkDerivation {
@@ -11,6 +11,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-    kdelibs4support ki18n lm_sensors qtwebkit
+    kdelibs4support ki18n lm_sensors
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 1cbfb87ea56385d0f724701f43b33390de2c6dc6..b4fd032cf1f794a2e4b48c7c382471f8679ab493 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,9 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }:
+{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }:
 
 mkDerivation {
   name = "kwallet-pam";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ pam socat libgcrypt qtbase ];
+  buildInputs = [ pam socat libgcrypt qtbase kwallet ];
   postPatch = ''
     sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
   '';
diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 51f15c87d2740b048a8738cfd6bc7d5bb96f4b5b..9d405b3bbb86c1e506b90460ad4a373908c24a9c 100644
--- a/pkgs/desktops/plasma-5/kwin/xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch
@@ -1,13 +1,13 @@
-Index: kwin-5.7.3/main_wayland.cpp
+Index: kwin-5.15.5/xwl/xwayland.cpp
 ===================================================================
---- kwin-5.7.3.orig/main_wayland.cpp
-+++ kwin-5.7.3/main_wayland.cpp
-@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe
+--- kwin-5.15.5.orig/xwl/xwayland.cpp
++++ kwin-5.15.5/xwl/xwayland.cpp
+@@ -143,7 +143,7 @@ void Xwayland::init()
  
-     m_xwaylandProcess = new Process(kwinApp());
+     m_xwaylandProcess = new Process(this);
      m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
 -    m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
 +    m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
-     QProcessEnvironment env = m_environment;
+     QProcessEnvironment env = m_app->processStartupEnvironment();
      env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
-     m_xwaylandProcess->setProcessEnvironment(env);
+     env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index 0f9fe40d73c32b1163c30d997671759d01e8d2f8..96d113e11fb62877b991ad5f67f3bae696582fa8 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
-  kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
+  kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine,
   qtx11extras
 }:
 
@@ -15,7 +15,7 @@ mkDerivation {
   buildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
     kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
-    qtwebkit
+    qtwebengine
   ];
   outputs = [ "bin" "dev" "out" ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 55a4518021ed6891160b6b94a19e8b686408d2e8..5c27eee5010e930993b599acac9aef357ff8812d 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -2,12 +2,13 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
 index 69d3070..52e9102 100644
 --- a/sddm-theme/theme.conf.cmake
 +++ b/sddm-theme/theme.conf.cmake
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  [General]
  type=image
  color=#1d99f3
--background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
-+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
+ fontSize=10
+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
 index 6a1a212..f03fd34 100644
 --- a/startkde/CMakeLists.txt
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index ac0a3494c226ee80f07bfd859a1bb82fa66d48b0..21dd5c36d78f8ad2cf53ac18a663e7bcb06c85a4 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz";
-      sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f";
-      name = "bluedevil-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz";
+      sha256 = "36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521";
+      name = "bluedevil-5.16.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz";
-      sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4";
-      name = "breeze-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-5.16.4.tar.xz";
+      sha256 = "84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395";
+      name = "breeze-5.16.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz";
-      sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64";
-      name = "breeze-grub-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz";
+      sha256 = "c36b2183fff7d559ae944881443e0caa03c63bcc81af9f6b21b722109d2e34db";
+      name = "breeze-grub-5.16.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz";
-      sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8";
-      name = "breeze-gtk-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz";
+      sha256 = "8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb";
+      name = "breeze-gtk-5.16.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz";
-      sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8";
-      name = "breeze-plymouth-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz";
+      sha256 = "7556c8f6bff771f3439036f843309b45594c5e903fc11a3275cc2c38346dec9f";
+      name = "breeze-plymouth-5.16.4.tar.xz";
     };
   };
   discover = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz";
-      sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854";
-      name = "discover-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/discover-5.16.4.tar.xz";
+      sha256 = "0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0";
+      name = "discover-5.16.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz";
-      sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e";
-      name = "drkonqi-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz";
+      sha256 = "9d030a59a6d1d732241f8c54a54291ac60584d542ea0b891ca4b2bcb958bd51f";
+      name = "drkonqi-5.16.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz";
-      sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db";
-      name = "kactivitymanagerd-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz";
+      sha256 = "a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770";
+      name = "kactivitymanagerd-5.16.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz";
-      sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace";
-      name = "kde-cli-tools-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz";
+      sha256 = "56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d";
+      name = "kde-cli-tools-5.16.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz";
-      sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f";
-      name = "kdecoration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz";
+      sha256 = "aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4";
+      name = "kdecoration-5.16.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz";
-      sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185";
-      name = "kde-gtk-config-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz";
+      sha256 = "c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c";
+      name = "kde-gtk-config-5.16.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz";
-      sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3";
-      name = "kdeplasma-addons-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz";
+      sha256 = "4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1";
+      name = "kdeplasma-addons-5.16.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz";
-      sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7";
-      name = "kgamma5-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz";
+      sha256 = "18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46";
+      name = "kgamma5-5.16.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz";
-      sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127";
-      name = "khotkeys-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz";
+      sha256 = "a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d";
+      name = "khotkeys-5.16.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz";
-      sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8";
-      name = "kinfocenter-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz";
+      sha256 = "30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426";
+      name = "kinfocenter-5.16.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz";
-      sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26";
-      name = "kmenuedit-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz";
+      sha256 = "f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2";
+      name = "kmenuedit-5.16.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz";
-      sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7";
-      name = "kscreen-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz";
+      sha256 = "40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328";
+      name = "kscreen-5.16.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz";
-      sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd";
-      name = "kscreenlocker-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz";
+      sha256 = "92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f";
+      name = "kscreenlocker-5.16.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz";
-      sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e";
-      name = "ksshaskpass-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz";
+      sha256 = "e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c";
+      name = "ksshaskpass-5.16.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz";
-      sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a";
-      name = "ksysguard-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz";
+      sha256 = "10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5";
+      name = "ksysguard-5.16.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz";
-      sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e";
-      name = "kwallet-pam-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz";
+      sha256 = "7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429";
+      name = "kwallet-pam-5.16.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz";
-      sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17";
-      name = "kwayland-integration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz";
+      sha256 = "f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace";
+      name = "kwayland-integration-5.16.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz";
-      sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805";
-      name = "kwin-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwin-5.16.4.tar.xz";
+      sha256 = "71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6";
+      name = "kwin-5.16.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz";
-      sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510";
-      name = "kwrited-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz";
+      sha256 = "c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f";
+      name = "kwrited-5.16.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz";
-      sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87";
-      name = "libkscreen-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz";
+      sha256 = "f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723";
+      name = "libkscreen-5.16.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz";
-      sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0";
-      name = "libksysguard-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz";
+      sha256 = "b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f";
+      name = "libksysguard-5.16.4.tar.xz";
     };
   };
   milou = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz";
-      sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9";
-      name = "milou-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/milou-5.16.4.tar.xz";
+      sha256 = "de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89";
+      name = "milou-5.16.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz";
-      sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c";
-      name = "oxygen-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz";
+      sha256 = "7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1";
+      name = "oxygen-5.16.4.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz";
-      sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b";
-      name = "plasma-browser-integration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz";
+      sha256 = "a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef";
+      name = "plasma-browser-integration-5.16.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz";
-      sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741";
-      name = "plasma-desktop-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz";
+      sha256 = "990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344";
+      name = "plasma-desktop-5.16.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz";
-      sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621";
-      name = "plasma-integration-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz";
+      sha256 = "d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d";
+      name = "plasma-integration-5.16.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz";
-      sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee";
-      name = "plasma-nm-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz";
+      sha256 = "2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09";
+      name = "plasma-nm-5.16.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz";
-      sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92";
-      name = "plasma-pa-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz";
+      sha256 = "9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4";
+      name = "plasma-pa-5.16.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz";
-      sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329";
-      name = "plasma-sdk-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz";
+      sha256 = "ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403";
+      name = "plasma-sdk-5.16.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz";
-      sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827";
-      name = "plasma-tests-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-tests-5.16.4.tar.xz";
+      sha256 = "9e0f8fcef080fc1b0ffae01f6b3caa17eccac27445e312243221fcace56d1097";
+      name = "plasma-tests-5.16.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz";
-      sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5";
-      name = "plasma-vault-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz";
+      sha256 = "8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6";
+      name = "plasma-vault-5.16.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz";
-      sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973";
-      name = "plasma-workspace-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz";
+      sha256 = "5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1";
+      name = "plasma-workspace-5.16.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz";
-      sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945";
-      name = "plasma-workspace-wallpapers-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz";
+      sha256 = "052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003";
+      name = "plasma-workspace-wallpapers-5.16.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz";
-      sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa";
-      name = "plymouth-kcm-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz";
+      sha256 = "cf9d3e6f14d012617cc8a5c3381295449e68b1b13209436b561417232d21863f";
+      name = "plymouth-kcm-5.16.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.15.5";
+    version = "1-5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz";
-      sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267";
-      name = "polkit-kde-agent-1-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz";
+      sha256 = "917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0";
+      name = "polkit-kde-agent-1-5.16.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz";
-      sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06";
-      name = "powerdevil-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz";
+      sha256 = "40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed";
+      name = "powerdevil-5.16.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz";
-      sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b";
-      name = "sddm-kcm-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz";
+      sha256 = "340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68";
+      name = "sddm-kcm-5.16.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz";
-      sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a";
-      name = "systemsettings-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz";
+      sha256 = "73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e";
+      name = "systemsettings-5.16.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz";
-      sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431";
-      name = "user-manager-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz";
+      sha256 = "3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745";
+      name = "user-manager-5.16.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.15.5";
+    version = "5.16.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz";
-      sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50";
-      name = "xdg-desktop-portal-kde-5.15.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz";
+      sha256 = "3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052";
+      name = "xdg-desktop-portal-kde-5.16.4.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index 79f0800ff34c6be222670a4ca6fcfaa1d55e352e..2782decf6c4c6694d3a26220d86d11f8bc06a6a0 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -3,12 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname  = "xfce4-hardware-monitor-plugin";
   version = "1.6.0";
 
   src = fetchurl {
-    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2";
+    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2";
     sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
index 7134d29c9ffbe6f994910320c3eea3c7915983d5..f67ba7af8aa968ad122b7801133a59cee0a2fab5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
 stdenv.mkDerivation rec {
-  name = "vala-panel-appmenu-xfce-${version}";
+  pname = "vala-panel-appmenu-xfce";
   version = "0.6.94";
 
   src = "${fetchFromGitHub {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 694f6772282b6a7fca42aaf9b1d4a976bb9dbee6..144291da86d723dafd81918cf5785e64512eae5b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -3,7 +3,7 @@
   xfce, libwnck3, libdbusmenu, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "xfce4-vala-panel-appmenu-plugin-${version}";
+  pname = "xfce4-vala-panel-appmenu-plugin";
   version = "0.6.94";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix
index 2178226ab9d365aff16da97775df23d30fc4de0d..827c5137bf8e38f7c22d9d102a4d082da29c6799 100644
--- a/pkgs/development/arduino/arduino-mk/default.nix
+++ b/pkgs/development/arduino/arduino-mk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.0";
-  name = "arduino-mk-${version}";
+  pname = "arduino-mk";
 
   src = fetchFromGitHub {
     owner  = "sudar";
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index c48b36e5aba5c965dd3e74f62ba74638d8a1bc7d..accedf9a7af724dd24a8e84f65fdd644597bdbef 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, ant, jre, jdk}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "abcl";
   version = "1.5.0";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index a3c34bd7e8e6d65b67b5a08b230ad4aceb633772..305e0f202bf13410353a707ded5d2b8f90f616cf 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdoptOpenJDK";
     repo = "IcedTea-Web";
-    rev = "${pname}-${version}";
+    rev = "icedtea-web-${version}";
     sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
   };
 
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index e8759ec073b36b28f3919ca9c25d4a22488266df..ed6b2b2ff24735948cc0fef5d2d38e7cba28e8cb 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -7,11 +7,11 @@ let
     sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f";
   };
 in stdenv.mkDerivation rec {
-  name = "apache-flex-sdk-${version}";
+  pname = "apache-flex-sdk";
   version = "4.16.1";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz";
+    url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
   };
 
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index ad68382c13ae6d64b95dc905639c567458fc72b2..3058e926c3f96707a1c6ef42b916d9fc18ba8a6f 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -3,7 +3,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "arachne-pnr-${version}";
+  pname = "arachne-pnr";
   version = "2018.09.09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index 519992fd8c2684e1967a6424305fdd074505e1c2..b70fde00e15e3c19901a586cc0451ec67ff7440c 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.3.1";
 
 in stdenv.mkDerivation {
-  name = "as31-${version}";
+  pname = "as31";
+  inherit version;
   src = fetchurl {
     name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
     url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
index ce754813dda168a112b7fafcb1d3c59b1372663c..3cbb7577f34c0927bea515ebdea82f44bdadb598 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "asn1c-${version}";
+  pname = "asn1c";
   version = "0.9.28";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix
index 002f34daa13b3eb2782940592ec82fbaca944280..f086c36468d7f8817661c8a471d74238a6aa04fb 100644
--- a/pkgs/development/compilers/ats/default.nix
+++ b/pkgs/development/compilers/ats/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name    = "ats-${version}";
+  pname = "ats";
   version = "0.2.12";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index df61ea2b791cfe6e6a0ff4cff898f693d1469f36..a1e5927e349ffc572b9c25af55147c2b60ca4536 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -26,7 +26,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name    = "ats2-${version}";
+  pname = "ats2";
   version = versionPkg;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 387ae906b88dae947020319c01a0fa07c305f76b..34d1e64c484f25a1e616b43ec4276df9c33a758d 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
 
 stdenv.mkDerivation rec {
-  name = "avian-${version}";
+  pname = "avian";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index bf2272a75c17d2d32a0deeeb780988a076c4e840..6e768e65091b01e1b2af45817952754b23d84dda 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "bigloo-${version}";
+  pname = "bigloo";
   version = "4.1a-2";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 52323b3de765439a2d67f12a3bddc74a8fccc9e6..c0e6c4b50044a4e5eb8aef8bf695e534ee9eb1f1 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   rev = if emscriptenRev == null
         then "version_${version}"
         else emscriptenRev;
-  name = "binaryen-${version}";
+  pname = "binaryen";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 646963eedbca903a78eb790f48603b8b97a8a5e2..6fac183125f55a6e417f4f1ae642af516672d1bb 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -33,7 +33,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name     = "ccl-${version}";
+  pname = "ccl";
   version  = "1.11.5";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 9216c77914335435eb81126b51b081f0cd989d75..1bac7eb9b95e7f3f1eb7c622c8e59f2e8c7a3aea 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "chez-scheme-${version}";
+  pname = "chez-scheme";
   version = "9.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index ceeff56330b2e457ada35cd1cfae5c95defda290..34512fc8ef050421210bedb542c658c734627a06 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -11,7 +11,8 @@ let
   lib = stdenv.lib;
 in
 stdenv.mkDerivation {
-  name = "chicken-${version}";
+  pname = "chicken";
+  inherit version;
 
   binaryVersion = 8;
 
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 74f7118119075094ae67a3888ac007f755cfbec0..5fefce12dbf17ee21637d5ca9d6ce7772e38d992 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -11,7 +11,8 @@ let
   lib = stdenv.lib;
 in
 stdenv.mkDerivation {
-  name = "chicken-${version}";
+  pname = "chicken";
+  inherit version;
 
   binaryVersion = 11;
 
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index a1e29951ddb5852c851fa12b003d9b06ec1ac375..664d849211350748ad54ee8e9670193e63fd31f9 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -56,7 +56,6 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "clasp";
   version = "0.8.99.20181128";
 
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index e9e9736182577c8642f0a74df9aadc9a2fc16774..d9f2a588d8f6f8ade2a3eafd83dc0413fdd9785a 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "closure-compiler-${version}";
+  pname = "closure-compiler";
   version = "20190215";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 9e3184c42eb2aefd8419f8eda912068ff29dbd5b..3f93ea9e1bac81dc1342d69bfb7a13ee0e0661e5 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -19,7 +19,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "cmucl-binary-${version}";
+  pname = "cmucl-binary";
+  inherit version;
 
   buildCommand = ''
     mkdir -p $out
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 237a80280ec838a961e81696c965c77e0ffad92b..cc8e9f827b7fa89015753b8df4a01b3fa3f7d882 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "colm-${version}";
+  pname = "colm";
   version = "0.13.0.7";
 
   src = fetchurl {
-    url = "https://www.colm.net/files/colm/${name}.tar.gz";
+    url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz";
     sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
   };
 
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 69e11a48918c80530d684ec809b144d0b7c7b7de..940eb851fe619faee1ec39073e450a507c3896ce 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -11,7 +11,7 @@ let
   ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
 in
 stdenv.mkDerivation rec {
-  name    = "compcert-${version}";
+  pname = "compcert";
   version = "3.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 8be482e2150fa9b073550f067d042dba4bf62346..00816fca36bd303002d8ca4250f623112b48c1dc 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "coreclr-${version}";
+  pname = "coreclr";
   version = "2.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 2bc3d396da64675aa2af2079b909644144935b22..0c79b3d394ff2f3824fc5b93a84088ab7ed368cf 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -24,7 +24,8 @@ let
 
   genericBinary = { version, sha256s, rel ? 1 }:
   stdenv.mkDerivation rec {
-    name = "crystal-binary-${version}";
+    pname = "crystal-binary";
+    inherit version;
 
     src = fetchurl {
       url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 5b9e9010ef056d42dc5c32dd988b3f0acea06d5e..8aab9580232bd5208f0e807d44eb21fd7f474900 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,7 +16,7 @@ let
     }:
 
     stdenv.mkDerivation rec {
-      name = "cudatoolkit-${version}";
+      pname = "cudatoolkit";
       inherit version runPatches;
 
       dontPatchELF = true;
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index 8bae6e2363f64d2087997516873c0c36644fcc42..128c245d2773e14b7d1d7fa9f2ad1f170ecc6511 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -11,7 +11,8 @@
 let version = "20170519";
 
 in stdenv.mkDerivation {
-  name = "dale-${version}";
+  pname = "dale";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "tomhrr";
diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 514075651e156ff2b9d636c204f4a70800de4d3b..839ee821d00e368929f8a4b69d9087d7af049cb8 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dev86-${version}";
+  pname = "dev86";
   version = "0.16.21";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index b3b58e8362153cb832c972fc6dea2e08ecf7a2de..332ded31df6a5747115ebd6d63aac0c063b27308 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "dmd-${version}";
+  pname = "dmd";
   inherit version;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix
index 4635c6d0a4e831386dffb47c709fb0dede13151f..a22862c42920eac14c0aa8b2036f88a2d994901e 100644
--- a/pkgs/development/compilers/eli/default.nix
+++ b/pkgs/development/compilers/eli/default.nix
@@ -28,11 +28,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "eli-${version}";
+  pname = "eli";
   version = "4.8.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2";
     sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
   };
 
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index 1128fbe64ec3aa4088bc82ad833da20a884cbc11..cb960227bebe73a022198c7b2e8183bbedd34803 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = src.rev;
-  name = "eql-git-${version}";
+  pname = "eql-git";
   src = fetchgit {
     rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
     url = "https://gitlab.com/eql/eql.git";
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 405aa8aa3ca5aead82d243a38ff3566c9117ff14..ef445faec9230fc2d82a0b97ffe8bd189e75d070 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -4,7 +4,7 @@
   mesa, xorg, openssl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "factor-lang-${version}";
+  pname = "factor-lang";
   version = "0.98";
   rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
 
diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix
index 47b90469234f1140dc38f6f19d93a56fe2cc5884..4b20c4051a82e14bb90d6bdb621573a3d2976d8d 100644
--- a/pkgs/development/compilers/fasm/default.nix
+++ b/pkgs/development/compilers/fasm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (fasm-bin) version src meta;
 
-  name = "fasm-${version}";
+  pname = "fasm";
 
   nativeBuildInputs = [ fasm-bin ];
 
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index b516019ffc9a7ca5a2a3bd7fb4ca7517ab87dc23..a2b73f61c27922f77eaaffc1897c33e34dd68404 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
   version = "3.0.0";
-  name = "fpc-${version}";
+  pname = "fpc";
 
   src = fetchurl {
     url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 3fe72e6b50577ebdeea2f10b0b586df175066146..1b3f4d168ee9f496ae6c5f4a9ddfc2b98c23586c 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -3,7 +3,7 @@
 , libXi, xorgproto, libX11, libXext
 }:
 stdenv.mkDerivation rec {
-  name = "lazarus-${version}";
+  pname = "lazarus";
   version = "1.8.4";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 2de487cc9c8b443482f9d78e5d9263e37795c525..bcb95d9ca9062980c7545cc0a2b04b7af90cabf1 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
 
 stdenv.mkDerivation rec {
-  name = "fsharp-${version}";
+  pname = "fsharp";
   version = "4.0.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index 468fd49ba44e8323d020c70e47e9bd2c938a9529..e497deb2e873b3cbc1287849f9ea967fa4594fcb 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
 
 stdenv.mkDerivation rec {
-  name = "fsharp-${version}";
+  pname = "fsharp";
   version = "4.1.34";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 94836e84fd689641c5a5a05d73f46f14bbcf0d56..9306eec817f9901ff04da6408369323debb13451 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "fstar-${version}";
+  pname = "fstar";
   version = "0.9.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 65cd67f527d4f6cc84721ddbbedb4e70c68cf468..eca2cba7775fadcbe7f673e6e9003dae0cb68bbf 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, ... }:
 
 stdenv.mkDerivation rec {
-  name    = "gambit-bootstrap-${version}";
+  pname = "gambit-bootstrap";
   version = "4.9.3";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 65d16c48a616babf560759d1f7265bd2da00ec45..7a3324d75602b724ea6bcd2702f815af61d675c2 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,7 +1,8 @@
 { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
 
 stdenv.mkDerivation rec {
-  name    = "gambit-${version}";
+  pname = "gambit";
+  inherit version;
   inherit src;
 
   bootstrap = import ./bootstrap.nix ( pkgs );
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
index 9e5a172eed84ec11d574898a8476c0a63390171a..940dec0338ca0f8dde25f75e5291e207424d435b 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses5, python27 }:
 
 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
   version = "6-2017-q2-update";
   subdir = "6-2017q2";
 
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
index 80e042b5c2e920593c538ef3dfc4520b3c5cf50c..90f9d5957bb3e9babc4f5055bc93d990aafc2ff5 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
   version = "7-2018-q2-update";
   subdir = "7-2018q2";
 
diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index 562a21716b72a4b00888379b9737a031c010622f..b2815cc718492773df0cbe78b01a748de7e5d704 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
   version = "8-2019-q3-update";
   subdir = "8-2019q3/RC1.1";
 
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 350eed2fedd0f0a724f8372680f293a7902cf13e..b86b35525a67ecc791fe2f514aa41b8eb3476d4b 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -14,7 +14,8 @@ let
     else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
 in
 stdenv.mkDerivation {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
+  inherit version;
 
   src = fetchurl {
     url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 16450cf24ab4e5bdab5033178d0103a04e6c4cdd..1c3df80645a8a1afc580a6a580e0a493e3bf5f34 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -8,7 +8,7 @@ assert stdenv.cc ? libc ;
 assert stdenv.cc.libc != null ;
 
 stdenv.mkDerivation rec {
-  name = "gcl-${version}";
+  pname = "gcl";
   version = "2.6.13pre50";
 
   src = fetchgit {
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 50d397d2cd4743e40bf5f5d58f80970ca3be7186..e3c2d0e09de3cbbdb34a0eeb606bd44b9ffce37e 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -8,12 +8,12 @@ assert stdenv.cc ? libc ;
 assert stdenv.cc.libc != null ;
 
 stdenv.mkDerivation rec {
-  name = "gcl-${version}";
+  pname = "gcl";
   version = "2.6.12";
 
   src = fetchurl {
     sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
-    url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
+    url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz";
   };
 
   patches = [(fetchurl {
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index b20d6f9c47eff243e62d97c62b93482779473a6c..9ef650c330fab88dd36dd4bb57fa7780835908d7 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -7,7 +7,8 @@
 # TODO: make static compilation work
 
 stdenv.mkDerivation rec {
-  name    = "gerbil-${version}";
+  pname = "gerbil";
+  inherit version;
   inherit src;
 
   # Use makeStaticLibraries to enable creation of statically linked binaries
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index 675522d54ead1089478760c476c6be1bce6a2db3..e90e0dc3d983e343650e69dca2a63817ecf40c16 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.7.3";
 in
 stdenv.mkDerivation {
-  name = "gforth-${version}";
+  pname = "gforth";
+  inherit version;
   src = fetchurl {
     url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
     sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index ae27964ae8f0897a31e0baa13026731ec53b4740..df5202cb1c20430fab745ed9766790c0fbd48d0a 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -6,7 +6,7 @@ let
   lib = stdenv.lib;
 in
 stdenv.mkDerivation rec {
-  name = "gnu-cobol-${version}";
+  pname = "gnu-cobol";
   inherit version;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 41c325c2b1ad24cfebd38dfab436f9c30618acab..1035091654a6d93c43cb2a5634f1cd86e1566576 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library.
 in stdenv.mkDerivation rec {
 
   version = "3.2.5";
-  name = "gnu-smalltalk-${version}";
+  pname = "gnu-smalltalk";
 
   src = fetchurl {
     url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz";
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index 69507685f29b3804dff51ab4ba8c3ee42dde3c05..e051d41993ccbdf8e3aef138b1479ac36b8da654 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-jsonnet-${version}";
+  pname = "go-jsonnet";
   version = "0.13.0";
 
   goPackagePath = "github.com/google/go-jsonnet";
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 39de36293c8ea4c9fe551423af77ae5943012f38..3b924f58bfe14c94a0681e1ac595e934c39a3001 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -23,7 +23,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "go-${version}";
+  pname = "go";
   version = "1.10.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 95312f9e1eadc3225fb67900d970d07effa6b67d..97c243439e89cd1c0a987f628853b037aa18390a 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "go-${version}";
+  pname = "go";
   version = "1.4-bootstrap-20161024";
   revision = "79d85a4965ea7c46db483314c3981751909d7883";
 
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index be03e1aeeed33b0dc3c90828bbe9d77868e6bfbf..61e3b6c16aee737c899281cb5554057dbe3ef0cf 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -214,7 +214,7 @@ in rec {
 
   jvmci8 = stdenv.mkDerivation rec {
     version = "19.2-b01";
-    name = "jvmci-${version}";
+    pname = "jvmci";
     src = fetchFromGitHub {
       owner  = "graalvm";
       repo   = "graal-jvmci-8";
@@ -280,7 +280,7 @@ in rec {
 
   graalvm8 = stdenv.mkDerivation rec {
     inherit version;
-    name = "graal-${version}";
+    pname = "graal";
     src = fetchFromGitHub {
       owner  = "oracle";
       repo   = "graal";
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 0a974fccc888bcbb8a77d014ae1a693f60059e4d..7e11c75e07dccd90484c4b588cd34d4fcd6853ed 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -3,7 +3,8 @@
 let
   generic = { version, sha256, prePatch }:
     stdenv.mkDerivation rec {
-      name = "haxe-${version}";
+      pname = "haxe";
+      inherit version;
 
       buildInputs = [ocaml zlib pcre neko camlp4];
 
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 010dacd0c71a9c693a73a9f4c8a34f776d3350a6..24e88f9ee2e2cb5dfbd469e3fb44f6a7e594db67 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "hhvm-${version}";
+  pname = "hhvm";
   version = "3.23.2";
 
   # use git version since we need submodules
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 2b5891256043e22a5eff1e60a79509310d17322d..b1b31aecae138ff5aea1d3caa9391dee23ce61cf 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, bison, flex}:
 
 stdenv.mkDerivation rec {
-  name = "iasl-${version}";
+  pname = "iasl";
   version = "20181213";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
index a6955c030519f392acec7e8ee0e5cdfe30684260..2a6551aad18767bbacc145ec422aaa95f9e09076 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -2,7 +2,8 @@
 let
   version = "6M62";
 in stdenv.mkDerivation {
-  name = "inform7-${version}";
+  pname = "inform7";
+  inherit version;
   buildInputs = [ perl coreutils gnutar gzip ];
   src = fetchzip {
     url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz";
diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
index f601dc254a43bc9df06eda773090ec2e7b60e66c..6640c4aa89abb4c585dc300ef26cb7d203815909 100644
--- a/pkgs/development/compilers/intercal/default.nix
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "intercal-${version}";
+  pname = "intercal";
   version = "0.30";
 
   src = fetchurl {
-    url = "http://catb.org/esr/intercal/${name}.tar.gz";
+    url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz";
     sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
   };
 
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 1cbe95232eb72ee478791b414512c45105e64890..f240deda0bf9331916f5a85bc722ecd775cea8ce 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   inherit testedTargets;
 
-  name = "ispc-${version}";
+  pname = "ispc";
 
   src = fetchFromGitHub {
     owner = "ispc";
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix
index 06f321bc39c451e992fe8a6befa7c87584aca412..f49d3d6e21097809fc34566b16547e8f33f8f1d6 100644
--- a/pkgs/development/compilers/javacard-devkit/default.nix
+++ b/pkgs/development/compilers/javacard-devkit/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "javacard-devkit";
   version = "2.2.2";
   uscoreVersion = builtins.replaceStrings ["."] ["_"] version;
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index d407fb46b9b5615b5b036654d3d380ce8b97dba0..1349b7f0dddca4d29fa03cb23b67969f47a8c3d5 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -8,7 +8,6 @@
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
   version = "164";
-  name = pname + "-" + version;
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 7bbad0e12016f0d7577f845596fabcd64c95f6f1..460ff405b94e5230a0fce945d883a8b3db21bcf1 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "jsonnet-${version}";
+  pname = "jsonnet";
   version = "0.13.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index d8d521952bdaec7f31518ee699f4877987120846..c0414c6259fdd780daa5a6e2ee8805d3b4c788b3 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -77,10 +77,9 @@ in
 stdenv.mkDerivation rec {
   pname = "julia";
   inherit version;
-  name = "${pname}-${version}";
 
   src = fetchzip {
-    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = src_sha256;
   };
   prePatch = ''
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
index 9800b33e7a9eaade54b91c1f64f9c154d38a911f..b2db09e1c182fed445caf52d66d2d1af42f8b7ec 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -3,7 +3,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "jwasm-${version}";
+  pname = "jwasm";
   version = "git-2017-11-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 32659d5be5640f54a43e82dd61ec51c07fecc95e..754ab020d51e6f77694550a7f64081c2f771609b 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -4,7 +4,7 @@ let
   version = "1.3.41";
 in stdenv.mkDerivation rec {
   inherit version;
-  name = "kotlin-${version}";
+  pname = "kotlin";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index e4ef37e4721d30bc0751213b9dd991836b3046c4..787a9352e2259652abaf0306cabfcd15e440a25b 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -21,7 +21,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ldc-${version}";
+  pname = "ldc";
+  inherit version;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 132cd67a4aebfcb482a3e89d803c756ea5fdc1bd..9a602c62777dca64290257c40ad3369f0276e67e 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -2,7 +2,8 @@
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation {
-  name = "clang-${version}";
+  pname = "clang";
+  inherit version;
 
   src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg";
 
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index d54ffd96382d19f15935860243ef491f98db421c..e327fa79c6f08a091e384aee33f3d561dcaa9511 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -1,7 +1,8 @@
 {stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
 
 stdenv.mkDerivation rec {
-  name = "dragonegg-${version}";
+  pname = "dragonegg";
+  inherit version;
 
   src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw";
 
@@ -11,9 +12,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
 
   installPhase = ''
-    mkdir -p $out/lib $out/share/doc/${name}
+    mkdir -p $out/lib $out/share/doc/${pname}-${version}
     cp -d dragonegg.so $out/lib
-    cp README COPYING $out/share/doc/${name}
+    cp README COPYING $out/share/doc/${pname}-${version}
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 6edd5e9798c787a93be051f0a906a285d6392077..4f766e5f9a5c5e887e1ec7301b2af8027efaf26f 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -3,7 +3,8 @@
 let version = "3.5.2"; in
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz";
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index 268f2702a234f2a5cd8677ee2c9309d87a1bb3d7..d295ddbf8a445f9bedb58c311844693a8157a436 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -8,7 +8,8 @@ let
     sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j";
   };
 in stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 4a398bd96a0528d7634d9bab050050ed557756e9..8fe4dd6f1d5fa3d17dd28859adc957749374901e 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -1,7 +1,8 @@
 { stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89";
 
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index a5161333b28291e76283f9c17661e33287f5b344..b4823e9d8c2a0d072569ba11bc3e7b4645eca319 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -13,7 +13,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7";
 
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 6eec9971778508b7b95bfad462157337bcc33dc7..95632a45999dbc50f6ca688289c978e1035cf83f 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -18,7 +18,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "llvm-${version}";
+  pname = "llvm";
+  inherit version;
 
   src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4";
 
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index bacf4d30556b6b48f579bd8fe19db23bfb05317a..06bc7490c7b5533a6a9abd283a9667e2be2e2ca3 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -1,7 +1,8 @@
 { stdenv, fetch, cmake, isl, python, gmp, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "polly-${version}";
+  pname = "polly";
+  inherit version;
 
   src =  fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx";
 
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 47a1bed126da74cc98734b6f382a2750694e6ad5..0276393d840c9643489ed117eb26516e6f7e4639 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -3,7 +3,8 @@
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
   self = stdenv.mkDerivation {
-    name = "clang-${version}";
+    pname = "clang";
+    inherit version;
 
     src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc";
 
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index 5a0410302f2ffd9e099008823b389562d80c72c5..b66284152d4967902b7cef4eb6189ab969829a2b 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp";
 
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
index 8b25681c2dbf4ef136ab61e0642ed7e81d1877aa..80b069fff75acd4ded9fa986ee0981f38b105d80 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
 
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix
index d27786464c0516974ecdc81ee39593effea58c20..985cd66638574d3e718b043cd9b7af2f81c46b1b 100644
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.8/lldb.nix
@@ -13,7 +13,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l";
 
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index a73b73137ddceeb5d9bb218ce595c58fc2e387c6..5fe681185b2d71aff45ec80385e16bb36c930711 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -17,7 +17,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "llvm-${version}";
+  pname = "llvm";
+  inherit version;
 
   src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf";
 
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index e2cf437e19e120847bbe666634738962ad7d77cc..3d09277ad4cf14bbc6eb70114ec630d757f3d40e 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -3,7 +3,8 @@
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
   self = stdenv.mkDerivation {
-    name = "clang-${version}";
+    pname = "clang";
+    inherit version;
 
     src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76";
 
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index bd2cc19d2e0bcdb34a72bb79c37a6b6b27fa5a61..af65fd6388eae50bbf6bc846b543f7615b44d65c 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5";
 
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index dffb207a32b68f4d83dcbb1d0aa2e4095eb5f1c6..f799199d449f7b232d991eaad33180dbdd5881b6 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
 
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 52f27de8cdb52c305b1e6e6101615839c5fd4432..1a7c9aeead8699426682823e1d8d486b260bb14d 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -13,7 +13,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy";
 
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index c8d819cc96345bb6fd29ef6e2574edfa33acecb9..4dde3be277abd92e8f86d88ad281f79a64b35cd7 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -27,7 +27,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "llvm-${version}";
+  pname = "llvm";
+  inherit version;
 
   src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
 
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 2b543b9d793ab49fbbfbcc0761be420863e57a81..74e9b8719d1d307e514068bd02be36c86a8c0728 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj";
 
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 735c5e9e7435567b55a206b071fd73e2512a7187..8e36c5ad53a67274e175c1cc3eab7bab1ca605a7 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g";
 
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index cf6de26a9e83f26e9111761dd1ed4b87f99308e2..3ab56677d72f2f9991be04d297b179503c91aad0 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3";
 
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 325149fc19be6785d806def21dcb817bb77ac6a4..8adf11abddda30acfce76cfd4c215649f128302c 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4";
 
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index a8a6b3dfea874dc4044b7356439903a553b033d0..a69fe286ecc00b7ec2c3ef737f8885d46fd2b977 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc";
 
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 19833e4d3d4abb217444ef18a1bd3b67c4b2de6f..9660be4df11f95f2412150e8676954980c2e8cbb 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -1,7 +1,7 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
 
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index b182f1250e724b7213716a357bb9ad3f0f567dae..e3015ae8448da830f7839755515b15a0c78e5547 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";
 
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix
index 227ecbeda194b97d7f0a29737c4634337cddfb59..1b891af09ed148d2e885ae862dac48ed8a23ff34 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
 
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index bf23f80ef1039bc535302a1123ee91e504ca0ae0..bfee91d91bf6afd40e5595274044df2908105988 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6";
 
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix
index 5e670d4de159801921d7575efd27d4663c9dd1ea..cce44c7e50f9e38d4cc54f0d3139eeff39cc53fc 100644
--- a/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/pkgs/development/compilers/llvm/5/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";
 
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 901015bf2ff4a2ba1ab9f28ca97302ceb26c09c1..559377bcc1b74573ba36b55aba7ecdb43c33d9fa 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir";
 
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index be18a315f12a4afa4fc64f36ca954d5cfecdde64..da2a5cfb58aece2758b7e120189daabdbc21c164 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,7 +1,7 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
 
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 3a165e9da7b1baa2b0709a91ea8c03481fb78626..906baa4ae6460f4cd3eb0c24b7550c72335881e2 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";
 
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index df9c784a10f4054a4fb9440d50c78ba97852b5e2..ac1f4f653e6a93e6766d949106b6e5ba5df46a66 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
 
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 1e68276945ecc9b63b8e76594d21b63586caae25..58b9b8060fa337f0d234fe04109d2892ad47dac2 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7";
 
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 9571e7ab5a63f4bc42fc39e42d14b1eef1da3df4..d3db8082c96361fdd36fe5b3745833eda730737b 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb";
 
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 908a5f1218f7679118d2a22b0a00d68871905484..447904b9ad5fcd0328db221c4743e11b498be7e3 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6";
 
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 989529ff8cc8937d372356639e44d4ce86a5df49..e9cc6dfc1dbe15eb2e879178029df86c5e6bf064 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -1,6 +1,6 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
 
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index e2ec4e274f4c4e52420d90d2cce610281a86d896..fc9e3714db0cf6d34320a6e57db7f75da5aa8166 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
 
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 2fe6f1c58f660ea78847c73ab3ae332c91599666..b5e6e0e704804cc5a52a37a015ae3153397b2cfc 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,7 +1,8 @@
 { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
 
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
index 63ad43e62cd7f480d60371134326bd845d775514..823e9640cf4ede7842afbe6ccf238b306217a930 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1";
 
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
index 1b2dff2c76cf9e271a188793821a5d5f3408e214..44687ead4d1c347aa26a1d548560a3ebd785ac2a 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -16,7 +16,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
 
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index e55f4aa5ba138d2c57f7a223cfbe319708ce9974..7adc2aa588e37dfd8bcd1cbbf14300ab71f7968a 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy";
 
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 5959b99316d9bf1de1950b59dd4aaec60b56cd55..1f216178b558d769280e85e9216624de6ce18cfe 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -1,6 +1,6 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
   inherit version;
   src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
 
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index f8a07de07222182988909091702ec52447954596..e0bc9e816f5089d9bd9b0b10b56dbcfc75657839 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -2,7 +2,8 @@
 , enableShared ? true }:
 
 stdenv.mkDerivation rec {
-  name = "libc++-${version}";
+  pname = "libc++";
+  inherit version;
 
   src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
 
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix
index 1ee6d069f4b5a5883247df34792ab04c7542b69e..58a1241d823682660194b6aac86995c189abf502 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/8/libc++abi.nix
@@ -2,7 +2,8 @@
 , enableShared ? true }:
 
 stdenv.mkDerivation {
-  name = "libc++abi-${version}";
+  pname = "libc++abi";
+  inherit version;
 
   src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
 
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix
index 75edd1fff54de0eb47ba03504330b835eea7cd7b..646cd3c3ca4a7aadb226605b33c24e3ddff00fcf 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -1,7 +1,8 @@
 { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
 
 stdenv.mkDerivation {
-  name = "libunwind-${version}";
+  pname = "libunwind";
+  inherit version;
 
   src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q";
 
diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix
index aec1b14b9943a0a2c55762ba6c4d65ec433f462b..fc52d691d030f4349b5b68f9475237cf69dfc58f 100644
--- a/pkgs/development/compilers/llvm/8/lld.nix
+++ b/pkgs/development/compilers/llvm/8/lld.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lld-${version}";
+  pname = "lld";
+  inherit version;
 
   src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz";
 
diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix
index f31da000bb82668da901ae5ff4e082da4252ccb1..254933c82a0987fb2879c351e921926e8b58ca90 100644
--- a/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/pkgs/development/compilers/llvm/8/lldb.nix
@@ -15,7 +15,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "lldb-${version}";
+  pname = "lldb";
+  inherit version;
 
   src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8";
 
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix
index 8cf5517356193065359cd870262e1f9805d87d7f..166e7f68eb3b3894214a491bb2fb97b98144bb38 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/pkgs/development/compilers/llvm/8/openmp.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "openmp-${version}";
+  pname = "openmp";
+  inherit version;
 
   src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
 
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index efbf8561b7ff23b7f49c73ba46029f5e167c9219..1c0bdf479871cfac42ee25674556fa3dff799b34 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -3,7 +3,7 @@
 let
   rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
 in stdenv.mkDerivation rec {
-  name = "manticore-${version}";
+  pname = "manticore";
   version = "2018.09.29";
  
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index b7fc3e4dd772d7a5455b049c1496dd8b05a92db5..0327e0dc2155fe78f5d832714162a49ceaf35e9a 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -2,7 +2,7 @@
 , readline }:
 
 stdenv.mkDerivation rec {
-  name    = "mercury-${version}";
+  pname = "mercury";
   version = "14.01.1";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index f15a7624327795fc19882c66d9bb4f6deab1ebc6..a18202b9f884bc25d8c7cbd8b2ad7864f8b09f70 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, vim, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "microscheme-${version}";
+  pname = "microscheme";
   version = "0.9.3";
 
   src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz";
     sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
   };
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 72626ec0014baa648a26634f3f3b6c6f3917b1e0..405846343cf14da658be5927a69732d991b262a0 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
 
 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "mkcl-${version}";
+  pname = "mkcl";
   version = "1.1.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index f495be8a93e4b3224dff821a7a70237b554e4e66..207ed8f29bc75c0946dda544ba6a28c474eb0f18 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -9,32 +9,33 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mlton-${version}";
+  pname = "mlton";
+  inherit version;
 
   binSrc =
     if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
-      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
+      url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz";
       sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
     })
     else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
+        url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz";
         sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
     })
     else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+        url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz";
         sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
     })
     else throw "Architecture not supported";
 
   codeSrc =
     fetchurl {
-      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
+      url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz";
       sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
     };
 
   srcs = [ binSrc codeSrc ];
 
-  sourceRoot = name;
+  sourceRoot = "${pname}-${version}";
 
   buildInputs = [ gmp ];
   nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index 0589733cb3c6251550e09cb99bed0cdb896826a9..2b4998f91c91e52ca05c653b43524e35dbe4197f 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -3,15 +3,15 @@ let
   dynamic-linker = stdenv.cc.bintools.dynamicLinker;
 in
 stdenv.mkDerivation rec {
-  name = "mlton-${version}";
+  pname = "mlton";
   version = "20180207";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz";
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz";
     sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
     })
   else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
-    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz";
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz";
       sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
     })
   else
diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix
index 3a3538a7ea4264baa930a24bcf85050d9770cea6..2585b599caf3b6be9c628651d6e118d24ab2adbc 100644
--- a/pkgs/development/compilers/mlton/from-git-source.nix
+++ b/pkgs/development/compilers/mlton/from-git-source.nix
@@ -9,7 +9,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "mlton-${version}";
+  pname = "mlton";
+  inherit version;
 
   src = fetchgit {
     inherit url rev sha256;
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 6b5c15642a5c526e08a978ae081ff8827d200050..9a2f01b9f3d5f361639c7ed6e43db785afbbc60e 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -7,10 +7,12 @@ let
   llvm     = callPackage ./llvm.nix { };
 in
 stdenv.mkDerivation rec {
-  name = "mono-${version}";
+  pname = "mono";
+  inherit version;
+
   src = fetchurl {
     inherit sha256;
-    url = "https://download.mono-project.com/sources/mono/${name}.${srcArchiveSuffix}";
+    url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
   };
 
   buildInputs =
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 616ec420d2d02138886a8017891b6ea9e7b6ac18..193e45bf55ebd1b17bd5da8104c77cf809d7f462 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "llvm-${version}";
+  pname = "llvm";
   version = "3.6-mono-2017-02-15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix
index b22072651a46455b6a6b0d265ee0c809e6093460..19324593a30ca9a2debccb8fb7196d87e639ef4a 100644
--- a/pkgs/development/compilers/mosml/default.nix
+++ b/pkgs/development/compilers/mosml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gmp, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mosml-${version}";
+  pname = "mosml";
   version = "2.10.1";
 
   buildInputs = [ gmp perl ];
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index ef6cd1160b33c8f1847fed39814929425dfd7a5a..2067184a5b00d9c62d125811ac886e8654747659 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -16,7 +16,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mozart-binary-${version}";
+  pname = "mozart-binary";
+  inherit version;
 
   preferLocalBuild = true;
 
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index bfb3c154a3c711cc4906eb30b536938bb5bcd9ff..8d92bc4eba2f7ee69c9ed0b4d99900b042694937 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "nasm-${version}";
+  pname = "nasm";
   version = "2.14.02";
 
   src = fetchFromRepoOrCz {
     repo = "nasm";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
   };
 
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index e2aa5736c7a3af792b04a8858d58c871ee01da8a..74ccaac388f26681b95e1ebb1132b68f903ef730 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "neko-${version}";
+  pname = "neko";
   version = "2.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 6bd4af05da36b86e04cd0ec58cfc284cf747a297..fa49bf9dd73276dc905f3ef69b50d93a0157509e 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   date = "April2012";
 
-  name = "nvidia-cg-toolkit-${version}";
+  pname = "nvidia-cg-toolkit";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index 0d171a474a20a57811cb4307eee7e282bc2cb83c..8fd6f33740e41623ca91ac9784efc931a5626f2f 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,6 +1,6 @@
 { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
-  name = "obliv-c-${version}";
+  pname = "obliv-c";
   version = "0.0pre20180624";
   buildInputs = [ perl ]
   ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index 4337de702e160a2ba613a20675c27b3c753e61f6..cd621c131ffab2db951826d92de4141db8a1f847 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.08.0";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.tar.gz";
+    url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
     sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
   };
   configureScript = ./configure-3.08.0;
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 99a65dec1501f0159f39f3c62d57d3509dbe8dcf..556aefd370491c1d70e2a7489c2cfafdb2dddd98 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.10.0";
 
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
     sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index e65510c172e6d0fe17bca78c498e04c324dc6ee4..4be41490534885aa5c45a3f663680fb79bf25201 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -8,11 +8,11 @@ in
 
 stdenv.mkDerivation rec {
   
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.11.2";
   
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
     sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index 8636f670059c5637e8be4c35966ba1273d49c3ed..edb3acdbdb1a68c27da9a10c8d2a66935e24b90d 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -8,11 +8,11 @@ in
 
 stdenv.mkDerivation rec {
   
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "3.12.1";
   
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
     sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
   };
 
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 0a30ef1352c451dd155abab55e48860357d9b55c..2669e8224bff4121e782376034fc74f4b8ca0f0f 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ocaml-${version}";
+  pname = "ocaml";
   version = "4.00.1";
   
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
     sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
   };
 
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index a933151de12afbcb5e97cc42b49d36fda790a513..fb507b9836ad281c950ec8b2dcf27280914618a5 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ber-metaocaml-${version}";
+  pname = "ber-metaocaml";
   version = metaocamlPatch;
 
   src = fetchurl {
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   postConfigure = ''
     tar -xvzf $metaocaml
-    cd ${name}
+    cd ${pname}-${version}
     make patch
     cd ..
   '';
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     make installopt
     mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
-    cd ${name}
+    cd ${pname}-${version}
     make all
   '';
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   '';
 
   checkPhase = ''
-    cd ${name}
+    cd ${pname}-${version}
     make test
     make test-compile
     make test-native
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index e9adbeff49042def63ac8f17117f85449625dbf5..881748c36ea78ae0778d3747f1a059bbc8b7e1ee 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "metaocaml-${version}";
+  pname = "metaocaml";
   version = "3.09-alpha-30";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 06ed7c51e9ab3da1e72cde83c9fd6133b5f482b2..da1df6f30bbd8ffded77408d74cd564a2130568d 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "opa";
   version = "4310";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "MLstate";
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
index 690707265b4af3e1e18ebafc24b678605f20155e..31e3800a6c9cf71ed3fa943e4b09d91b3fa7d8bf 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "openspin-${version}";
+  pname = "openspin";
   version = "unstable-2018-10-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 7f22f4de624447789b89158f7fc02d89ff5180ff..370c08f001a74c26135c673ad41886d6059739d6 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "polyml-${version}";
+  pname = "polyml";
+  inherit version;
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index b7feed84c37fd9e5217ee072e9788d71721aa9eb..eef972a2cc3c127582c63a8aa0f0ddfa34ccc829 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
-  name = "polyml-${version}";
+  pname = "polyml";
   version = "5.7.1";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 91a3bb45352f553b2d9fdd6f2f5f899d21a906aa..5ab13d5f761fc7866d8b77ce7288e57dc76c8a9b 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
-  name = "polyml-${version}";
+  pname = "polyml";
   version = "5.8";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 2aab6a99a1cf87035a15b0aabecbed483a2d2de8..6719293af2a79e36fd84b2fe757fbd2729868642 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation rec {
-  name = "pony-stable-${version}";
+  pname = "pony-stable";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index eee4507d6cecca829d1de37975be8369707a3278..3856ced250e7678135e5608cb0780c11266fb681 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -5,7 +5,7 @@
 # in a published version.
 
 stdenv.mkDerivation rec {
-  name = "rgbds-${version}";
+  pname = "rgbds";
   version = "0.3.8";
   src = fetchFromGitHub {
     owner = "rednex";
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binary.nix
similarity index 98%
rename from pkgs/development/compilers/rust/binaryBuild.nix
rename to pkgs/development/compilers/rust/binary.nix
index cb2fba96e181e11c2937c835079248cd0e41432a..acccc749686cefc278026ceee8034cf2d33930de 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -60,6 +60,8 @@ rec {
       # are very hard to track down. For details, see
       # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
     '';
+
+    setupHooks = ./setup-hook.sh;
   };
 
   cargo = stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 973d17e1c7bd21eba7272a63e732309833be042b..5cf48715dae203a2b8f04fba2c689d9535a9d646 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.35.0";
+  version = "1.36.0";
 
-  # fetch hashes by running `print-hashes.sh 1.34.2`
+  # fetch hashes by running `print-hashes.sh 1.36.0`
   hashes = {
-    i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee";
-    x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c";
-    armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e";
-    aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952";
-    i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19";
-    x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6";
+    i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d";
+    x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55";
+    armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb";
+    aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d";
+    i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60";
+    x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325";
   };
 
   platform =
@@ -35,7 +35,7 @@ let
      sha256 = hashes."${platform}";
   };
 
-in callPackage ./binaryBuild.nix
+in callPackage ./binary.nix
   { inherit version src platform;
     versionType = "bootstrap";
   }
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index d7776958390223bb57f692724e6ad30e16df4392..daf7af1babdc8a9160ce1487c68c047f07858974 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
 { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , fetchurl, file, python2, tzdata, ps
-, llvm_7, darwin, git, cmake, rustPlatform
+, llvmPackages_7, darwin, git, cmake, rustPlatform
 , which, libffi, gdb
 , withBundledLLVM ? false
 }:
@@ -9,21 +9,31 @@ let
   inherit (stdenv.lib) optional optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
-  llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
-  llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
-  llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
+  llvmPackages = llvmPackages_7;
+
+  llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; };
+  llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
+  llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
 
   # For use at runtime
-  llvmShared = llvm_7.override { enableSharedLibraries = true; };
-in stdenv.mkDerivation rec {
+  llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; };
+in
+
+stdenv.mkDerivation rec {
   pname = "rustc";
-  version = "1.36.0";
+  version = "1.37.0";
 
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04";
+    sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
   };
 
+  # Provide the compiler-rt sources needed for profiling.
+  preConfigure = ''
+    mkdir src/llvm-project/compiler-rt
+    tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1
+  '';
+
   __darwinAllowLocalNetworking = true;
 
   # rustc complains about modified source files otherwise
@@ -38,7 +48,6 @@ in stdenv.mkDerivation rec {
   # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
   stripDebugList = [ "bin" ];
 
-
   NIX_LDFLAGS =
        # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
        optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 056ad745460014a4349dfab9d8b1333df4c664b8..0d2a10b6a9982de478e81528a51de5188e4bad58 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -43,7 +43,7 @@ let
 in
 assert builtins.hasAttr stdenv.hostPlatform.system options;
 stdenv.mkDerivation rec {
-  name    = "sbcl-bootstrap-${version}";
+  pname = "sbcl-bootstrap";
   version = cfg.version;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index e2cc7adc26e1e5259385cb4fd8e29f2af9a6c35c..e5b36ad78908df87b6ce4c60575f81c5bff9072c 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
+  pname = "sbcl";
   version = "1.5.3";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
     sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
   };
 
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index ab42eae31a68d8869e19f7b75a9c533046a16741..5a01e295e49e914739fd3d46cb20ed470fe6dcbb 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.14.0-RC1";
-  name = "dotty-bare-${version}";
+  pname = "dotty-bare";
 
   src = fetchurl {
     url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 4fd46c35a0a9a2157b5ffc374b655459dd388fbb..1a450af2b941bb3af6ed0a75cedff12599422401 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sdcc-${version}";
+  pname = "sdcc";
   version = "3.9.0";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix
index a6abe6791d7ed5032e129c748fb15cace08067a8..efcaf56110d2fef35b7f6a65375ffcd16a1f3196 100644
--- a/pkgs/development/compilers/seexpr/default.nix
+++ b/pkgs/development/compilers/seexpr/default.nix
@@ -3,7 +3,7 @@ bison, flex, libGLU, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
-  name = "seexpr-${version}";
+  pname = "seexpr";
   version = "2.11";
   src = fetchFromGitHub {
     owner  = "wdas";
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index e9c6b706e5ad42bb9b57acd8e1aa9a51c56b24bd..c9b4f9639d07f665ccacaf6b97f58c0b21112210 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation rec {
-  name = "serpent-${version}";
+  pname = "serpent";
 
   # I can't find any version numbers, so we're just using the date
   # of the last commit.
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 75717b5ba09649926d31a02ef2cd66bfc0138869..82cccc3befc32004223de2c0f6de17d6b6ac57e9 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -24,7 +24,7 @@ let
     sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
   };
 in stdenv.mkDerivation rec {
-  name = "shaderc-${version}";
+  pname = "shaderc";
   version = "2019.0";
 
   outputs = [ "out" "lib" "bin" "dev" "static" ];
diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index 21cfd4082988401e9a3cd939c4a3d64cfb4f40f2..e2103fb718fad9a4e0df59077246365c0bed9f85 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "smlnj-bootstrap-${version}";
+  pname = "smlnj-bootstrap";
 
   version = "110.91";
 
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index dce46ade45924ea441d2bc21c391cec08c255d9a..89912ac9ad6bdf010387f1d3921c4a908322c106 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -29,7 +29,8 @@ let
     { url = "${baseurl}/asdl.tgz";                sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
   ];
 in stdenv.mkDerivation {
-  name = "smlnj-${version}";
+  pname = "smlnj";
+  inherit version;
 
   inherit sources;
 
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index f34283938326019e602d28b9ffb18f2a016c0f4b..b0fdc8863784c1877c744873af66947e5eb612d0 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -16,7 +16,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  name = "solc-${version}";
+  pname = "solc";
   version = "0.5.11";
 
   # upstream suggests avoid using archive generated by github
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 219d5307790d1b240109243f04c2964defd37bd1..a39a6c4a2e4f5cf4bbe910632fbf3ddab0e99218 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -9,7 +9,7 @@ let
   toolsPath = stdenv.lib.makeBinPath [ mcpp ];
 in
 stdenv.mkDerivation rec {
-  name    = "souffle-${version}";
+  pname = "souffle";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 25ea47978fcd6fcaaf8f4d57a6a8b5e51ab8262f..c8379fe90909fa0b1557da5cde95bbd036dc1e5e 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -2,7 +2,7 @@
 , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
 
 stdenv.mkDerivation rec {
-  name = "squeak-${version}";
+  pname = "squeak";
   version = "4.10.2.2614";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index bf452d21d1dc70ce965d98e78da7e37726a947d2..9245e59553feac4c639375e7d171b550189e7c91 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -13,7 +13,8 @@ let
     '';
 in
 stdenv.mkDerivation {
-  name = "swi-prolog-${version}";
+  pname = "swi-prolog";
+  inherit version;
 
   src = fetchgit {
     url = "https://github.com/SWI-Prolog/swipl-devel";
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index b1f9ee799e5c28204b8aafd191d13d8c998badcf..dea6df1b7aa436700ae7b81f5e57ba26d046c64f 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "terra-git-${version}";
+  pname = "terra-git";
   version = "1.0.0-beta1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 04efe1a913423476450b88adabc74e1b658e38a6..41cc9b38606787324f86cb71b1cb600b999ea652 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "teyjus-${version}";
+  pname = "teyjus";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz";
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index a5c3db65857f6e80564545051d9183adbe0619ec..338ba93124921d4b49fae96c7c3ed92cef2f4b51 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,7 +2,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tcc-${version}";
+  pname = "tcc";
   version = "0.9.27";
 
   src = fetchFromRepoOrCz {
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 2300d63015b9d46223868d87dc8c075a1899b459..01d4972a55d504240344be1a1c42b51b0c01a0c2 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "urweb-${version}";
+  pname = "urweb";
   version = "20190217";
 
   src = fetchurl {
-    url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
   };
 
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 353963007d4be09504b8483460379298e2be7adb..15ed7f8bd29d09ff0edfbc6ff6a617a2e8fb8c90 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -119,8 +119,8 @@ in rec {
   };
 
   vala_0_40 = generic {
-    version = "0.40.15";
-    sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19";
+    version = "0.40.16";
+    sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
   };
 
   vala_0_42 = generic {
@@ -129,8 +129,8 @@ in rec {
   };
 
   vala_0_44 = generic {
-    version = "0.44.5";
-    sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv";
+    version = "0.44.6";
+    sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb";
   };
 
   vala = vala_0_44;
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix
index 8cb1e8e5f2cda5b8cd09bfd7ec70f6a888fa74ed..3196592da4850e37ed38f956e87f32b954541b25 100644
--- a/pkgs/development/compilers/wcc/default.nix
+++ b/pkgs/development/compilers/wcc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
 
 stdenv.mkDerivation rec {
-  name = "wcc-unstable-${version}";
+  pname = "wcc-unstable";
   version = "2018-04-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index 88666148da3ff18f64c273b1a24c22d445d6476f..3d955c4394b043740881cea29ae851d94a946a17 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
   pname = "X11basic";
   version = "1.26";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "kollokollo";
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 3ad0bc25787e3639bbeccbd31ad9fdb51638fead..1cc96455be7ad41403601265a7d269ac79fc6715 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.3.3";
-  name = "yap-${version}";
+  pname = "yap";
 
   src = fetchurl {
-    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
+    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz";
     sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
   };
 
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index cc42ee1dd3f18fcf7b1456fe45d4bb08bbf59bfa..f0e0693d12c4febd9eda6c13467a07a89e243261 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -26,7 +26,7 @@ let
 in stdenv.mkDerivation rec {
   inherit version openjdk platform hash extension;
 
-  name = "zulu-${version}";
+  pname = "zulu";
 
   src = fetchurl {
     url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index a43992164d23f68dcd7ea3b99574f2f0d1be2fad..d4c4c1f0ac31d0b825c20fa47152ee02b8816ce9 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -26,7 +26,7 @@ let
 in stdenv.mkDerivation rec {
   inherit version openjdk platform hash extension;
 
-  name = "zulu-${version}";
+  pname = "zulu";
 
   src = fetchurl {
     url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index f03e6e42739ad34d86b7ce501cde87f01f7bc0b9..d1e7ac882d79b7d1d741d2c604f254c530c9994a 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -7,10 +7,11 @@
 , meta ? {}, ... } @ args:
 
 pkgs.stdenv.mkDerivation (
-  args // 
+  args //
   {
 
-  name = "emscripten-${args.name}";
+  pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}";
+  version = args.version or (builtins.parseDrvName args.name).version;
   buildInputs = [ emscripten python ] ++ buildInputs;
   nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
 
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 592e6ad89994e59eded4662c91e2c44e3cf18c69..8377dad690f6b41b2f357270ef64619b4c838094 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
 
 stdenv.mkDerivation rec {
-  name = "guile-cairo-${version}";
+  pname = "guile-cairo";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "mirror://savannah/guile-cairo/${name}.tar.gz";
+    url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz";
     sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf";
   };
 
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 26fffac0a131d0ea500b2ef4d4bb94f5c2aaa514..80ce29799a880f722573c312be7ac894580a96db 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -5,12 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "guile-gnome-platform";
   version = "2.16.4";
 
   src = fetchurl {
-    url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz";
+    url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz";
     sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3";
   };
 
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix
index 35bcd7bfc2f3ed124fce99868770db0460f424dd..6ffcc153ec45ad2ff689b58c8f9a07a4c4baf130 100644
--- a/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/pkgs/development/guile-modules/guile-reader/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "guile-reader-${version}";
+  pname = "guile-reader";
   version = "0.6.2";
 
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz";
+    url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz";
     sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx";
   };
 
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index a606b3ecf2881dda2d3ad530bb53a99176cbdffa..41bfb2ef62a98afbc7b36cf1a5b99157eacb84e8 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -3,12 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "guile-sdl";
   version = "0.5.2";
 
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
     sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
   };
 
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index a88d07d1655fa175be67a8572d273ec9cac3f834..d53337aca1ad01f9a9b6b2a032816e6239e4f384 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -11,7 +11,7 @@ revs = {
   "8.2" = "8.2";
 };
 in stdenv.mkDerivation rec {
-  name = "acl2-${version}";
+  pname = "acl2";
   version = "8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 85794b09ae0b8d13e5d2bf115312c16bbbdc9992..744106bce5d058cbefa2fadc2df4a79996ca537e 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "bats-${version}";
+  pname = "bats";
   version = "1.1.0";
 
   src = fetchzip {
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index b597ba6fe7892f0cf335cebb52af92c2cb69d203..918c577356cd8359ed51f30a964d3497b3d88163 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.30";
-  name = "clips-${version}";
+  pname = "clips";
   src = fetchurl {
     url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
     sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 57ced325aad0969b41348a704983988b93d52124..369d84708dc4f49e760f831b8fa5366a8ce36b01 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -3,7 +3,8 @@
 let version = "0.4.4"; in
 
 stdenv.mkDerivation {
-  name = "clooj-${version}";
+  pname = "clooj";
+  inherit version;
 
   jar = fetchurl {
     # mirrored as original mediafire.com source does not work without user interaction
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 16f3e7f73e205f13c214bd1964b26a39c83f7b9c..ab8e616ac6d5fc1c58766f4d82435f783aa2384d 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -128,7 +128,7 @@ let # packageJSON=./package.json;
 
 in stdenv.mkDerivation rec {
   inherit version;
-  name = "lumo-${version}";
+  pname = "lumo";
 
   src = fetchurl {
     url    = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index fa8996f0fb56788ac50e04033a28717fd7b135bd..02ac6bfbcde7309db60da99e8eaa19c6ef1966f6 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -47,7 +47,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "dart-${version}";
+  pname = "dart";
+  inherit version;
 
   nativeBuildInputs = [
     unzip
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index f79c30740a12d2c680b3f85a9c90fede1f37b2b2..f968e04bbe99a7e1c60a8a369a59d72ae3227a89 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "duktape-${version}";
+  pname = "duktape";
   version = "2.4.0";
   src = fetchurl {
     url = "http://duktape.org/duktape-${version}.tar.xz";
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index 258aebe81727dd4f7edaf4e4aee779e0f36bfa2f..7c7cd9abb7e98714f1f37da9bad0c8ef379e84bf 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -4,7 +4,8 @@ let version = "5.0"; in
 
 stdenv.mkDerivation {
 
-  name = "eff-${version}";
+  pname = "eff";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "matijapretnar";
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 857a1e5cd8df456bf14c398a1c98574ec40e6a3e..744a0f76ff09212dcdd13a273ee3d0675c253654 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "falcon-${version}";
+  pname = "falcon";
   version = "2013-09-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index a0d20b7ebe4fc752e57eabaef0ea878b5f40a383..71542046af91bcc6822c8db63870ec21a22ae952 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gauche-${version}";
+  pname = "gauche";
   version = "0.9.8";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index cd7dacf652791d37a9a9c7f47c4cfcbef80816f1..7f15c2b31845e3fa6915cdc366d31766d9796976 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "gnu-apl-${version}";
+  pname = "gnu-apl";
   version = "1.8";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index d5635fc223277e92f331740b3ae68c07c1c1317e..bdd138418969cbab439d8e0fedbca96bfe515818 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -3,7 +3,7 @@
 # at runtime, need jdk
 
 stdenv.mkDerivation rec {
-  name = "groovy-${version}";
+  pname = "groovy";
   version = "2.5.8";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index 56becd3d6c9476a07e8097bd2b5a7ac3de0fbc2f..0d3fe100329cc66cb531c2db02ff4a9e41ec5596 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }:
 
 stdenv.mkDerivation rec {
-  name = "icon-lang-${version}";
+  pname = "icon-lang";
   version = "9.5.1";
   src = fetchFromGitHub {
     owner = "gtownsend";
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 11feb1170c2ce79de526abfcccd7411430841876..791ac6dd3381da5369157fb566391a2efd69a4e3 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, readline, libedit, bc }:
 
 stdenv.mkDerivation rec {
-  name = "j-${version}";
+  pname = "j";
   version = "807";
   jtype = "release";
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index 704e3eb4031a5031e6a7ac854dbaa9837f35af06..91b4c0b9a9e62cd6e6a9530cd42b63995aac66f7 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -4,7 +4,7 @@ let
   makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
 
 in stdenv.mkDerivation rec {
-  name = "jimtcl-${version}";
+  pname = "jimtcl";
   version = "0.78";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index ba65c00f1e9d25ecc0738f0ea29dc999852490fd..4ab9427934d74e9327bb7b2d0e41584bf82d90cf 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "joker-${version}";
+  pname = "joker";
   version = "0.12.4";
 
   goPackagePath = "github.com/candid82/joker";
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 56c0f1f73e6cca9a3ace43be0b85faaabfa850cf..6c4a9f20fa3eca116501b4055b2573379cf21c64 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -4,7 +4,7 @@ let
 # The version number here is whatever is reported by the RUBY_VERSION string
 rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
-  name = "jruby-${version}";
+  pname = "jruby";
 
   version = "9.2.8.0";
 
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index f822fdd9c8f0bd1c5189740e5e971ee5dcd610bb..0e1734565f2fb0fcc852417fc75d502c3b373dde 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "jython-${version}";
+  pname = "jython";
 
   version = "2.7.1";
 
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 03c836d9251a075316504f8f79cea468b3bcc301..a9922a3876575c0f4d5e0eae8f4d454334f5e5f1 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "kona-${version}";
+  pname = "kona";
   version = "3.21";
   src = fetchurl {
     url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz";
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix
index 284773fe660fdf2573e62c1aa664641ab2ac625e..3ef239e89a9a1b9fdb3dd46e10ceedb0eb305884 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/pkgs/development/interpreters/lolcode/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "lolcode-${version}";
+  pname = "lolcode";
   version = "0.11.2";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
index 7aa41e95cc9b7368f54ca941466bad9a07d72cf4..0ac1fa30e2f8b30c518dc84c3791dcece331a32b 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.2";
-  name = "lua-filesystem-${version}";
+  pname = "lua-filesystem";
   isLibrary = true;
   src = fetchurl {
     url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
index d8a789e9209e37859eba665bbfce5a7fd83cf287..f0eb1becc57831b26af083bfa87d18053ecd8fe9 100644
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lua5 }:
 
 stdenv.mkDerivation rec {
-  name    = "lua-sockets-${version}";
+  pname = "lua-sockets";
   version = "2.0.2";
   src = fetchurl {
       url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 30013946886b2d274d24f1fd21a8116a2d7b9e48..afd2627d20ecb80269b706d3fada593bb7febae6 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -14,7 +14,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "maude-${version}";
+  pname = "maude";
+  inherit version;
 
   src = fetchurl {
     url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index e8e23cee830a470a730a0dbe9e245162d40fd6b5..cd325c94948970aa833ff14680d775ccb2c16bb0 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "metamath-${version}";
+  pname = "metamath";
   version = "0.172";
 
   buildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index ceea3932063a586e456ae0a887a3e267866dda22..aef23ad6881dc1a77402082bc9bf339b9bcf3446 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-${version}";
+  pname = "mujs";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 277993339e239d8841e598521655d48419037431..bde2f5d9fa968f17885fcc5c28558f8014a44f55 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
   version = "4.1.6";
 in stdenv.mkDerivation {
-  name = "nix-exec-${version}";
+  pname = "nix-exec";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index d3dda7655c2e307c72b77fbbb414c034cd0d073a..cc9f6fcc3c90011e393c08d4ed34a49eed6e90d4 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -19,9 +19,9 @@ in
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
-  name = "octave-${version}";
+  pname = "octave";
   src = fetchurl {
-    url = "mirror://gnu/octave/${name}.tar.gz";
+    url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
     sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3";
   };
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care
   postInstall = ''
-    cp test/fntests.log $out/share/octave/${name}-fntests.log || true
+    cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true
   '';
 
   passthru = {
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 62ab7b02585ebd679266fe2a8198ef39a8ebc018..6e57ad250bb4b8b954a65247e5184de1518fa4b8 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, readline }:
 
 stdenv.mkDerivation rec {
-  name = "picoc-${version}";
+  pname = "picoc";
   version = "2015-05-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 5adf41a0f3b63edc8a54f3e9a013a02c5bd5f7f1..dc3b08acbd96fb140b0bdd04c01cafd4c58d3126 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "picoLisp-${version}";
+  pname = "picoLisp";
   version = "19.6";
   src = fetchurl {
-    url = "https://www.software-lab.de/${name}.tgz";
+    url = "https://www.software-lab.de/${pname}-${version}.tgz";
     sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
   };
   buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index d1f2edce936dfe83488498bb52c7113cee790100..99c763615e3d75e0d9000c9ed6a4615f5872335c 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -30,7 +30,7 @@ let
   bin-path = stdenv.lib.concatStringsSep ":"
                (map (p: "${p}/bin") [ gcc ]);
   build = {flags, target}: stdenv.mkDerivation rec {
-    name = "pixie-${version}";
+    pname = "pixie";
     version = "0-r${commit-count}-${variant}";
     nativeBuildInputs = [ makeWrapper pkgconfig ];
     buildInputs = libs;
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 9e38e8250748dd9156f807b535db092721521aae..0b9ddc0bb3457204ffe043fc9573016946de20bd 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "python-boot-${version}";
+  pname = "python-boot";
   version = "2.7.12";
   libPrefix = "python2.7";
 
diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix
index 779039c6d6aa4bd2da4161246024c8a2e0815100..3b41e14be850bcc9ee72d0ad24628b43c1ba9494 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/pkgs/development/interpreters/qnial/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "qnial-${version}";
+  pname = "qnial";
   version = "6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e37c43a0bd65f3351e189f4c5df9994c37ca48dd..35bd1729866ec6dc17b8fabaa5f602ed570d543f 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -45,7 +45,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "racket-${version}";
+  pname = "racket";
   version = "7.3"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       inherit sha256;
     }
   )) {
-    inherit name;
+    inherit ;name = "${pname}-${version}";
     sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
   };
 
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 1244ad5ecd2e504965315fe610815b48c48416f4..ab5493e8a9d0a951bcd7d3859f44bd6d655bbc43 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 , CoreServices, ApplicationServices }:
 
 stdenv.mkDerivation rec {
-  name = "rakudo-star-${version}";
+  pname = "rakudo-star";
   version = "2017.01";
 
   src = fetchurl {
-    url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
+    url    = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz";
     sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq";
   };
 
diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
index 4d98f18eee4a7e108965ab821d7f365e6fbd07d5..274b70b2c79849985e28749881dd774a0c321243 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }:
 
 stdenv.mkDerivation rec {
-  name = "rebol-nightly-${version}";
+  pname = "rebol-nightly";
   version = "3-alpha";
   src = fetchFromGitHub {
     rev = "bd45d0de512ff5953e098301c3d610f6024515d6";
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
index 56ff02831741ba8339d83a4323b718f7814885d7..2121f54a3b1129d924bcdd03bbdc5e3d4007e5c1 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/pkgs/development/interpreters/red/default.nix
@@ -1,7 +1,7 @@
 { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "red-${version}";
+  pname = "red";
   version = "0.6.3";
   src = fetchFromGitHub {
     rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
     rm -rf $out/opt/red/rebol
     install -Dm755 console $out/bin/red
     install -Dm644 BSD-3-License.txt                          \
-        $out/share/licenses/${name}/BSD-3-License.txt
+        $out/share/licenses/${pname}-${version}/BSD-3-License.txt
     install -Dm644 BSL-License.txt                            \
-        $out/share/licenses/${name}/BSL-License.txt
+        $out/share/licenses/${pname}-${version}/BSL-License.txt
     install -Dm644 docs/red-system-quick-test.html            \
-        $out/share/doc/${name}/red-system-quick-test.html
+        $out/share/doc/${pname}-${version}/red-system-quick-test.html
     install -Dm644 docs/red-system-specs.html                 \
-        $out/share/doc/${name}/red-system-specs.html
+        $out/share/doc/${pname}-${version}/red-system-specs.html
 
     # PathElf
     patchelf --set-interpreter                            \
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index 1d67193a73cfcd88ac5c38c14510fbddf2cfef5e..ec19b0679f4b8b321b0b8c2027c30d1d03596fb5 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "Regina-REXX-${version}";
+  pname = "Regina-REXX";
   version = "3.9.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz";
     sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index f438e9fb13ce9e6a870ba0715c21a3498dcf1438..db68578d62a60bbf11d597668328b7d47af80588 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -6,7 +6,7 @@
 with pythonPackages;
 
 stdenv.mkDerivation rec {
-  name = "renpy-${version}";
+  pname = "renpy";
   version = "7.3.2";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4e617ce67eb99b21af10951d61e582033612bfaf..a7009097a60280e9b054fcd4ae9e220674d7836f 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -46,7 +46,8 @@ let
       , libiconv, libobjc, libunwind, Foundation
       }:
       stdenv.mkDerivation rec {
-        name = "ruby-${version}";
+        pname = "ruby";
+        inherit version;
 
         src = if useRailsExpress then fetchFromGitHub {
           owner  = "ruby";
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 594bbc05b7ceb632823875cc018785332be2cd11..c6c8caa7cf3ef466c39f564ee0a1f612e111e54a 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   #   $ Self -s myimage.snap
   #
   version = "4.5.0";
-  name = "self-${version}";
+  pname = "self";
 
   src = fetchgit {
     url    = "https://github.com/russellallen/self";
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 9c81b230ada2f7266d48f160f3444d5ee35cb63a..e00af6213479a3f40d42bfb5f11f82edbe0becb4 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
 
 stdenv.mkDerivation rec {
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
   version = "1.8.5";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 2c45ba58976769d50d4f7be24e3884af03fd86f3..89bbd713a5c648d1faf4c7d7683220c4322f82f0 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "38.8.0";
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2";
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 2ec5923b0e1f0151ba0014a057f7247c26d9f83b..1e1ea10ef6dd4df0d5e3d23c48885a1d5f272d89 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -3,7 +3,8 @@
 let
   version = "52.9.0";
 in stdenv.mkDerivation rec {
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
index 518fc5f77b7272ff515810606b1d918b927e7875..175b2f2e767199859af72c00bcb1fdf990723230 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -6,7 +6,8 @@ with stdenv.lib;
 let
   version = "60.4.0";
 in stdenv.mkDerivation rec {
-  name = "spidermonkey-${version}";
+  pname = "spidermonkey";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 057375182f53162a363478d8867869a5603289ad..2cacb339d757e4ce8e53fdbac18b2afd94a997f6 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -8,7 +8,7 @@ let optional = stdenv.lib.optional;
 in
 
 stdenv.mkDerivation rec {
-  name = "supercollider-${version}";
+  pname = "supercollider";
   version = "3.10.2";
 
 
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index cd377e70cd9cd4051267fe43e2f3817f164e5d55..d4ec1677bfbcc2906d974fdff4ebcda2f141a96a 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tcl-${version}";
+  pname = "tcl";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix
index f2c5fd938cec39e364808fc8960e52c40399e7c2..ca897ec692c198ac00f214769a70a5e31f0bd700 100644
--- a/pkgs/development/interpreters/tinyscheme/default.nix
+++ b/pkgs/development/interpreters/tinyscheme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tinyscheme-${version}";
+  pname = "tinyscheme";
   version = "1.41";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tinyscheme/${name}.tar.gz";
+    url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz";
     sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a";
   };
 
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index 77154b54fd8feb515ce78f96bde935c8ceb91db0..30ea124cf4bb7f97ace07227ee580f184f0c0dd7 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, libX11, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "unicon-lang-${version}";
+  pname = "unicon-lang";
   version = "11.7";
   src = fetchurl {
     url = "http://unicon.org/dist/uni-2-4-2010.zip";
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 36c4af5f496145fe15c3f8fcc79e25875f2b50b9..abb549110a87c3abe1fec33c9789f4a529259716 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -16,7 +16,8 @@ in
         fetchSubmodules = true;
       };
     in stdenv.mkDerivation rec {
-      name = "jogl-${version}";
+      pname = "jogl";
+      inherit version;
 
       src = fetchgit {
         url = git://jogamp.org/srv/scm/jogl.git;
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix
index c67d72705482cd4090a7279027b1d78a682d2830..69cb24fc0b0c17c665975d10e500b7d07c2a42e3 100644
--- a/pkgs/development/java-modules/postgresql_jdbc/default.nix
+++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchMavenArtifact }:
 
 stdenv.mkDerivation rec {
-  name = "postgresql-jdbc-${version}";
+  pname = "postgresql-jdbc";
   version = "42.2.5";
 
   src = fetchMavenArtifact {
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
index fbf9615f88a2aa93c914a742365328370c56f1bf..f251d2bed0c5152f5a570d695524cdd9f3735aad 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "CoinMP-${version}";
+  pname = "CoinMP";
   version = "1.8.4";
 
   src = fetchurl {
-    url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz";
+    url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz";
     sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l";
   };
 
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
index 9522038df6af75f819d5fd5b3b2f21da9c9d628b..418900ddeeb5a5930a2d750f54c152e2c688136e 100644
--- a/pkgs/development/libraries/LASzip/default.nix
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
-  name = "LASzip-${version}";
+  pname = "LASzip";
 
   src = fetchurl {
     url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a8d5d608f89522479395f99ebafc285b5d6ea8b1..610f1b768f243851f678ded71810e0ea768f04e6 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -14,11 +14,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name    = "SDL-${version}";
+  pname = "SDL";
   version = "1.2.15";
 
   src = fetchurl {
-    url    = "https://www.libsdl.org/release/${name}.tar.gz";
+    url    = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 94aca192852d7cdaf49612b6363d6ded77b0fd9c..d538a0969b043cd8260e398dab0798deba9e7821 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -23,11 +23,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "SDL2-${version}";
+  pname = "SDL2";
   version = "2.0.9";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
     sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
   };
 
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 803cc97a8ae884a4935f2f1fb37fde52d2f69669..d57bb6cbc940895ac9554accad98cd64c9b519fe 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,12 +1,11 @@
 { stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "SDL2_gfx";
   version = "1.0.4";
 
   src = fetchurl {
-    url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz";
+    url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
   };
 
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index ba33b1fbc1de2ceafb5b4e5aad90e9639216bd76..326d9d66264d9d6e05b891309bb8073433e4760f 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_image-${version}";
+  pname = "SDL2_image";
   version = "2.0.5";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
     sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
   };
 
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 61e15d621bcd5c2af6d7f861d91b86131ec0e398..826cf793cd2e0edb38826c25795630b589089924 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -4,11 +4,11 @@
 , enableNativeMidi ? false, fluidsynth ? null }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_mixer-${version}";
+  pname = "SDL2_mixer";
   version = "2.0.4";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz";
     sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
   };
 
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 1cb74ac1b2d32b4d3c22934698c107dbc65a88d6..309102e70b5ef944d0fc093850eb2789ae24d5d5 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -1,11 +1,11 @@
 { stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_net-${version}";
+  pname = "SDL2_net";
   version = "2.0.1";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
     sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
   };
 
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index b219922223fb72206b36792528e0dbac8a1a66a4..50e47bc1d36212b043211e3773f564aede851e95 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_ttf-${version}";
+  pname = "SDL2_ttf";
   version = "2.0.15";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
     sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
   };
 
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 68c8c16ed4e87c24b716e8676f8e8474ce3b2d82..74a31d946874bfa4cb77163b115f309abc479d0c 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_gfx-${version}";
+  pname = "SDL_gfx";
   version = "2.0.26";
 
   src = fetchurl {
-    url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
+    url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz";
     sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw";
   };
 
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 961a0a7f5aab7aafb4d5aef2ca9f0d04def66846..8e3078563e2bb9f73b82d03c3018fbbe4352a1c0 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_image-${version}";
+  pname = "SDL_image";
   version = "1.2.12";
 
   src = fetchurl {
-    url    = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url    = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
     sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
   };
 
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index 887319062be96af32a738a85df723a48ee44d27b..427439f496e93dfbeff4d8624d4b79d4c8a593bf 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname   = "SDL_mixer";
   version = "1.2.12";
-  name    = "${pname}-${version}";
 
   src = fetchurl {
-    url    = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
+    url    = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz";
     sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
   };
 
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index f1c5a5462d1109b36bd5c68e8c65079e367c5b19..6ac91a6d129d23751d06d7bca4999d635c31d1b2 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   pname = "SDL_net";
   version = "1.2.8";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+    url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
     sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
   };
 
diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix
index 6279bfcb4286801088851c33749548574b2e7556..7b8fb67a30f1f935921d8c09f1c3af15edf0bb86 100644
--- a/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/pkgs/development/libraries/SDL_sixel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libsixel }:
 
 stdenv.mkDerivation rec {
-  name    = "SDL_sixel-${version}";
+  pname = "SDL_sixel";
   version = "1.2-nightly";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
index 0e717c53035732fccf95c69304f0989ef88db58a..94534ecd6999b61620e75b03090404aa1c6bc2a5 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_sound-${version}";
+  pname = "SDL_sound";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz";
+    url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz";
     sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
   };
 
diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix
index 7f276387c8347727608c6a88e60222a7cb42aa19..9695d51ed8972bed6dcc51e13adc877a13c6c0b9 100644
--- a/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/pkgs/development/libraries/SDL_stretch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_stretch-${version}";
+  pname = "SDL_stretch";
   version = "0.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
   };
 
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index cf6b53021f79990747b23c6843c42b9026d9de0e..96b60b1061fda2dbf08825ce1911f84964a323e2 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, SDL, freetype }:
 
 stdenv.mkDerivation rec {
-  name = "SDL_ttf-${version}";
+  pname = "SDL_ttf";
   version = "2.0.11";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
     sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
   };
 
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix
index 4e1da8666227201b75615f34549bf23928c0f99a..5795d0baa624c6fb901eecb93ac169b7e2d83ea4 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "abseil-cpp-${version}";
+  pname = "abseil-cpp";
   date = "20190322";
   rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a";
   version = "${date}-${rev}";
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index a50c92924e9aa87e00c0592478fa4e44da7c8f72..0aace12569a5566a12f2a7c05a2ba937b2d394da 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "accounts-qt-${version}";
+  pname = "accounts-qt";
   version = "1.15";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 75c942d4d4871f1b15514163eaf96d8e52deca4c..04ab13314755f708f23224f7be2c5660184c6ba9 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libtool, perl }:
 
 stdenv.mkDerivation rec {
-  name = "ace-${version}";
+  pname = "ace";
   version = "6.5.6";
 
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
     --replace /usr/bin/perl "${perl}/bin/perl"'';
-  
+
   preConfigure = ''
     export INSTALL_PREFIX=$out
     export ACE_ROOT=$(pwd)
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 76e49768d53dca2fabf9a1141d3f28f213c83a5b..c9797b31eaa93b81a986a079b8bf068f6883f134 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -4,7 +4,8 @@ let
   version = "1.5.1";
 in
 stdenv.mkDerivation {
-  name = "adns-${version}";
+  pname = "adns";
+  inherit version;
 
   src = fetchurl {
     urls = [
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 5170e384f77bbaf3de313b81dde19040b8b426bd..f0d87c811330a5c36ed8bc677f052d3017bfaf7c 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.7.18";
-  name = "afflib-${version}";
+  pname = "afflib";
 
   src = fetchFromGitHub {
     owner = "sshock";
diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
index 22e91ee61d7a16805bcbb07f167b5cf60f0b3ab9..a1d4c2259091d5b61059ccfe64187e82c9b51528 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/pkgs/development/libraries/aften/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-	name = "aften-${version}";
+	pname = "aften";
 	version = "0.0.8";
 	src = fetchurl {
-		url = "mirror://sourceforge/aften/${name}.tar.bz2";
+		url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
 		sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
 	};
 
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 5c25da9205569dafd1990cd5866cdfdd897adce8..1e9496c1a1cc97afdf7d5dba7e9aa04a3cf951e4 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "alembic-${version}";
+  pname = "alembic";
   version = "1.7.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index f98c8fa480e1d6796e7a189c0c42260236627628..407aa557ea2e8afd455b99d67c0e7f80314c0b13 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -4,11 +4,11 @@
 }:
 
 mkDerivation rec {
-  name = "alkimia-${version}";
+  pname = "alkimia";
   version = "8.0.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz";
+    url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
     sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m";
   };
 
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index eca32b740e35718a15b3e6ba09d87918c86c24e7..6b44ec1b598a45b655de9031e30668ed6339d4ea 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -4,11 +4,11 @@
 , libXxf86vm, openal, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "allegro-${version}";
+  pname = "allegro";
   version="4.4.2";
 
   src = fetchurl {
-    url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
   };
 
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
index 95828c44f85124d42ec5403b4324798af4de4902..a4f3b714e1cbc4eb785bffd3cfc54ecdcc91938e 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/pkgs/development/libraries/alure/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, openal }:
 
 stdenv.mkDerivation rec {
-  name = "alure-${version}";
+  pname = "alure";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index 15331c22599b84f00a47574067be415173c29952..7525b3baab09eacba9ddf92cd91aadcad0c5c247 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "amrwb-${version}";
+  pname = "amrwb";
   version = "11.0.0.0";
 
   srcAmr = fetchurl {
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index fc79cae36f836a21b5a63d46544a082e5e8ac8c1..9fc11555b697ce6a5ded90ffa151964e660d5594 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apache-activemq-${version}";
+  pname = "apache-activemq";
   version = "5.14.5";
 
   src = fetchurl {
     sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54";
-    url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
+    url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 429da8de835044b6190f53ab0f0db66a11b994ea..62d72844386f4d1c1b87c26adcca18e652e0dd12 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "appstream-${version}";
+  pname = "appstream";
   version = "0.12.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index 0013764d7791d7355f3e66d39ef257932d1f2928..307f57d20cf5ba11f5528a8057ecf06ebb4d1346 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -3,7 +3,7 @@
 # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
 
 stdenv.mkDerivation rec {
-  name = "appstream-qt-${version}";
+  pname = "appstream-qt";
   inherit (appstream) version src prePatch;
 
   buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index b26291469e75317f33da5c9b9d5c8a86da768f40..8be98f061a8444b6a983f13583ec76848d30de88 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -5,14 +5,14 @@
 let
   inherit ((import ./sources.nix).aqbanking) sha256 releaseId version;
 in stdenv.mkDerivation rec {
-  name = "aqbanking-${version}";
+  pname = "aqbanking";
   inherit version;
 
   src = let
     qstring = "package=03&release=${releaseId}&file=02";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
     inherit sha256;
   };
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index bb337e471cfcdd7a607d05abaca5e767a6c45f81..061ed77849f45fa47b8247106c7ca4cf3bc366fb 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -13,14 +13,14 @@
 let
   inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version;
 in stdenv.mkDerivation rec {
-  name = "gwenhywfar-${version}";
+  pname = "gwenhywfar";
   inherit version;
 
   src = let
     qstring = "package=01&release=${releaseId}&file=02";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
     inherit sha256;
   };
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index 9a0b70e0d97fa15c71ca20b4fe41644b9854b5e1..23c300ab48a38975d7d96514ae00d6c4d158bcc3 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -3,14 +3,14 @@
 let
   inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
 in stdenv.mkDerivation rec {
-  name = "libchipcard-${version}";
+  pname = "libchipcard";
   inherit version;
 
   src = let
     qstring = "package=02&release=${releaseId}&file=01";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
     inherit sha256;
   };
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index eb58003a5f63ce658e0f8d48c4aee5649028ed5d..ac67a101bc58338f1f42e3cb985887a07b845c69 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "arb";
   version = "2.16.0";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 3b93a351f7f9116f1adaf846d86e3330a9d4086f..127c2f3ae311147219b22e72aa6ebfd3af05695f 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
+  pname = "armadillo";
   version = "9.600.6";
-  name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 7660ea81eaf84c9d52d3a3d65dbc12ec2988fef8..f763f98799d02d672be995973725fe47d29cc8c8 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "arrow-cpp-${version}";
+  pname = "arrow-cpp";
   version = "0.14.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 72305cb633fb185c491b191ed65e3b2e1f3af06a..b8d166507a90ace1f1efbce210a398d3d6935936 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -5,7 +5,8 @@
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "asio-${version}";
+  pname = "asio";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/asio/asio-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 24e06b0d65a9a0cd652bbe38de36581b1aae8750..d5a98b0ce92ec2331b73a01e4d03d2f5f3510fd4 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "assimp-${version}";
+  pname = "assimp";
   version = "4.1.0";
 
   src = fetchFromGitHub{
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 2268d43890267e32b3b5558b6f23fe5e140659aa..a805949bf119c512125c84b0f6c646d74e24c287 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,12 +16,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "at-spi2-atk";
   version = "2.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b";
   };
 
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 47c8c090d08fd24c06ce5f77b7696e992c64ef32..7adc84f4786131366c5aa828a37be76230ebeca4 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -17,12 +17,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "at-spi2-core";
   version = "2.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw";
   };
 
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
index b79d85bcd7c950c82aa1ca746a1dcc2eb49e06e8..02409d6ace066bcca79d164d609fafffb80d0651 100644
--- a/pkgs/development/libraries/audio/jamomacore/default.nix
+++ b/pkgs/development/libraries/audio/jamomacore/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0-beta.1";
-  name = "JamomaCore-${version}";
+  pname = "JamomaCore";
 
   src = fetchFromGitHub {
     owner = "jamoma";
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix
index 3a4c363e23c8212f86ce5ca1efc73678b08b3461..2fde40327e96202f2833338ee5eb9d15829eb4e9 100644
--- a/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/pkgs/development/libraries/audio/libbs2b/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "libbs2b-${version}";
+  pname = "libbs2b";
   version = "3.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bs2b/${name}.tar.bz2";
+    url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2";
     sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
   };
 
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index ac6f0470a0a8c1da5ac87c9ecbc83f49dfa59610..b8f1a5c088ac25e5c3c31264bb974e1d015d71fe 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -2,7 +2,8 @@
 let
   version = "0.6.2";
 in stdenv.mkDerivation {
-  name = "libgme-${version}";
+  pname = "libgme";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "A collection of video game music chip emulators";
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index 0f9f5f5aac68a642b7382cb0af76a18676d25d35..0e0f0c5d425dfa680bbd592354a5137a6aaede03 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libmysofa-${version}";
+  pname = "libmysofa";
   version = "0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix
index fe0e0854a32743b2a6c58a8573a2158afa111bb1..1c5a5302d71c191cbd995aa6e2b993bc358eeb94 100644
--- a/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/pkgs/development/libraries/audio/libsmf/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "libsmf-${version}";
+  pname = "libsmf";
   src = fetchurl {
-    url = "https://github.com/stump/libsmf/archive/${name}.tar.gz";
+    url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz";
     sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
   };
 
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 373d50a0a434be0a96960f309cb38785bdf3175a..04752fd29519b3ba8cb665f31f3144fe39f83348 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lilv-${version}";
+  pname = "lilv";
   version = "0.24.4";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
   };
 
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index d026dd258bc7e6f180b07e21fa1a0d552be8e0e5..50593cab647664713900cdc9a11a419fa2e62ca2 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lv2-${version}";
+  pname = "lv2";
   version = "1.16.0";
 
   src = fetchurl {
-    url = "http://lv2plug.in/spec/${name}.tar.bz2";
+    url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2";
     sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
   };
 
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
index 81cc868f52ca5ccd5d2b9cbb0ad0cee6114d9541..978376eb4fa78ab549712c61be83a888679c6f91 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/pkgs/development/libraries/audio/lv2/unstable.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lv2-unstable-${version}";
+  pname = "lv2-unstable";
   version = "2017-07-08";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 78763ca29e2a3af7c60684ec3f6483ad43271b74..826c36db1a6300840cc0d1bf253f0493e9dace55 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "lvtk-${version}";
+  pname = "lvtk";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index ddd3940098a43215909c03fbe2400a5090258965..7cb151e4203f18016a55fcdd745311e13ea4fbe9 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "ntk-${version}";
+  pname = "ntk";
   version = "1.3.1000";
   src = fetchFromGitHub {
     owner = "original-male";
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 2adec665e1c0e73ce1ee09c40b3e6a2a7a2087b5..dad36209ed8d4b7a334ea1ba57b6c43213c6e8e2 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
-  name = "rtaudio-${version}";
+  pname = "rtaudio";
 
   src = fetchFromGitHub {
     owner = "thestk";
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 41bb9ca9f11b6b3dc6192ef98a285bb38e6ed98b..6cd7d06da9df356213869780652fbfe0bdd7651c 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.0.0";
-  name = "rtmidi-${version}";
+  pname = "rtmidi";
 
   src = fetchFromGitHub {
     owner = "thestk";
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 09a6230184af041ad89403703113a8faa78a50ae..21d6cdfb5d4d0f61d01d5ea974e6b949ce82e6d6 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "sratom-${version}";
+  pname = "sratom";
   version = "0.6.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index 320fc41f76c57eec4a8b724d70ca3a0eed5b514a..d91784ce14f4063802973d52d7fc43939dd9cfec 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl , alsaLib, }:
 
 stdenv.mkDerivation rec {
-  name = "zita-alsa-pcmi-${version}";
+  pname = "zita-alsa-pcmi";
   version = "0.3.2";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 4fc5c12ccc4c64005254e4ac4a117d38a409e237..308aa020e363c72a6f05944d60483dfc1922753d 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fftwFloat }:
 
 stdenv.mkDerivation rec {
-  name = "zita-convolver-${version}";
+  pname = "zita-convolver";
   version = "4.0.3";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index e9cccab39f020c41a97e04853b800f2dd7b9f639..98e272d5dab44a663f78521be959034a9d42083b 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "zita-resampler-${version}";
+  pname = "zita-resampler";
   version = "1.6.2";
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
   };
 
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index 11c66db70752bc6bfd6bc1e50abd7409c194d4e6..a2fdb66d7e953f34431789af266f712c9f578f7c 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@@ -3,7 +3,8 @@
 let version = "1.8.2"; in
 
 stdenv.mkDerivation {
-  name = "avro-c++-${version}";
+  pname = "avro-c++";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index cbd29a095d4571dd603634a0d0fe6b2c1be1eff7..9582e54ffacaad1427584a826a8294c8ce8afca8 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.9.0";
 in stdenv.mkDerivation rec {
-  name = "avro-c-${version}";
+  pname = "avro-c";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 7233a187053e4a07a1d8a467c45ff527409b6838..1cc65b53b3e92261a6af9f471f21409fb5103fa2 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aws-sdk-cpp-${version}";
+  pname = "aws-sdk-cpp";
   version = "1.7.90";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix
index 42621a1792cce46af096925b5108e0e8efd89e8d..af727e394d16e585cf81f65277c8490788bf60cf 100644
--- a/pkgs/development/libraries/backward-cpp/default.nix
+++ b/pkgs/development/libraries/backward-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "backward-${version}";
+  pname = "backward";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 9d5063d8f07d24c7e1f15e1961cd89e485b2724b..de436864edaad690b3738de87c9a7ca36b1924ed 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -3,7 +3,7 @@
 , xorgserver, dbus, python2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "bamf-${version}";
+  pname = "bamf";
   version = "0.5.4";
 
   outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 05ff5593205a6e10893d7bd3b31c2a932fee2f8e..05203d6c233aedaf71f52e6f6e78a31789040476 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "beignet-${version}";
+  pname = "beignet";
   version = "unstable-2018.08.20";
 
   src = fetchFromGitHub {
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru.utests = stdenv.mkDerivation rec {
-    name = "beignet-utests-${version}";
+    pname = "beignet-utests";
     inherit version src;
 
     preConfigure = ''
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index e6702d0db6403522344a8cba8a2f17349ca71d33..16be4600ec61a18ab56af3cd4314ea479b55d421 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "biblesync-${version}";
+  pname = "biblesync";
   version = "1.1.2";
 
   src = fetchurl{
-    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz";
     sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
   };
 
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 812ad546f866ad7629a646c3c46e5f52ba2b2379..c7520c89ef546952a670a49f7e009d223ef8aa66 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -3,7 +3,7 @@
 , utillinux, yodl }:
 
 stdenv.mkDerivation rec {
-  name = "bobcat-${version}";
+  pname = "bobcat";
   version = "4.08.03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
index 68f5d7afcf49a9e37a8f9ce3d51be9212be847f4..c2b5c7b60626e2fcf96fb4f9f12716bfd5c1ae6c 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "boehm-gc-${version}";
+  pname = "boehm-gc";
   version = "7.6.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index a241b42e1878009fd2e14cc1a6ae080368609e8a..cf76d9e7d24c322ae6706f097ff54820278fdb46 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "boehm-gc-${version}";
+  pname = "boehm-gc";
   version = "8.0.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index ee62d5423a15cd8c0e0c42786c1034504f88f87d..7db73f5ad47c30c977eb15057f28ea5b979b5e1b 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -2,7 +2,7 @@
 
 # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
 stdenv.mkDerivation rec {
-  name = "boringssl-${version}";
+  pname = "boringssl";
   version = "2017-02-23";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 2580b959bf2ae8da7c3ad9195e6fe8bbf5bc4a72..18b1b47f6d3832b52a9702425c0085b19ffc485c 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "botan-${version}";
+  pname = "botan";
   version = "${baseVersion}.${revision}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 102e7bfcc12b5534e2a24b308ed7ac8bf2705547..328ac434d85afd74e97647d7167adbabf6ca4e6e 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -2,7 +2,7 @@
 , libXi, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "box2d-${version}";
+  pname = "box2d";
   version = "2.3.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
index b4a57396cc8b95370827881ba7abba4cec944ffd..ba7b51bb0e4e96cb7573eb97ecdd2914380a89e8 100644
--- a/pkgs/development/libraries/brigand/default.nix
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "brigand-${version}";
+  pname = "brigand";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index b4a2133f7d8f10cebd969a77dc9953154dfc95a2..f6041802a9c545e0efba1eef196faec257b870d4 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bullet-${version}";
+  pname = "bullet";
   version = "2.87";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 12fc1834e9055ba4437cdd04df35046592dea175..97fe7e512993115573352602537657b011fc1eaa 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bullet-${version}";
+  pname = "bullet";
   version = "2019-03-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix
index b61ac1dcb09fe51beea7a748b59094182b367939..f64090bd53a3d0c97e364960aaf657a338a199e0 100644
--- a/pkgs/development/libraries/bulletml/default.nix
+++ b/pkgs/development/libraries/bulletml/default.nix
@@ -10,7 +10,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "bulletml-${version}";
+  pname = "bulletml";
+  inherit version;
 
   srcs = [
     (fetchurl {
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 1e2bda285a70c4f961e88b4f6a15e0cf61eda09c..e763afc4a4306cd8dee3e33eed8f6e07e8f486fd 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "bwidget-${version}";
+  pname = "bwidget";
   version = "1.9.13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 3603667fbf2179edcb463dcf7bd1590ee835345d..396e419406ae40232c6443122350b2eeb41810a9 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "c-blosc-${version}";
+  pname = "c-blosc";
   version = "1.16.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 4a1ea39420775826d33600d6df4b4c8ac1e95f1a..890e2996f5d2b79107b5a7234782b66947a276c4 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "actor-framework-${version}";
+  pname = "actor-framework";
   version = "0.17.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index e388b3af5f6796bd73c4b5c3345f554710c196c3..82570fbf7b40bfa3f9ce22d3494fc93509311b4f 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -16,10 +16,11 @@ let
   version = "1.16.0";
   inherit (stdenv.lib) optional optionals;
 in stdenv.mkDerivation rec {
-  name = "cairo-${version}";
+  pname = "cairo";
+  inherit version;
 
   src = fetchurl {
-    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
     sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
   };
 
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index b175250872f398a6066ac1b689c66f2d343a98ad..9020ccf08b5bbe6536e50c5736aed2355b5aebaa 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "capnproto-${version}";
+  pname = "capnproto";
   version = "0.7.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index c02633d880c42b4bd9df679f94fbf7b00ab3568c..956fd74da5859f6b04d8dfb2ee726314ff3b0cbc 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name    = "capstone-${version}";
+  pname = "capstone";
   version = "4.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index d83060fc24d8c5dd0d7e1d70de27dd407133a68f..92e5c04e0322184785ac332716d3d6fc69aacac8 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "catch-${version}";
+  pname = "catch";
   version = "1.12.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 2d0fd4cb1bcf5fc56c4cf1006f70d12c7fcc51f7..d7876affe2f90387f77147a4b98d703127204954 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "catch2-${version}";
+  pname = "catch2";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 832b070c8837b183425ad0147286697edb3ae96c..5897f84efff0a2becdc86391d2d396e860855f48 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "cctz-${version}";
+  pname = "cctz";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 68d34c75c0100d2fd41c57f401df962ffdd55a17..5f6b3766012e1d7c51c69ff26092378c049ac367 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cddlib-${version}";
+  pname = "cddlib";
   version = "0.94j";
   src = fetchFromGitHub {
     owner = "cddlib";
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 4c311f07e017b98a5ca81f092d9de411658eb312..8487435981ca94f3c4e48059c1a983646f06aee2 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "cdk-${version}";
+  pname = "cdk";
   version ="5.0-20190224";
 
   buildInputs = [
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix
index 7e5c768036fc913247911a55bcac2043677dcb47..eaeb6bf8e43f48c7f562001effbe5533b08eb466 100644
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/pkgs/development/libraries/cegui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
 
 stdenv.mkDerivation rec {
-  name = "cegui-${version}";
+  pname = "cegui";
   version = "0.8.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2";
+    url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2";
     sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
   };
 
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 6bf7975034b5198a20cc17a04d26eec68f69c2a3..d9e69b8e75129d2f15d3e78084d74ddcdcb07439 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -7,7 +7,8 @@
 # The celt codec has been deprecated and is now a part of the opus codec
 
 stdenv.mkDerivation rec {
-  name = "celt-${version}";
+  pname = "celt";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 52e0f06eeec4140ba11b65f0e05eb8db71472043..3ce8c4ef080ad7579797effe402870b822e51613 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -11,7 +11,7 @@
 assert runTests -> gflags != null;
 
 stdenv.mkDerivation rec {
-  name = "ceres-solver-${version}";
+  pname = "ceres-solver";
   version = "1.14.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index df75d3a1f1da76ac8bcaf76d904cfcdae0a928a1..39ed74d007501cf04c06e4017e8ff71af0d0c8a5 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "cgui-${version}";
+  pname = "cgui";
   version="2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz";
     sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s";
   };
 
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index ae8b6ca18df34ddc4767187e531350e072817396..08610d1e9aff4f95620257590f4130539d51a15f 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "check-${version}";
+  pname = "check";
   version = "0.12.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index f460b69a4f841949b705f987ee7e71981c5c74c9..76f722f31aa7a5fd91e3d9585c7262ad57d74e34 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "chipmunk-${version}";
+  pname = "chipmunk";
   majorVersion = "7";
   version = "${majorVersion}.0.1";
 
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 02420735ff76c71400e354b7616d43ba6ac9d3f0..fd868884f9865afcb4ab5a5e1e70eff1fd330421 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, boost, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  name = "chromaprint-${version}";
+  pname = "chromaprint";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "https://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
+    url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz";
     sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3";
   };
 
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 3e6e62e5a967cb06e33abe885fe3407d6d1c3e58..3e7ef6d96eec75ee8f6cf8c934420ae7e1322db4 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-
-  name = "cimg-${version}";
+  pname = "cimg";
   version = "2.7.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 1890d2b25a0dca56cf0e3926e219bbd0de25b48b..a7d7a0ea982b2fcc8367f36b5f60ed70395c85f4 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
-  name = "cl-${version}";
+  pname = "cl";
 
   src = fetchFromGitHub {
     owner = "tonyrog";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # 'cp' line taken from Arch recipe
   # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl
   installPhase = ''
-    DIR=$out/lib/erlang/lib/${name}
+    DIR=$out/lib/erlang/lib/${pname}-${version}
     mkdir -p $DIR
     cp -ruv c_src doc ebin include priv src $DIR
   '';
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index d329b1945fc74ec3f807183ab6c0766bb221544c..ff8e1ca6759c380264018350bc61465e9f93f4fd 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.10"; in
 
 stdenv.mkDerivation {
-  name = "classads-${version}";
+  pname = "classads";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
index 086816655d3b6ea94a3ba85c339f888a9c0517ab..1175242390613d8f90a22c66c85b2e1583e0050f 100644
--- a/pkgs/development/libraries/clipper/default.nix
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.4.2";
-  name = "Clipper-${version}";
+  pname = "Clipper";
   src = fetchurl {
     url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip";
     sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1";
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 7764e9c67ed208e3decc31988e46d112a7fe80f7..7adc2a365c5b1208054367ce337208d95f7fa11f 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "cln-${version}";
+  pname = "cln";
   version = "1.3.4";
 
   src = fetchurl {
-    url = "${meta.homepage}${name}.tar.bz2";
+    url = "${meta.homepage}${pname}-${version}.tar.bz2";
     sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
   };
 
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index ede2049b6ee9b2b701613f6d8a7d3586d008d28c..e7c02312b66e5e10c715cb12517574d1395fbc0e 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.29.0";
-  name = "cmark-${version}";
+  pname = "cmark";
 
   src = fetchFromGitHub {
     owner = "jgm";
diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix
index 8044d7165f75772f6725914f9e4eebe3eabd9756..11e719b36df4bd903668d5feed4bf956267c9528 100644
--- a/pkgs/development/libraries/cmrt/default.nix
+++ b/pkgs/development/libraries/cmrt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }:
 
 stdenv.mkDerivation rec {
-  name = "cmrt-${version}";
+  pname = "cmrt";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 9f4c4c3b6b36525a44012be6e4f1fc2b1ab58c70..7c42a7479b1aacc7ac7756c711005c7d8283dc3f 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.8";
 
 in stdenv.mkDerivation {
-  name = "codec2-${version}";
+  pname = "codec2";
+  inherit version;
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}";
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index 29ce216cadf165c36b4ecfb0d939db71def6ddb2..cc42407433c56e41c79e728986535371ef7df074 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "concurrencykit-${version}";
+  pname = "concurrencykit";
   version = "0.6.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
index 5630daa0d9333fb4505d84432eadf0b167f8e0cb..86f4485a900d81369b97b2e15e67124e9f879f96 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -2,7 +2,7 @@
 , bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "coprthr-${version}";
+  pname = "coprthr";
   version = "1.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index c2f3ce9b9b4a0bf33d852032cfc68edcc0b1f1fb..ea3eec825c7042acbcf94fdcc5b786497c4ac3d0 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
-  name = "cpp-hocon-${version}";
+  pname = "cpp-hocon";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
index c13b32a67b061f8637f2c85723e782fe2bfe5f3d..2585a7abaed1dcd1f9770d39d907ba58393cfd3e 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
 
 stdenv.mkDerivation rec {
-  name = "cpp-ipfs-api-${version}";
+  pname = "cpp-ipfs-api";
   version = "2017-01-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index a2493e55fb0b52a4bb2ae398f2f22f139d96439d..7bb2bad9689df839d6b31956203a1c12479ae079 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "cppcms-${version}";
+  pname = "cppcms";
   version = "1.2.1";
 
   src = fetchurl {
-      url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
+      url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
       sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
   };
 
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 3423b29d76c8e21c6fc7f3c9b63cc9c3e55e6dcb..737122c57bfe2c93825fcd540a8424ff7ba7df0e 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
-  name = "cppdb-${version}";
+  pname = "cppdb";
   version = "0.3.1";
 
   src = fetchurl {
-      url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
+      url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
       sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
   };
 
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 3f8b2d896ac634c067e252bd1ddc856570c959b4..76fd6db18b05a557b16ab4470f1a3971228b98af 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cppunit-${version}";
+  pname = "cppunit";
   version = "1.14.0";
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/${name}.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
     sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix";
   };
 
diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix
index 2dce60d4b2c49ebb9eafb192865097e29aecc772..28ab31a08ccdb990390f16477e770fb4b2ce16ac 100644
--- a/pkgs/development/libraries/cpputest/default.nix
+++ b/pkgs/development/libraries/cpputest/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.8";
-  name = "cpputest-${version}";
+  pname = "cpputest";
 
   src = fetchurl {
-    url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8";
   };
 
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 5bffda607ee159b037a8bd77d00cf698529b0c25..2328bd5336299fa388bc9172e113b2606ee7d639 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zeromq }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-${version}";
+  pname = "cppzmq";
   version = "4.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
index d8130d0b8f918293c5939499c0801dbf6df8626d..a4313fa94d367a7d6d54d8c8bd2f789e5160bb7f 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -2,8 +2,8 @@
   libtool, pkgconfig, re2, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "cre2-${version}";
-  version = "0.3.6";
+  pname = "cre2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "marcomaggi";
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 61a825cd3745f97b9228444133f7c16761a0750b..cb481fc7084e61bce07e73d06bc1834822fbdf55 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "crypto++-${version}";
+  pname = "crypto++";
   majorVersion = "5.6";
   version = "${majorVersion}.5";
 
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 9b74ecdb0f7ec7ff014703cbc3c475912e1c696d..506aa5f475d6c384b3617ebe9e39eba231701c0e 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "csfml-${version}";
+  pname = "csfml";
+  inherit version;
   src = fetchFromGitHub {
     owner = "SFML";
     repo  = "CSFML";
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index fd81de5139d6c5994f3ea94b36ea13ed77a54b03..5696684e91d25771d2c4c1af633240e606fc87db 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "ctpl-${version}";
+  pname = "ctpl";
   version = "0.3.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 5a2a53ef24d5f55d7cd3b3d5c93c2a316656fc1b..ea2230909a2c656a0b6447cb1057596544f35838 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "ctpp2-${version}";
+  pname = "ctpp2";
   version = "2.8.3";
 
   src = fetchurl {
-    url = "http://ctpp.havoc.ru/download/${name}.tar.gz";
+    url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz";
     sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
   };
 
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index a2188f687d1360d58a9ab26be65d4f9d684b3f54..647c80bf8ac382731e0d89be54c4fabe7a21fcc6 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, curl }: 
 
 stdenv.mkDerivation rec {
-  name = "curlcpp-${version}";
+  pname = "curlcpp";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix
index 58f88e6d8ebf372426ab49e95491c38790079240..490f472a066202ea2833415eefe428ff8032b5cf 100644
--- a/pkgs/development/libraries/curlpp/default.nix
+++ b/pkgs/development/libraries/curlpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
-  name = "curlpp-${version}";
+  pname = "curlpp";
   version = "0.8.1";
   src = fetchFromGitHub {
     owner = "jpbarrette";
diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix
index ba1d02380e2921ec75f8ea469009994b2951d15a..1658f8a6fa7a11fdec2fa9db1aa9491808972b3b 100644
--- a/pkgs/development/libraries/cutee/default.nix
+++ b/pkgs/development/libraries/cutee/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "cutee";
   version = "0.4.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url    = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index 216b644b38e188f8f22a4c55235a81c77d0a9ae0..e84fbe89aa952b03a85b210e120705d50db910df 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cutelyst-${version}";
+  pname = "cutelyst";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix
index 8be68a314e3d91d477329f30ac618311067a76ae..e668e653477709b6e1aa50c62fae59857f64a791 100644
--- a/pkgs/development/libraries/cxx-prettyprint/default.nix
+++ b/pkgs/development/libraries/cxx-prettyprint/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cxx-prettyprint-unstable-${version}";
+  pname = "cxx-prettyprint-unstable";
   version = "2016-04-30";
   rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533";
 
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix
index 77b27640fd77c95be88e513d2c0ff145e2a6f35e..4c572cf781a6e3d3d106fad7cd64fd7a3f2b5271 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/pkgs/development/libraries/cxxtools/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.1";
-  name = "cxxtools-${version}";
+  pname = "cxxtools";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}.tar.gz";
+    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
     sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
   };
 
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 0bdaf1be95511a682c4632c3d5ef4f254f6739c9..a050dd8d9cac3d7336547204865cb32c6cdf4fa6 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -4,13 +4,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cyrus-sasl-${version}";
+  pname = "cyrus-sasl";
   version = "2.1.27";
 
   src = fetchurl {
     urls =
-      [ "http://www.cyrusimap.org/releases/${name}.tar.gz"
-        "http://www.cyrusimap.org/releases/old/${name}.tar.gz"
+      [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz"
+        "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz"
       ];
     sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
   };
diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix
index d418b879d1ddd3f15606c279e21c85dc5cba55db..73a51cd27310733ac347b418079ca623ce994ff9 100644
--- a/pkgs/development/libraries/czmq/3.x.nix
+++ b/pkgs/development/libraries/czmq/3.x.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.2";
-  name = "czmq-${version}";
+  pname = "czmq";
 
   src = fetchurl {
-    url = "http://download.zeromq.org/${name}.tar.gz";
+    url = "http://download.zeromq.org/${pname}-${version}.tar.gz";
     sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb";
   };
 
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index 13cee8fe86ba64105c9f9fed62d23bb4ed048ea1..05e499c73d0c99dd75b9c5fe731de08d2f6cab74 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.2.0";
-  name = "czmq-${version}";
+  pname = "czmq";
 
   src = fetchurl {
-    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg";
   };
 
diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix
index 0c026b9f47a5ed73f55513a51ef2e72e67646ef5..079eb0806d2c9fadc3b0038fdb2cf1f5e0911e41 100644
--- a/pkgs/development/libraries/czmqpp/default.nix
+++ b/pkgs/development/libraries/czmqpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
 
 stdenv.mkDerivation rec {
-  name = "czmqpp-${version}";
+  pname = "czmqpp";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 163b0f4be883ddd0fed07a854aef74235e4640da..2609f47b276014ac5594db8eff8dc9eff55cac2a 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-cplusplus-${version}";
+  pname = "dbus-cplusplus";
   version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 0f897d97467f2bc58498a9517f14ee643b834ea4..22c0a9137caee15f06859641728553312af87db5 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-glib-${version}";
+  pname = "dbus-sharp-glib";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index cd020317f4c2baff55fb04f42ea8d1d081e3ae6d..496a109b58f13471e3b14a7504025e38f6c4c97f 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-glib-${version}";
+  pname = "dbus-sharp-glib";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 18ea3ad3ecb75ea868da11e36ffad1a366c57757..084beae597271fa24023efb6bdfb63c95280ee2f 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-${version}";
+  pname = "dbus-sharp";
   version = "0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 14db5baea3fbe5df26a78f23ca8ea5b1f22e9d45..0fd638dbf8eb5bf1c859207dcb5e0e8c4ec39bc9 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-sharp-${version}";
+  pname = "dbus-sharp";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
index da7549aeea362065d5975b70e02360629eb56f4b..b940315aed831ce5734ae3f7eedac88798d2ad99 100644
--- a/pkgs/development/libraries/dbxml/default.nix
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, db62, xercesc, xqilla }:
 
 stdenv.mkDerivation rec {
-  name = "dbxml-${version}";
+  pname = "dbxml";
   version = "6.1.4";
 
   src = fetchurl {
-    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz";
     sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a";
   };
 
diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
index 5b05d64f0727ba38ff56cd99972f1bebca5b020e..93e5da5b792d6a8690931d27fdbbb21d728d365d 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.2";
-  name = "dirac-${version}";
+  pname = "dirac";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dirac/${name}.tar.gz";
+    url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz";
     sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1";
   };
 
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index d52f1b6a2cffa97a0d6866c0734ad0225dffaf9f..643e7d3cc5d710b1eada9f5c5a0ba67f078c1622 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "dleyna-connector-dbus";
-  name = "${pname}-${version}";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 97d74e1ed3c8b444e86893ad71d77acb96d30f04..dfa5509fb98e1ddb9589d96929476642f5d60c06 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -6,8 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
+  pname = "dlib";
   version = "19.17";
-  name = "dlib-${version}";
 
   src = fetchFromGitHub {
     owner = "davisking";
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
index 83466b693f595729c5d551a89666af907de64e08..59578ef796ec629487d0fb5d4dc68ae3f1039fbb 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.2";
-  name = "docopt.cpp-${version}";
+  pname = "docopt.cpp";
 
   src = fetchFromGitHub {
     owner = "docopt";
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 095697762ddd31f0fb702ca76ba8f7443d94891d..bc4bc8b2352436543886d3926ea4347f18535b05 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "double-conversion-${version}";
+  pname = "double-conversion";
   version = "3.1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index c85f6de0405c7116c3ab0e3a934968c57d0c8524..756a03503b350b82c8e19ec096b606b46af4f23c 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "drumstick-${version}";
+  pname = "drumstick";
   version = "1.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp";
   };
 
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 9be19f51e7e8ec9d98cf4a94891ae4938b8f7743..779e6b077625eb17173c719130e87c26487fcead 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dssi-${version}";
+  pname = "dssi";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dssi/dssi/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz";
     sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
   };
 
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix
index 832b013123ddba72499e33c58751de78c05f4849..8d8b41e0609b03ac4ca87a5327ded041076c0e50 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   version = "3.12.2";
-  name = "dxflib-${version}";
+  pname = "dxflib";
   src = fetchurl {
-    url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz";
+    url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz";
     sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9";
   };
 
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index 704f5c51c9c905694a32f7b6888243c696f083fd..a6ff37bee97adbdc70920a0e05e4b42c7c4cdc60 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dyncall-${version}";
+  pname = "dyncall";
   version = "1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 4ca9eab51bbee89ebde270b6bf93ad53855a9177..028cd221614bcfcdf558cea10deb699ae7983a6a 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -3,7 +3,7 @@
 # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
 { stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
-  name = "easyloggingpp-${version}";
+  pname = "easyloggingpp";
   version = "9.96.7";
   src = fetchFromGitHub {
     owner = "muflihun";
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 78f80d2baf4266e7b9aad8e3f98b7621485449f7..a9a77f6a9dafc3a1e412ea9d63ef349978be7823 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -5,7 +5,7 @@
 , enableOpenMPThreads ? false}:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "eccodes-${version}";
+  pname = "eccodes";
   version = "2.12.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 62f04e061cfaf399db9378137f8b3e884bde677a..71229909431ef6cb127d74a7c9de6f35b6a227de 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -13,7 +13,6 @@
 assert withFlint -> flint != null;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "eclib";
   version = "20190226"; # upgrade might break the sage interface
   # sage tests to run:
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 6dfd4edd0716146cf07cb20333152c61c1f08b25..5f9c72f04afef623bff26541c263aff951f3b87b 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "editline-${version}";
+  pname = "editline";
   version = "1.16.1";
   src = fetchFromGitHub {
     owner = "troglobit";
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 6aec15f976bb55c71276d19e4b7c304a9d40e691..63e2707917a58baab3fb19fb77730be87fd518d4 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -4,7 +4,8 @@ let
   version = "3.3.7";
 in
 stdenv.mkDerivation {
-  name = "eigen-${version}";
+  pname = "eigen";
+  inherit version;
 
   src = fetchurl {
     url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 710338842f8d22bb90592621ee43471601793bad..566f8bfd8d15cf4aa60931e4ea3f08c61882d0f8 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "elementary-cmake-modules-${version}";
+  pname = "elementary-cmake-modules";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
index c973c2bd9449f85bf7b35871ec9551a13ed88a43..4fc85aee69f6cdd6d07e56d2e843eb96131ac807 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -3,7 +3,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11
 }:
 
 stdenv.mkDerivation rec {
-  name = "embree-${version}";
+  pname = "embree";
   version = "2.17.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix
index b7303468cbafba86fc581f6f8e3655a31d994774..ed91f791149d12bb8b74ec9745389799b2ddc893 100644
--- a/pkgs/development/libraries/enchant/1.x.nix
+++ b/pkgs/development/libraries/enchant/1.x.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "1.6.1";
   pname = "enchant";
 
   src = fetchurl {
-    url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
+    url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz";
     sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
   };
 
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 8b559bd03c82065ba43260aace0c1648a12fe98f..3f46390c12bafe67f9a3375534e19f0658fb1672 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
+{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }:
 
-let
-  version = "2.2.3";
+stdenv.mkDerivation rec {
   pname = "enchant";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "2.2.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b";
+    url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+    sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ glib hunspell ];
+  checkInputs = [ unittest-cpp ];
   propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
 
-  doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory"
+  enableParallelBuilding = true;
+
+  doCheck = false; # https://github.com/AbiWord/enchant/issues/219
 
   meta = with stdenv.lib; {
     description = "Generic spell checking library";
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index c4285eadabc08c6e5532e1c5d973571bb13e61e9..d45767058bb7424f7efb4696a3c36ceee170093d 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "epoxy-${version}";
+  pname = "epoxy";
   version = "1.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 332504e46b540ead7bbda200a957e9104d09d804..4968c38bfd33b509f6c5957e1ad2130d941d85cd 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }:
 
 stdenv.mkDerivation rec {
- name = "libexosip2-${version}";
+ pname = "libexosip2";
  version = "4.1.0";
 
  src = fetchurl {
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index c568a670f553f506f707eb66faa9953c92147985..7a5afd8e8018a4ba2e1fd09ea71947fce529ebe4 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -7,11 +7,11 @@ assert mp4v2Support -> (mp4v2 != null);
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "faac-${version}";
+  pname = "faac";
   version = "1.29.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/faac/${name}.tar.gz";
+    url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
     sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl";
   };
 
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index e7e4835d2ed352d47936503ac4391e0280dd2f24..29c0252482eaa2c87033ec6507a429bd7e8a9f6d 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -4,11 +4,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "faad2-${version}";
+  pname = "faad2";
   version = "2.8.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/faac/${name}.tar.gz";
+    url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
     sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
   };
 
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index c23fc0bc59f61b5548dcaa0f0a79c8c87d3b330d..a29cbb9bbd11689f95c2aad0e5a9205fc0eaa0f0 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "farbfeld-${version}";
+  pname = "farbfeld";
   version = "4";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index bac867978f43d0f1d2c00109439809bd6f136c8f..75d9146c335707508d8b85ef9b98c9f355224eed 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.99.8";
-  name = "fastjson-${version}";
+  pname = "fastjson";
   src = fetchFromGitHub {
     repo = "libfastjson";
     owner = "rsyslog";
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index de78647dc483c4f9bf089298f8508434acaa7933..5eb7e3866ce65b2b4a9e93c9779d674bedefb7a0 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "fcgi-${version}";
+  pname = "fcgi";
   version = "2.4.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 9b7cea3ebbcb12caba8f923aec99a61b874c3441..70269002e2fe7a659e6915124099ef50eec0ee6e 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -4,11 +4,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "fdk-aac-${version}";
+  pname = "fdk-aac";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
+    url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
     sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp";
   };
 
diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix
index eae0326c832f2e99627d4da147792422564a3314..4a276db12c028839d1d2df05d654da231ffa049d 100644
--- a/pkgs/development/libraries/fflas-ffpack/1.nix
+++ b/pkgs/development/libraries/fflas-ffpack/1.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fflas-ffpack";
   version = "1.6.0";
   src = fetchurl {
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index a67210e860cde5f288b32a176051805c79e9d3bf..858bc209391657ca1391b7b31898c82d3c741d88 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -2,7 +2,6 @@
 , gmpxx
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fflas-ffpack";
   version = "2.4.0";
 
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 28ab53feebdd3672366cfe52d990feb605ca1fad..3b1aeeebaabd92655f5f1c235294573213c80811 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -237,7 +237,7 @@ assert openglExtlib -> libGLU_combined != null;
 assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-full-${version}";
+  pname = "ffmpeg-full";
   version = "4.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index 4607d3e2f197508c0f5a73390dbe713304ae319e..439342a50b85067e59bafe483f1ed3c1c91c36b3 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "ffmpeg-sixel-${version}";
+  pname = "ffmpeg-sixel";
   version = "nightly-2.3.x";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 72929e127bcca5fe188265ac6386f0a54ed2713d..84260f3f57c73dd6e60f870ec87a1b3e6eefcbdd 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -65,11 +65,11 @@ assert openglSupport -> libGLU_combined != null;
 
 stdenv.mkDerivation rec {
 
-  name = "ffmpeg-${version}";
+  pname = "ffmpeg";
   inherit version;
 
   src = fetchurl {
-    url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
+    url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index a1cc11fb8c1e71273a3ea36d4eda27e9bebc0565..45238690fe032f31fb0adeeb95ca994d2b7c79f4 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpegthumbnailer-${version}";
+  pname = "ffmpegthumbnailer";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 1ad861fc63d86e493698bfca68d88a779bc8d11d..c404a12f3dfdafb49685ace094d059511707beb7 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ffms-${version}";
+  pname = "ffms";
   version = "2.23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index 4a2bed6b497934ac16150bf5c164282b7d48ec7d..07f1c7ec917a2a3586c48b99d6e6917ea9d2d939 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "filter-audio-${version}";
+  pname = "filter-audio";
   version = "0.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 504b58b6aa4d7810c9b9d2db8dc3f0dc2d92a174..d96ceb5d26b894bd0c41d73fe95f6a54d306adef 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "flatbuffers-${version}";
+  pname = "flatbuffers";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index d92a0c61aab84d35bd0fd72d337e45ce11493959..20a80119b1367f5588b6caf8ab16af11608d72d7 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -12,7 +12,7 @@
 assert withBlas -> openblas != null;
 
 stdenv.mkDerivation rec {
-  name = "flint-${version}";
+  pname = "flint";
   version = "2.5.2"; # remove libflint.so.MAJOR patch when updating
   src = fetchurl {
     url = "http://www.flintlib.org/flint-${version}.tar.gz";
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index cad4419a26ccfd79de371a459873b3cbd661b593..eebe119d142fd1c35ba397d7ae3979ec56fe98a5 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "fltk-${version}";
+  pname = "fltk";
+  inherit version;
 
   src = fetchurl {
     url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index bb9f8fe76c9d7cb3ae4bf595eeb269643738a3e4..a22b5eef8d2e0c59ed3a045d992b957f00a6fe8e 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "fltk-${version}";
+  pname = "fltk";
+  inherit version;
 
   src = fetchurl {
     url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 2cfc87d6a2e587fc62f71b712390ba69afd0aa11..6ade5eb833a9224e841bc388c9ebcfbddca1c1f1 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.3.0";
-  name = "fmt-${version}";
+  pname = "fmt";
 
   src = fetchFromGitHub {
     owner = "fmtlib";
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index a2c3d41d35d1efac94f1b95ff43631cbac1258fe..b072df506a998cb12ce652c273a12482072f231a 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,7 +2,7 @@
 , gflags, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "folly-${version}";
+  pname = "folly";
   version = "2019.08.05.00";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix
index 9aeb12344eced43b1f3096ddd0b49287b48fd91d..b95d6dd559d4f14b11208a992db1e73544120861 100644
--- a/pkgs/development/libraries/fontconfig-ultimate/default.nix
+++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix
@@ -2,7 +2,8 @@
 
 let version = "2016-04-23"; in
 stdenv.mkDerivation {
-  name = "fontconfig-ultimate-${version}";
+  pname = "fontconfig-ultimate";
+  inherit version;
 
   src = fetchFromGitHub {
     sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498";
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index f730e3e3408f2a79620e2597257cb0b09616db4d..186560ae101fec9b0cdce20db34f993dde25824d 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -17,11 +17,11 @@ let
   configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations
 in
 stdenv.mkDerivation rec {
-  name = "fontconfig-${version}";
+  pname = "fontconfig";
   version = "2.12.6";
 
   src = fetchurl {
-    url = "http://fontconfig.org/release/${name}.tar.bz2";
+    url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2";
     sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g";
   };
 
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 40430f34334c6b9d3199b24b72f4375b5447cd81..fa4a8c23e2fb4cd2d7d62614b61cbea2b467a10e 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -2,11 +2,11 @@
 , CoreServices ? null }:
 
 stdenv.mkDerivation rec {
-  name = "fox-${version}";
+  pname = "fox";
   version = "1.7.9";
 
   src = fetchurl {
-    url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+    url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
     sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
   };
 
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 4f1e0eaee7fb791e3fb90954cd24082561121ac0..af387b7232f4150b7850512c825947f9770301da 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -7,10 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "fox-${version}";
+  pname = "fox";
+  inherit version;
 
   src = fetchurl {
-    url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+    url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
     sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5";
   };
 
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix
index 952ecb0eadebf231393967e63f16f32070243c56..1fd18254e10f483a498f62dbd8955b3f5bcabc60 100644
--- a/pkgs/development/libraries/fplll/20160331.nix
+++ b/pkgs/development/libraries/fplll/20160331.nix
@@ -2,7 +2,6 @@
 , gmp, mpfr
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fplll";
   version = "20160331";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 063217a45047cb9d02cae04a009ab0d4138fff2c..f06f7bf4a02f9d36a53a8d7e60e67f9c10dde1a4 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -2,7 +2,6 @@
 , gmp, mpfr
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fplll";
   version = "5.2.1";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index e15626a160e27689900b3ebd0ad65cdd6ccefa3e..feccfd1bfd2b9eef3b3c590f090ddefd9dee7766 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -2,10 +2,10 @@
 ,  stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "frame-${version}";
+  pname = "frame";
   version = "2.5.0";
   src = fetchurl {
-    url = "https://launchpad.net/frame/trunk/v${version}/+download/${name}.tar.xz";
+    url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz";
     sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
   };
 
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index c34d9591d38686919a9c6486a0f135c63a8a6d10..8412248b617050d08f0d975841f55bbd857f32d6 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -2,7 +2,8 @@
 
 let version = "3.0.0";
 in stdenv.mkDerivation {
-  name = "freeglut-${version}";
+  pname = "freeglut";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 3771880d36081994f67a1c843cbb08d40f30969b..41480789a08af6a424218691d0da3ef2031ec3b4 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -3,7 +3,7 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "freenect-${version}";
+  pname = "freenect";
   version = "0.5.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index ee63ce2f2f9e25f6b869fc9c94f749eeef89cca9..0ff9cea3d27c833e64465011f0b388fc8374447e 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -7,11 +7,11 @@ assert odbcSupport -> unixODBC != null;
 # Work is in progress to move to cmake so revisit that later
 
 stdenv.mkDerivation rec {
-  name = "freetds-${version}";
+  pname = "freetds";
   version = "1.1.6";
 
   src = fetchurl {
-    url    = "https://www.freetds.org/files/stable/${name}.tar.bz2";
+    url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
     sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2";
   };
 
diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix
index cdeddd82b71de6154b79caa41e8e0328d8b58e9d..560855c908b1659308e2f7a7200f69430ed0bdc8 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/pkgs/development/libraries/frei0r/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "frei0r-plugins-${version}";
+  pname = "frei0r-plugins";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz";
+    url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
     sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
   };
 
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index b60f4be245e2cc29b996d312c82895ba74332faa..9798347eaddfd3cf139dcf8f06380c35216d03e8 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchurl
 , fetchpatch
-
 , meson
 , ninja
 , pkgconfig
@@ -10,7 +9,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fribidi";
   version = "1.0.5";
 
@@ -18,7 +16,7 @@ stdenv.mkDerivation rec {
 
   # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
   src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
   };
 
@@ -33,10 +31,11 @@ stdenv.mkDerivation rec {
     patchShebangs test
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkgconfig ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  checkInptus = [ python3 ];
+  doCheck = true;
+  checkInputs = [ python3 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/fribidi/fribidi;
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
index 68f3c9d0ee5949e74e2513702b621df1734b921d..5e8197d5e81ac05c88b9f7ef29e3a42b8a4d5dc0 100644
--- a/pkgs/development/libraries/fstrcmp/default.nix
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, libtool, ghostscript, groff }:
 
 stdenv.mkDerivation rec {
-  name = "fstrcmp-${version}";
+  pname = "fstrcmp";
   version = "0.7";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index 3fcf218d6b56069f7477e80d4a53580b2d46f134..380f64cf523f65aef331a9e8a31a5b29e55f50d3 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "fstrm-${version}";
+  pname = "fstrm";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 7e35ed2e5309708801e71c9c182b1b481fa4ce7d..a990da4b010ee704ba44a3e74e86fc2c6b24f25e 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, gtest }:
 
 stdenv.mkDerivation rec {
-  name = "gbenchmark-${version}";
+  pname = "gbenchmark";
   version = "1.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index 4762d1fb119f5624a82aa0536eed2d8567d74aa3..2589b6cfa16bc98b95abe6208e1167e2e1ccd3bf 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, flex, bison, file }:
 
 stdenv.mkDerivation rec {
-  name = "libstdc++5-${version}";
+  pname = "libstdc++5";
   version = "3.3.6";
 
   src = [
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 5ceded0546c5bcfb19c35b75c18ea412836e7136..6f57d735980d1d633f089cf3d72f7e832354c89b 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -11,11 +11,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gd-${version}";
+  pname = "gd";
   version = "2.2.5";
 
   src = fetchurl {
-    url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
+    url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz";
     sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c";
   };
 
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index 14113d8b87eb54c7ca87372ee6edf4981c396f94..baf847d4e0a28899fa505a53ebc53eab5f58b06a 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -8,11 +8,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gdal-${version}";
+  pname = "gdal";
   version = "2.4.0";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
     sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
   };
 
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 0db16e2efe3ae4980d9ebe3c1a94e13d215728d5..413d4e19dde75e9c5840377df7b248114410c707 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -8,7 +8,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gdal-${version}";
+  pname = "gdal";
   version = "3.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 40308a9579156baf6330ff899b65f3d5a712e6f3..a65740534146958f5bc6298c5a3aa00d02cbea20 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -3,11 +3,11 @@
 , libpng }:
 
 stdenv.mkDerivation rec {
-  name = "gdal-${version}";
+  pname = "gdal";
   version = "1.11.5";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
     sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
   };
 
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix
index a9b79dac7b882bd7908c521c0230d043dc97c267..b7043b61c8a62f6dcaffbd9200d2ef273064b87d 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@@ -3,7 +3,7 @@
 let
   newtonsoft-json = dotnetPackages.NewtonsoftJson;
 in stdenv.mkDerivation rec {
-  name = "gdata-sharp-${version}";
+  pname = "gdata-sharp";
   version = "2.2.0.0";
 
   src = fetchsvn {
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index fa99dbe1d9fa9611f4fa9abbd12b1f3cc1457205..29a30a1b157dab3951332e072728b2f0d4cf9b51 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.1";
-  name = "gdcm-${version}";
+  pname = "gdcm";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
+    url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
     sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq";
   };
 
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix
index 32e1163e0f074b9d77bb07cf8f258e8a6e1fc6dd..0d96b9b5a9240d3bd14eecf9caf4b9bc58b435a8 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/pkgs/development/libraries/gecode/3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, perl }:
 
 stdenv.mkDerivation rec {
-  name = "gecode-${version}";
+  pname = "gecode";
   version = "3.7.3";
 
   src = fetchurl {
-    url = "http://www.gecode.org/download/${name}.tar.gz";
+    url = "http://www.gecode.org/download/${pname}-${version}.tar.gz";
     sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
   };
 
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 9a6b5d9cf27368726073dcfa74ac35a31325c251..454e811447a174b4ccf1dfc7967968e7c1d7bb27 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "gecode-${version}";
+  pname = "gecode";
   version = "6.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 4b9f67b7aaf83b7761fbe62625b4bb7f2bf201d4..97b9ba087e2811c500b7b7f170ba5941c20ab930 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -21,11 +21,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "geis-${version}";
+  pname = "geis";
   version = "2.2.17";
 
   src = fetchurl {
-    url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz";
+    url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz";
     sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
   };
 
diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 22e7d216e6cdb6082aad23526bab76a9e6015e3c..0e0477cd24daaeb74346f793552345d0d6c7838b 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, libtool }:
 stdenv.mkDerivation rec {
-  name = "getdata-${version}";
+  pname = "getdata";
   version = "0.10.0";
   src = fetchurl {
-    url = "mirror://sourceforge/getdata/${name}.tar.xz";
+    url = "mirror://sourceforge/getdata/${pname}-${version}.tar.xz";
     sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
   };
 
diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 0493071ee22840fbfafe3b7f35fd4cdb85566a7d..3a6c4ee1dbda3c35482bca71274255ea26763bb8 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "getdns";
-  name = "${pname}-${version}";
   version = "1.5.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 6eb8bae435bedf36381ab1142f939aff7dea629d..9547c6c31ada64d9b582dd9ab8af2c8184623a4f 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -2,11 +2,11 @@
 
 let allowBisonDependency = !stdenv.isDarwin; in
 stdenv.mkDerivation rec {
-  name = "gettext-${version}";
+  pname = "gettext";
   version = "0.19.8.1";
 
   src = fetchurl {
-    url = "mirror://gnu/gettext/${name}.tar.gz";
+    url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
     sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
   };
   patches = [
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index a00e07376c7bc1c229d30b8397a6a4bc02e76eae..b1a2524065a5599604a28abbafda2b7d1ab38209 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -4,7 +4,7 @@
 , optimize ? false # impure hardware optimizations
 }:
 stdenv.mkDerivation rec {
-  name = "gf2x-${version}";
+  pname = "gf2x";
   version = "1.2"; # remember to also update the url
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix
index b0a115eb4a5117d3333bebfc120327092c7a96a2..86c5b7949a1b43336d984a8531e915305254e563 100644
--- a/pkgs/development/libraries/gio-sharp/default.nix
+++ b/pkgs/development/libraries/gio-sharp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
-  name = "gio-sharp-${version}";
+  pname = "gio-sharp";
   version = "0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
index 3101bc64333eb9f746bb5f678061f49a93c94bd4..debddc6723fb5c0103902dcf548e707e6d87ad85 100644
--- a/pkgs/development/libraries/givaro/3.7.nix
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "givaro";
   version = "3.7.2";
   src = fetchurl {
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
index d73a448f1662b8d1e89df7ab18c838c67bcf7123..efed0926bb325579843fd9fd3ac4947bf6f3eb46 100644
--- a/pkgs/development/libraries/givaro/3.nix
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "givaro";
   version = "3.8.0";
   src = fetchurl {
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 1a97150aa48c2cd9f424d3c63288643034bbc75b..79fb7a8d738f48a8d8e6a2099138b4811501bd4d 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "givaro";
   version = "4.1.1";
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix
index aadc6986f5ad9adbf16b9433b95ddd2a00a228de..8b522c6e92b04948da486832b9ef935680aff30c 100644
--- a/pkgs/development/libraries/gl2ps/default.nix
+++ b/pkgs/development/libraries/gl2ps/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.0";
-  name = "gl2ps-${version}";
+  pname = "gl2ps";
 
   src = fetchurl {
-    url = "http://geuz.org/gl2ps/src/${name}.tgz";
+    url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz";
     sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3";
   };
 
diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix
index d12b8a7c11d0b60d4577ed91ab7f4fdaf537db94..6498419bc27d93b18cb9be473d69c23e348683cc 100644
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/pkgs/development/libraries/glbinding/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "glbinding";
   version = "3.1.0";
 
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 6944d5b9292ce1e24c0f11898adcd1a32d835f85..2ee36d405b311a5efbe254b9fd8eff765bc1ea9b 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.1";
-  name = "glfw-${version}";
+  pname = "glfw";
 
   src = fetchFromGitHub {
     owner = "glfw";
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ecbcbea13941dfac535b278f00b9ee82c0e7a242..48e65cc063b0f70dd57254e0be10a8ed16f55386 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -46,15 +46,16 @@ let
   '';
 
   binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
-  version = "2.60.4";
+  version = "2.60.6";
 in
 
 stdenv.mkDerivation rec {
-  name = "glib-${version}";
+  pname = "glib";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b";
+    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -98,8 +99,12 @@ stdenv.mkDerivation rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP")
-    ++ [ "-Wno-error=nonnull" ];
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=nonnull"
+    # Default for release buildtype but passed manually because
+    # we're using plain
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
 
   postPatch = ''
     # substitute fix-gio-launch-desktop-path.patch
@@ -135,7 +140,7 @@ stdenv.mkDerivation rec {
     sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
 
     # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
-    sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
+    sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
       -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
   '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     cp -r ${buildPackages.glib.devdoc} $devdoc
@@ -144,7 +149,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
 
   preCheck = optionalString doCheck ''
-    export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH"
     export TZDIR="${tzdata}/share/zoneinfo"
     export XDG_CACHE_HOME="$TMP"
     export XDG_RUNTIME_HOME="$TMP"
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index 319a0359c58169567c59a20fa3da23bc41c9d67a..e7d4c934db814cf2bba10e4505f880b1881a9782 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.8.5";
-  name = "glm-${version}";
+  pname = "glm";
 
   src = fetchzip {
-    url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip";
+    url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip";
     sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2";
   };
 
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix
index 269071434d5796e31f30fd53827cc776f564e48e..9cb5dda507d22209aadcd103168194ea121a815e 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/pkgs/development/libraries/globalarrays/default.nix
@@ -6,7 +6,8 @@ let
   version = "5.7";
 
 in stdenv.mkDerivation {
-  name = "globalarrays-${version}";
+  pname = "globalarrays";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "GlobalArrays";
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
index f01fb13c3c3e77ba5a53ff5bc5a2465120c04ade..b3cf36107afa4faf3096ed372e16d15accce05c0 100644
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ b/pkgs/development/libraries/globalplatform/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "globalplatform-${version}";
+  pname = "globalplatform";
   version  = "6.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
     sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
   };
 
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
index 87addaa99919b88c3894460cd0c0c741bdd6810c..e01deea117529340b283007198f32abcaac6484f 100644
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "gppcscconnectionplugin-${version}";
+  pname = "gppcscconnectionplugin";
   version  = "1.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
     sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
   };
 
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 9ae181e94530685cb3e907fad0ed4f8cd71eba6c..6aa300e2b62783a3e7342272b4eaffdec456226a 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, perl }:
 
 stdenv.mkDerivation rec {
-  name = "glog-${version}";
+  pname = "glog";
   version = "0.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index d532e906a5107076d2adab92d60d5410e405753a..d44bcdda9aeddd5bf89d79a47e9d2a64d85749b9 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -14,7 +14,8 @@ let
   version = "1.0.22";
 in
 stdenv.mkDerivation rec {
-  name = "gloox-${version}";
+  pname = "gloox";
+  inherit version;
 
   src = fetchurl {
     url = "https://camaya.net/download/gloox-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 1d35c0696d2775c524f9fed412720b395f604cd8..84a7aff710764766d2eca09c36801a4eab745d1b 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -14,10 +14,10 @@ assert withGmp -> gmp != null;
 
 stdenv.mkDerivation rec {
   version = "4.65";
-  name = "glpk-${version}";
+  pname = "glpk";
 
   src = fetchurl {
-    url = "mirror://gnu/glpk/${name}.tar.gz";
+    url = "mirror://gnu/glpk/${pname}-${version}.tar.gz";
     sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
   };
 
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index b373095a81483b4289216c7fadee60c81e314660..3b4ad1393d0eaded12130cbdbbb27c51bfd82a90 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.23";
-  name = "gmime-${version}";
+  pname = "gmime";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
+    url = "mirror://gnome/sources/gmime/2.6/${pname}-${version}.tar.xz";
     sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi";
   };
 
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 699d2854f3db7f33a5047a229d1252ef4a796ceb..81546e5c1272fee8fa2114ddac95b4551d62bf79 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.2.3";
-  name = "gmime-${version}";
+  pname = "gmime";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
+    url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
     sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a";
   };
 
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 6423e1fce981d2de13be109bbb3d9292f7203d11..63d9d8c276269995f9d7406bb15c49735a14762e 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gmm-${version}";
+  pname = "gmm";
   version = "5.3";
 
   src = fetchurl {
-    url = "mirror://savannah/getfem/stable/${name}.tar.gz";
+    url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz";
     sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
   };
 
diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix
index 0fac97aaa43974c15d9d17a21c33b29e6b45ac5f..10d584c6ccb0f1929676169eef346c8839022afe 100644
--- a/pkgs/development/libraries/gmtk/default.nix
+++ b/pkgs/development/libraries/gmtk/default.nix
@@ -2,7 +2,7 @@
 , libpulseaudio, mplayer, gnome_mplayer }:
 
 stdenv.mkDerivation rec {
-  name = "gmtk-${version}";
+  pname = "gmtk";
   version = "1.0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
index 5e525ad46af461826e2e7715c5b4649971fe61ff..36d42644e0b596a751deb6d6b51ab74541e69eea 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-sharp-${version}";
+  pname = "gnome-sharp";
   version = "2.24.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index 7918fb7b9c4b3a2ae873e264a285b1f36dcf9136..e914f9d78eef765396e8f47effb3a7cdbcf4ab6b 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -14,7 +14,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "gnu-config-${version}";
+  pname = "gnu-config";
   version = "2019-04-15";
 
   buildCommand = ''
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 036863c9c0bff8c00df3dfa1e0a8fb4f4fcfb8e5..af225cc50f24d7cca96fa3eada8a17272c5acd3e 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pciutils }: with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gnu-efi-${version}";
+  pname = "gnu-efi";
   version = "3.0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
+    url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
     sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
   };
 
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index 75c71632aebcb5c90e2f7ce7da7afe1faccd5d98..cb81b52b73010634b80f64247c96df7576407f67 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -15,7 +15,8 @@ let
   doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
 in
 stdenv.mkDerivation {
-  name = "gnutls-kdh-${version}";
+  pname = "gnutls-kdh";
+  inherit version;
 
   inherit src patches;
 
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 99b1307179a54d15ab71244a67669d3ae3cf7060..c7556276dc395ae66780a9026a4f0b19932889b1 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -3,12 +3,13 @@
 let
   version = "2.0.4";
 in stdenv.mkDerivation rec {
-  name = "goocanvas-${version}";
+  pname = "goocanvas";
+  inherit version;
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz";
+    url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz";
     sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
   };
 
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index c462f2e685a21f9a794ff6f7760f7b87e17ca1d5..26d5e9c88c752e79d288cf6a92f2c7d42ec429b5 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gpgme-${version}";
+  pname = "gpgme";
   version = "1.13.1";
 
   src = fetchurl {
-    url = "mirror://gnupg/gpgme/${name}.tar.bz2";
+    url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
     sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4";
   };
 
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index a48490ffae576ab43e1b5536b0fa331575e0fb7b..722fb79d5d618ae1aaf2353557fd1ec791b4afa4 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -2,11 +2,11 @@
   stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
 
 stdenv.mkDerivation rec {
-  name = "grail-${version}";
+  pname = "grail";
   version = "3.1.1";
 
   src = fetchurl {
-    url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
   };
 
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 52c087b19147fcc54bed75ccc0f5e7de9ed2e8cc..45096e031d372481a3cc50ac0dd74e7d94161f93 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -1,15 +1,14 @@
 { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
 
 mkDerivation rec {
-  name = "grantlee-${version}";
+  pname = "grantlee";
   version = "5.1.0";
-  grantleeCompatVersion = "5.1";
-  grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
+  grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
 
   src = fetchurl {
     url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
     sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ qtbase qtscript ];
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d049d6c96f810aa130cd77204cabbfe0a5785502
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
@@ -0,0 +1,24 @@
+From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 20 Jul 2019 17:35:30 +0200
+Subject: [PATCH] Fix compile with newer Qt/cmake combination
+
+Without this i get huge errors about Qt needing C++11 support
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d51110..0859788 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ endif()
+ 
+ project(Grantlee)
+ 
++set (CMAKE_CXX_STANDARD 11)
++set (CMAKE_CXX_EXTENSIONS OFF)
++
+ # Workaround for http://public.kitware.com/Bug/view.php?id=12301
+ if (MINGW)
+   if(NOT CMAKE_BUILD_TYPE)
diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series
index 9c4015a1c19793cccc29bfd33ddec61727e3a519..19850b2e7e439541917c3ad13923d2dbee672bc2 100644
--- a/pkgs/development/libraries/grantlee/5/series
+++ b/pkgs/development/libraries/grantlee/5/series
@@ -1,2 +1,3 @@
 grantlee-nix-profiles.patch
 grantlee-no-canonicalize-filepath.patch
+grantlee-cxx11.patch
diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index 3e21f3c229fa7a58cde0ce042d101b708683dbcf..66c5d8eb061ab5d4ed318507f2c80830fba205cb 100644
--- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "graphene-hardened-malloc-${version}";
+  pname = "graphene-hardened-malloc";
   version = "2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 224cd125dce6d72ec7793a09e969d69177fbf55b..38243ce5a6d8a874564c84472554b8ac7615faf4 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -3,7 +3,7 @@
   enablePython ? false, pythonPackages }:
 
 stdenv.mkDerivation rec{
-  name = "grib-api-${version}";
+  pname = "grib-api";
   version = "1.28.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 78335e073edc52a80a08b9cd63b6ca9a63d91bf4..d45aba1cb3781d1b71e4f95befaaa3c4c936096c 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
-  name = "grpc-${version}";
+  pname = "grpc";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index d454ca63fd7fb1c8d0ea2dda0db515ba5b2d1a20..ffb8be85d3acf579411fc5964dd5c268d91c51b6 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -6,11 +6,11 @@
 , gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gsettings-desktop-schemas-${version}";
+  pname = "gsettings-desktop-schemas";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
   };
 
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 744d9eb6de904f0b40e6de0f4243e38eb2d7003a..812128fb12fb6a0ce797875d56e061a3880e3e93 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gsettings-qt-${version}";
+  pname = "gsettings-qt";
   version = "0.1.20170824";
 
   src = fetchbzr {
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 7c15e10620a5290b99f278d916af34348f2fdadf..0ba3bf354235ac57cc4fab9d73385785064bfd6e 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-lastfm-${version}";
+  pname = "gsignond-plugin-lastfm";
   version = "2018-05-07";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index 887376d31874cc3698caa0c3d0a2e8e0dcbd8a7b..d9afecc6d0c154339007db742197fe98456a9ac9 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -3,7 +3,7 @@
 , docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-oauth-${version}";
+  pname = "gsignond-plugin-oauth";
   version = "2018-10-15";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 655f73931f6739cc010b5542c7a3eeeb5c6d2434..b9eecaf0946f50225884289ef330f6153c308a9c 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -2,7 +2,7 @@
 , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-sasl-${version}";
+  pname = "gsignond-plugin-sasl";
   version = "2018-10-15";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 33583a4c6bb332790e3ff7da73c3f605fd00d43f..1405d4782ad3a2b71d2b21113fbe3b2373e25999 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gsm-${version}";
+  pname = "gsm";
   version = "1.0.18";
 
   src = fetchurl {
-    url = "http://www.quut.com/gsm/${name}.tar.gz";
+    url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz";
     sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4";
   };
 
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index f099d3fabc049584b316b69ecc7ad0848f902fe0..a1a0da51017bb7ed0c89dc180cac35252978e8af 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -4,7 +4,7 @@ let
   majorVersion = "2.8";
 
 in stdenv.mkDerivation rec {
-  name = "gsoap-${version}";
+  pname = "gsoap";
   version = "${majorVersion}.53";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 2ae0ad2b453b7953d1d9cd83f4c18acb25359460..735ab4e6e18e20e836113131e8b9c1026cb5d237 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -51,7 +51,7 @@ let
   inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-${version}";
+  pname = "gst-plugins-bad";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz";
     sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 87bbef227de86764ce7806c48ed44d36cf19a5a1..fb1d627d7b123c8bc02e7e6ab0fff75bc42045f7 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -14,7 +14,7 @@
 , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-${version}";
+  pname = "gst-plugins-base";
   version = "1.16.0";
 
   meta = with lib; {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz";
     sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index fa838d5ff7738653bf10b51d9ff716d10d2818bf..f0f01a977fd11cd6263698604768e446539e7bf7 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-${version}";
+  pname = "gstreamer";
   version = "1.16.0";
 
   meta = with lib ;{
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
+    url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz";
     sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 703fcb58898ab3df9b33ec6bb2a61463eeae27c5..810cee650ca89617566bd0811910fb862096c96a 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-${version}";
+  pname = "gstreamer-editing-services";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
+    url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz";
     sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 557e3caa72204b7f5e978f1529ff580f7c4e9f65..c801684b0659a45eeb2d867db8017f180dacc601 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -25,7 +25,7 @@ let
   inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-${version}";
+  pname = "gst-plugins-good";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz";
     sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 297c8ada884ee62b4c59f8df4c0845ee08acad93..1847b8d0c12be8c0a7912f3484b97b20f4b3e25c 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-${version}";
+  pname = "gst-libav";
   version = "1.16.0";
 
   meta = {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz";
     sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index c4620a29e9458b17e2129d6713a1508d69c56a27..5c571fa4a1e74ed1c0d85eb51ef6e545d77b405b 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-rtsp-server-${version}";
+  pname = "gst-rtsp-server";
   version = "1.16.0";
 
   meta = with stdenv.lib; {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz";
     sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 5c3a56814bad85f12a2ded24a29771aee28ea0f9..552ab1ec292188eaf99f6fd533819882941cb250 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-${version}";
+  pname = "gst-plugins-ugly";
   version = "1.16.0";
 
   meta = with lib; {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz";
     sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index c0541857e8b7acb8ce62ec5c31732b0d34b6e885..7e64636d96d30ca1d04a7497850f72b314914f53 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-vaapi-${version}";
+  pname = "gst-vaapi";
   version = "1.16.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 06d275078f30b9484c4c528baf5ee678dbc68581..ad013d1570e1a9242f8cd2cd3ec370c19d976a3e 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-${version}";
+  pname = "gst-validate";
   version = "1.16.0";
 
   meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
+    url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz";
     sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck";
   };
 
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 9ceb571983e2c067793cc7c81390b982b5dc70b8..5fecd45b7da1eb457fbe4b8d6d2a47655e099ead 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -2,7 +2,7 @@
 , static ? false }:
 
 stdenv.mkDerivation rec {
-  name = "gtest-${version}";
+  pname = "gtest";
   version = "1.8.1";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 94b745794f1e21f8bb3d4492371d0bf4d495306e..40be17fcac7cf8a66470c2218d77ac41b16ab948 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
     "-Dtests=false"
   ];
 
+  # These are the defines that'd you'd get with --enable-debug=minimum (default).
+  # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
+  NIX_CFLAGS_COMPILE = [
+    "-DG_ENABLE_DEBUG"
+    "-DG_DISABLE_CAST_CHECKS"
+  ];
+
   postPatch = ''
     files=(
       build-aux/meson/post-install.py
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index 7f35f088da2b0efecf6717e652814515bba2ef1d..1e3b7d45eddab6e4a5eb1cf1482efbcc0b50c4a7 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-sharp-beans-${version}";
+  pname = "gtk-sharp-beans";
   version = "2.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 659dc14800e12d30ab66505e4685d88134c6087c..615ea66f4d991c761fe7331a3fb36b931a0cae10 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -23,7 +23,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-sharp-${version}";
+  pname = "gtk-sharp";
   version = "2.12.45";
 
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index c2f05b51a65e0ab33880ce29811ea5a9d66ae4f6..d26cc9692596d205d79ba80641f26e25e91aebdf 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (gst_all_1) gstreamer gst-plugins-base;
 in stdenv.mkDerivation rec {
-  name = "gtkd-${version}";
+  pname = "gtkd";
   version = "3.8.5";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 9d1751afaf9199a62dfb2d327ef1daa049ce93d1..1b35221f066b48b9f02d2cc7b280701e826183cd 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -2,11 +2,11 @@
 , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
+  pname = "gtksourceview";
   version = "3.24.11";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9";
   };
 
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 553e9fd9cbb6c92ee609867c825c27f069d957d8..fde94e79f0563980f6b4fce5a0d83b95440f01c2 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -2,11 +2,11 @@
 , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
+  pname = "gtksourceview";
   version = "4.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4";
   };
 
diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix
index 455cc4d4b81eb17176c6a3bd1b0f11d4a4576a71..1b66bfd031fc63b1c1a7b9c42a0ce75a09df794d 100644
--- a/pkgs/development/libraries/gtksourceviewmm/default.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gtksourceviewmm-${version}";
+  pname = "gtksourceviewmm";
   version = "3.21.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
   };
 
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index f0baecb199043710e485cab7f39c3c61a843f54c..54b4b001d81776a74f6e3fa5abcda1e88f734430 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
 
 stdenv.mkDerivation rec {
-  name = "gtkspell-${version}";
+  pname = "gtkspell";
   version = "3.0.10";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index cb141f8c55691c069bed60b564ca320ad3dda408..97f1a12c1785cb732382a99b4863b05ff39b0e38 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -4,12 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gtkspellmm-${version}";
+  pname = "gtkspellmm";
   version = "3.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
-          "${name}.tar.xz";
+          "${pname}-${version}.tar.xz";
     sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv";
   };
 
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index d0da7f8cef6108775d32ab56a120b4a4cc6d93cf..9cc079d61030402db46bbdfb54d8f8e6f454d95a 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -2,11 +2,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "gts-${version}";
+  pname = "gts";
   version = "0.7.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gts/${name}.tar.gz";
+    url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz";
     sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705";
   };
 
diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix
index 17ca323a5fef3e5f85a6af83eb2667932a85ec8b..2db8c1e67398ede13a7dcc3ba2da1f68ca39da44 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/pkgs/development/libraries/gumbo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "gumbo-${version}";
+  pname = "gumbo";
   version = "0.10.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 78a2d365033ea2ff31788e8b8e9cd6f13c62c5e7..2f39b03898d118c99bcb9617ad7c4a9da40f9cc6 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -3,7 +3,7 @@
 , glib, systemd, libusb1, vala, hwdata
 }:
 stdenv.mkDerivation rec {
-  name = "gusb-${version}";
+  pname = "gusb";
   version = "0.3.0";
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix
index d235c6cb08690937201be1da3c27f5b4ae09fe4a..063d416a8fc54e80847f31b73c64e8a9af1203f5 100644
--- a/pkgs/development/libraries/half/default.nix
+++ b/pkgs/development/libraries/half/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.12.0";
-  name = "half-${version}";
+  pname = "half";
 
   src = fetchzip {
     url = "mirror://sourceforge/half/${version}/half-${version}.zip";
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index b9cd31432fc3fa29eae18a631e0c40b45c9616b3..000af7fd74e45ecea887c5f842de4edcc7480899 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -4,10 +4,9 @@
 stdenv.mkDerivation rec {
   pname = "hamlib";
   version = "3.3";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9";
   };
 
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index a5f8f00a6bfd06ef3672cf3b2114eb7827dd7529..ec86db036e98fef945f545966f47f2f2866b2af3 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.0";
-  name = "herqq-${version}";
+  pname = "herqq";
 
   nativeBuildInputs = [ qt5.qmake ];
   buildInputs = [ qt5.qtbase unzip qtmultimedia ];
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 13f7c4219069c7d5564d86f003250c2745fc259c..6dc3871e1c184d96170ecca4821d8b4bdbbf4fec 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "hiredis-${version}";
+  pname = "hiredis";
   version = "0.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 37f01372005c0b780095275bb4a41ab9d54b3461..ca547faa2abb0d5059bedeb743bd523639cb35fe 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -2,11 +2,11 @@
 , perlPackages, libxml2, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "hivex-${version}";
+  pname = "hivex";
   version = "1.3.18";
 
   src = fetchurl {
-    url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
+    url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz";
     sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la";
   };
 
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 99777bbd6f0f311f23ea35962da57b3843730903..a3a8c7baa0920c269098a0cc69a7829d0446b1f6 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "hpx-${version}";
+  pname = "hpx";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index 1537f9cc480b20872fabf0964bd8abfc97a224de..f0968c47822cef34c0d1ab4159fa3721345aff98 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "htmlcxx-${version}";
+  pname = "htmlcxx";
   version = "0.86";
 
   src = fetchurl {
-    url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";
     sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
   };
 
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 68bf4ebec3476d9f07f8e7881349577bc76769be..76173bc5b998846316963b10398aef6d820fe145 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -3,7 +3,8 @@
 let
   version = "2.9.2";
 in stdenv.mkDerivation {
-  name = "http-parser-${version}";
+  pname = "http-parser";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "nodejs";
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 18e32585ce2abaa03e618dddb46d5afdc1c3e1d6..a8dcea0059a253cf9ab4f6e308ee01f9ef964cd2 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
-  name = "hunspell-${version}";
+  pname = "hunspell";
 
   src = fetchurl {
     url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
index d4ebb5534d9c900c7ded6de8c4e3c962716ab3e3..3d00d20f170044fc8a39823a733d6e1a8291b2df 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "idnkit-${version}";
+  pname = "idnkit";
   version = "2.3";
 
   src = fetchurl {
-    url = "https://jprs.co.jp/idn/${name}.tar.bz2";
+    url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2";
     sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16";
   };
 
diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix
index 867ce024d2fec25e35046bb38186d1f3ad95a9e9..297365be87497f216c39b186db25a7c8654d7d17 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/pkgs/development/libraries/ignition-math/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.6.0";
 in
 stdenv.mkDerivation rec {
-  name = "ign-math2-${version}";
+  pname = "ign-math2";
+  inherit version;
 
   src = fetchurl {
     url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 8abff4c5f0592170a2bd3e27bb3a372792d20c8e..31b9a4b0e9f7ac1f6867ebbba8fb0848047e9cd5 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ign-transport-${version}";
+  pname = "ign-transport";
+  inherit version;
   inherit src;
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
index b97f62dcf25c92317e6b8cbe9136868aea85d329..6330347cd275880e814bd61093ea9488263187d2 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "iksemel-${version}";
+  pname = "iksemel";
   version = "1.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 2d22788e1ecddde7b4ea66285af371db7cb138d5..5cc0f7c1f46d0f537fdb1d5c4a0893294c051142 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
 
 stdenv.mkDerivation rec {
-  name = "ilmbase-${version}";
+  pname = "ilmbase";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
   };
 
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index b55d13ecc3f4cb339b93bc373aa1cb847908e0a6..5ad3e249fc3219007bc568025c9c0df118407fe8 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -1,6 +1,6 @@
 {stdenv, autoreconfHook, fetchurl, gmp, openblas}:
 stdenv.mkDerivation rec {
-  name = "iml-${version}";
+  pname = "iml";
   version = "1.0.5";
   src = fetchurl {
     url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index a4a009c66580be34c841231e6a2a6a85f66e38ff..2beff09d0b4e5afed67b177836201c23745b55c0 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, tcl}:
 
 stdenv.mkDerivation rec {
-  name = "incrtcl-${version}";
+  pname = "incrtcl";
   version = "4.0.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix
index 36b637c62bb2f22a59dea38c381c3bc436d520e9..f97f8b7d82d5d50d83ec9a576ea583e40541659b 100644
--- a/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/pkgs/development/libraries/indicator-application/gtk2.nix
@@ -6,7 +6,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "indicator-application-gtk2-${version}";
+  pname = "indicator-application-gtk2";
   version = "12.10.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 8beda8663c5ca4ceb9be01358edcbc5415f64455..51c6728e8b00529fa1582bacac0443f1fde01aa0 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "iniparser-${version}";
+  pname = "iniparser";
   version = "4.1";
 
   src = fetchFromGitHub {
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include
     cp src/*.h $out/include
 
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
     for i in AUTHORS INSTALL LICENSE README.md; do
-      bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
+      bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2;
     done;
-    cp -r html $out/share/doc/${name}
+    cp -r html $out/share/doc/${pname}-${version}
 
     cp libiniparser.a $out/lib
     cp libiniparser.so.1 $out/lib
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 1212d3817d4c3e3eb7e31150c7941f54ed5dc1a5..53b89f17ea5ca2e268e660f6cfa7c5c5277091fd 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gmmlib-${version}";
+  pname = "intel-gmmlib";
   version = "19.2.3";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
-    rev    = name;
+    rev    = "${pname}-${version}";
     sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb";
   };
 
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index e549067b11f08bf98c0f90aec8f4dd347fbc04f9..e3dbfa52db2276e89ffcf0cac0bfe6a3107d70fa 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-media-driver-${version}";
+  pname = "intel-media-driver";
   version = "19.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 274058b7ec992bb0707112457ebb0e117c609b51..67bee86bfa935fa3379fb4d695ae491b52329195 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-media-sdk-${version}";
+  pname = "intel-media-sdk";
   version = "19.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index a48908f41dd47e472084356519fc708173e76e51..50ae63f2d0d64479d8db8ea32c7faa7d797a35d3 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "ip2location-c-${version}";
+  pname = "ip2location-c";
   version = "7.0.2"; # meta.homepage might change after a major update
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index d28ae012e574752746e43fdbea35e90dcc6b17ff..35ef14cbc1352138d4b2b78fe176217e5a095362 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -2,11 +2,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "irrlicht-${version}";
+  pname = "irrlicht";
   version = "1.8.4";
 
   src = fetchzip {
-    url = "mirror://sourceforge/irrlicht/${name}.zip";
+    url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
     sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
   };
 
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 43ab20da8ae0be09280b0ac712826bb91aca1608..599e8dcc5975bb107fd22d0646359a7ecab07844 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gettext, python3}:
 
 stdenv.mkDerivation rec {
-  name = "iso-codes-${version}";
+  pname = "iso-codes";
   version = "3.79";
 
   src = fetchurl {
-    url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz";
+    url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz";
     sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb";
   };
 
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 29fabdbb3b63a2783d5f9c2717ddbdd5eb97d265..26ec06fad7bfef444060d862b58cd98c0dd9ba9d 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, tnt}:
 
 stdenv.mkDerivation rec {
-  name = "jama-${version}";
+  pname = "jama";
   version = "1.2.5";
 
   src = fetchurl {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ tnt ];
 
   unpackPhase = ''
-      mkdir "${name}"
+      mkdir "${pname}-${version}"
       unzip "$src"
   '';
   installPhase = ''
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 946bc17e7643215264c2b44de73dd077422fd391..1bad3394b6acc34c6a01b3d08062521a9b34fd54 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "jasper-${version}";
+  pname = "jasper";
   version = "2.0.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
index 8d9b4e54fe8d99aae8bdc8291f20175252f35595..4a2b030a3dbf28e44d7cb614f437832099c4d39d 100644
--- a/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2";
-  name    = "commons-bcel-${version}";
+  pname = "commons-bcel";
 
   src = fetchurl {
     url    = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index 3c729f42320a0a746796cd2e597184ccf02210c5..d418145e1b5fd8ad146d25a7f820b497704f30f5 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.18";
-  name    = "commons-compress-${version}";
+  pname = "commons-compress";
 
   src = fetchurl {
-    url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
+    url    = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1";
   };
 
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix
index 6fddc3cfe0c3c0c8192cf997e38e5c5db114b866..0aca6bf8baaabeb5cbaa2f66eb31ca2832c18c88 100644
--- a/pkgs/development/libraries/java/commons/fileupload/default.nix
+++ b/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
-  name    = "commons-fileupload-${version}";
+  pname = "commons-fileupload";
 
   src = fetchurl {
-    url    = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz";
+    url    = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72";
   };
   installPhase = ''
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index 03b083328da42b0af3a31fba692676cf9d38ee63..c545ad68e72754930c0bd98ab8cf6bf680fc455f 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6";
-  name    = "commons-io-${version}";
+  pname = "commons-io";
 
   src = fetchurl {
-    url    = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
+    url    = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
   };
 
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
index 322cb486e93ea30764225cae0f90690b9c301daa..675265ed4e32d21dac280143d29aca4a7071ae56 100644
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.9";
-  name    = "commons-lang-${version}";
+  pname = "commons-lang";
 
   src = fetchurl {
     url    = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
index 10c39f037890125e19178efccc5fd149f223a136..7c4fc5c632e2f5bfbaa2e6ae6858d31bb74cabce 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.6.1";
-  name    = "commons-math-${version}";
+  pname = "commons-math";
 
   src = fetchurl {
     url    = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix
index de031a08fe8c19b1820864742ffc468160c2549a..e485eabe1cbf21456e89cfb770c264c73e5897ca 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/pkgs/development/libraries/java/cup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jdk, ant } :
 
 stdenv.mkDerivation rec {
-  name = "java-cup-${version}";
+  pname = "java-cup";
   version = "11b-20160615";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 7d1fac39b1cb9081bebdf42d75fd7b0bf75da5e8..68e2a7377919d5f5c6ede43a5f213fbd0ef5dd94 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv, ant, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "hydra-ant-logger-${version}";
+  pname = "hydra-ant-logger";
   version = "2010.2";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 402f893034b6e017f4623b6a186cac7fd0aa771a..e25106e22c6cd71be17b91e13a24b653c9872f5f 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "jzmq-${version}";
+  pname = "jzmq";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 691b9905b04f60f8f1038c7fb206cf444f75d197..c0eabe51657d9f21721a0be20ed1fc34f4137bc3 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation rec {
-  name = "lucene-${version}";
+  pname = "lucene";
   version = "1.4.3";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz";
+    url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz";
     sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 544f0f4c4e9119b8250c680aed527281db3ad1d4..0fdce1bceed0ae7694e11c330d23cf45d4341616 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -10,7 +10,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "rhino-${version}";
+  pname = "rhino";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/js/rhino1_7R2.zip";
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index c2acd2348938a5ddb7f17270c7e0100f55653769..591de48d3195466e5095c18d649e933d0fb8b3f8 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -21,7 +21,7 @@ let
 in stdenv.mkDerivation rec {
   version = "4.5";
   fullVersion = "${version}-201506032000";
-  name = "swt-${version}";
+  pname = "swt";
 
   hardeningDisable = [ "format" ];
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   # releases of SWT.  So we just grab a binary release and extract
   # "src.zip" from that.
   src = fetchurl {
-    url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip";
+    url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
     sha256 = metadata.sha256;
   };
 
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index c14ac7c65abd76a8e4132ff5e58e8c22b0ade71b..c41455a6544157b3b40cfdee19e6e9bc9479b1f1 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -12,11 +12,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "jemalloc-${version}";
+  pname = "jemalloc";
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index 175097ef78550d3c12b29cbbfb14359c832b46a1..726e00b58bbae36b043a806e961885a97a67c559 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "jitterentropy-${version}";
+  pname = "jitterentropy";
   version = "2.1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index fa2b45ae948e1f7459b44c1ae9baaa67bff5b88c..c62f1e2de3f3a6623b6ccb216e56d7f48302c205 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9";
+    sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj";
   };
 
   /* During darwin bootstrap, we have a cp that doesn't understand the
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
index 47c87da065bad20b1149efcc305c6ebee0a01586..bc5be3172ec8eb73c98bbd3b0bec7d284004858e 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "jxrlib";
   version = "1.1";
 
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 0cd8ab5035660e9a0fe7b0dd69ef074b86508c1c..4a403a19964e93ecc431f7c4e78bcb138a37abb2 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -7,10 +7,9 @@
 mkDerivation rec {
   pname = "kdb";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg";
   };
 
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 7745d78f8fcae4f5d5b5f48984b824bc6513ec55..e8a7aa7322f3ef3e69622454c0c9ecab3289be73 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -77,7 +77,7 @@ let
               license = with lib.licenses; [
                 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
               ];
-              maintainers = [ lib.maintainers.ttuegel ];
+              maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
               platforms = lib.platforms.linux;
             } // (args.meta or {});
 
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index afab8a4e9a433015e7b944cd6cd76d24c627fbe7..096376ca67122a63b845fd48b3a3a82b3ae392e1 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.61/ )
diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
index b7dcfb7fe64cdeaea1e18d4bbc7f54a0187d4663..9f682b44975298e4be580999706ed126041530d8 100644
--- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
@@ -8,4 +8,7 @@ mkDerivation {
   buildInputs = [ kconfig kcoreaddons kio kparts ];
   propagatedBuildInputs = [ qtwebkit ];
   outputs = [ "out" "dev" ];
+  cmakeFlags = [
+    "-DBUILD_DESIGNERPLUGIN=OFF"
+  ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
index 75e632d4129212da31f9cfab64167ace9df2fd30..89145e3e1ddedc5f6ce79e83b6d06dbb9dbecb5c 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
@@ -2,15 +2,13 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
 ===================================================================
 --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
 +++ kinit-5.32.0/src/kdeinit/kinit.cpp
-@@ -96,11 +96,9 @@ static const char *extra_libs[] = {
+@@ -96,9 +96,9 @@ static const char *extra_libs[] = {
      "libKF5Parts.5.dylib",
      "libKF5Plasma.5.dylib"
  #else
 -    "libKF5KIOCore.so.5",
 -    "libKF5Parts.so.5",
--//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see.
 -    "libKF5Plasma.so.5"
--//#endif
 +    NIXPKGS_KF5_KIOCORE,
 +    NIXPKGS_KF5_PARTS,
 +    NIXPKGS_KF5_PLASMA
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index ee19b39bd15945c31ece51bf07f18b78f09de024..c19836ed7a7271c1be28fb0e565528fa7e3ffc58 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, propagateBin,
   extra-cmake-modules,
-  qtbase, wayland
+  qtbase, wayland, wayland-protocols
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ wayland ];
+  buildInputs = [ wayland wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
   setupHook = propagateBin; # XDG_CONFIG_DIRS
 }
diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
index 147c4123a105ef63615e909f566b382327477322..1484b2d048917b45967761c25f8dc430c48686da 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib, extra-cmake-modules, qtbase
-, qtdeclarative, kconfig, kcoreaddons, ki18n, kio
+, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
 }:
 
 mkDerivation {
@@ -9,6 +9,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     qtbase qtdeclarative kconfig kcoreaddons 
-    ki18n kio
+    ki18n kio kirigami2
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 17473db9eebd775361bc6a439d8eed4b2e340254..549f99a558865f2dfd429d4993744061c8323af3 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,635 +3,635 @@
 
 {
   attica = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz";
-      sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a";
-      name = "attica-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/attica-5.61.0.tar.xz";
+      sha256 = "9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde";
+      name = "attica-5.61.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz";
-      sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227";
-      name = "baloo-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/baloo-5.61.0.tar.xz";
+      sha256 = "dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1";
+      name = "baloo-5.61.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz";
-      sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0";
-      name = "bluez-qt-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz";
+      sha256 = "0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27";
+      name = "bluez-qt-5.61.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz";
-      sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491";
-      name = "breeze-icons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/breeze-icons-5.61.0.tar.xz";
+      sha256 = "1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30";
+      name = "breeze-icons-5.61.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz";
-      sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7";
-      name = "extra-cmake-modules-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/extra-cmake-modules-5.61.0.tar.xz";
+      sha256 = "a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c";
+      name = "extra-cmake-modules-5.61.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.58.1";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz";
-      sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274";
-      name = "frameworkintegration-5.58.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/frameworkintegration-5.61.0.tar.xz";
+      sha256 = "a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb";
+      name = "frameworkintegration-5.61.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz";
-      sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b";
-      name = "kactivities-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kactivities-5.61.0.tar.xz";
+      sha256 = "0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5";
+      name = "kactivities-5.61.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz";
-      sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611";
-      name = "kactivities-stats-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kactivities-stats-5.61.0.tar.xz";
+      sha256 = "9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068";
+      name = "kactivities-stats-5.61.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz";
-      sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165";
-      name = "kapidox-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kapidox-5.61.0.tar.xz";
+      sha256 = "3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f";
+      name = "kapidox-5.61.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz";
-      sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad";
-      name = "karchive-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/karchive-5.61.0.tar.xz";
+      sha256 = "457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387";
+      name = "karchive-5.61.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz";
-      sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f";
-      name = "kauth-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kauth-5.61.0.tar.xz";
+      sha256 = "b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1";
+      name = "kauth-5.61.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz";
-      sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02";
-      name = "kbookmarks-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kbookmarks-5.61.0.tar.xz";
+      sha256 = "24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377";
+      name = "kbookmarks-5.61.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz";
-      sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d";
-      name = "kcmutils-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcmutils-5.61.0.tar.xz";
+      sha256 = "b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7";
+      name = "kcmutils-5.61.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz";
-      sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef";
-      name = "kcodecs-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcodecs-5.61.0.tar.xz";
+      sha256 = "4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee";
+      name = "kcodecs-5.61.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz";
-      sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd";
-      name = "kcompletion-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcompletion-5.61.0.tar.xz";
+      sha256 = "68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec";
+      name = "kcompletion-5.61.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz";
-      sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e";
-      name = "kconfig-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kconfig-5.61.0.tar.xz";
+      sha256 = "94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372";
+      name = "kconfig-5.61.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz";
-      sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0";
-      name = "kconfigwidgets-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kconfigwidgets-5.61.0.tar.xz";
+      sha256 = "4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165";
+      name = "kconfigwidgets-5.61.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz";
-      sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e";
-      name = "kcoreaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcoreaddons-5.61.0.tar.xz";
+      sha256 = "6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813";
+      name = "kcoreaddons-5.61.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz";
-      sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44";
-      name = "kcrash-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kcrash-5.61.0.tar.xz";
+      sha256 = "83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8";
+      name = "kcrash-5.61.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz";
-      sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1";
-      name = "kdbusaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdbusaddons-5.61.0.tar.xz";
+      sha256 = "f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d";
+      name = "kdbusaddons-5.61.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz";
-      sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec";
-      name = "kdeclarative-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdeclarative-5.61.0.tar.xz";
+      sha256 = "464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa";
+      name = "kdeclarative-5.61.0.tar.xz";
     };
   };
   kded = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz";
-      sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1";
-      name = "kded-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kded-5.61.0.tar.xz";
+      sha256 = "ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc";
+      name = "kded-5.61.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz";
-      sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a";
-      name = "kdelibs4support-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kdelibs4support-5.61.0.tar.xz";
+      sha256 = "ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c";
+      name = "kdelibs4support-5.61.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz";
-      sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b";
-      name = "kdesignerplugin-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdesignerplugin-5.61.0.tar.xz";
+      sha256 = "6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33";
+      name = "kdesignerplugin-5.61.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz";
-      sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b";
-      name = "kdesu-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdesu-5.61.0.tar.xz";
+      sha256 = "398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888";
+      name = "kdesu-5.61.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz";
-      sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc";
-      name = "kdewebkit-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kdewebkit-5.61.0.tar.xz";
+      sha256 = "1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211";
+      name = "kdewebkit-5.61.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz";
-      sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05";
-      name = "kdnssd-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdnssd-5.61.0.tar.xz";
+      sha256 = "02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d";
+      name = "kdnssd-5.61.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz";
-      sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4";
-      name = "kdoctools-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kdoctools-5.61.0.tar.xz";
+      sha256 = "e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f";
+      name = "kdoctools-5.61.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz";
-      sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd";
-      name = "kemoticons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kemoticons-5.61.0.tar.xz";
+      sha256 = "cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380";
+      name = "kemoticons-5.61.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz";
-      sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c";
-      name = "kfilemetadata-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kfilemetadata-5.61.0.tar.xz";
+      sha256 = "15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e";
+      name = "kfilemetadata-5.61.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz";
-      sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf";
-      name = "kglobalaccel-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kglobalaccel-5.61.0.tar.xz";
+      sha256 = "ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e";
+      name = "kglobalaccel-5.61.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz";
-      sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3";
-      name = "kguiaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kguiaddons-5.61.0.tar.xz";
+      sha256 = "40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520";
+      name = "kguiaddons-5.61.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz";
-      sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef";
-      name = "kholidays-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kholidays-5.61.0.tar.xz";
+      sha256 = "ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1";
+      name = "kholidays-5.61.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz";
-      sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff";
-      name = "khtml-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/khtml-5.61.0.tar.xz";
+      sha256 = "5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b";
+      name = "khtml-5.61.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz";
-      sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977";
-      name = "ki18n-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/ki18n-5.61.0.tar.xz";
+      sha256 = "d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9";
+      name = "ki18n-5.61.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz";
-      sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480";
-      name = "kiconthemes-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kiconthemes-5.61.0.tar.xz";
+      sha256 = "341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7";
+      name = "kiconthemes-5.61.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz";
-      sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90";
-      name = "kidletime-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kidletime-5.61.0.tar.xz";
+      sha256 = "8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2";
+      name = "kidletime-5.61.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz";
-      sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9";
-      name = "kimageformats-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kimageformats-5.61.0.tar.xz";
+      sha256 = "5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207";
+      name = "kimageformats-5.61.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz";
-      sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53";
-      name = "kinit-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kinit-5.61.0.tar.xz";
+      sha256 = "1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f";
+      name = "kinit-5.61.0.tar.xz";
     };
   };
   kio = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz";
-      sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069";
-      name = "kio-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kio-5.61.0.tar.xz";
+      sha256 = "1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e";
+      name = "kio-5.61.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz";
-      sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3";
-      name = "kirigami2-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kirigami2-5.61.0.tar.xz";
+      sha256 = "afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30";
+      name = "kirigami2-5.61.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz";
-      sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491";
-      name = "kitemmodels-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kitemmodels-5.61.0.tar.xz";
+      sha256 = "47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68";
+      name = "kitemmodels-5.61.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz";
-      sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6";
-      name = "kitemviews-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kitemviews-5.61.0.tar.xz";
+      sha256 = "0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da";
+      name = "kitemviews-5.61.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz";
-      sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133";
-      name = "kjobwidgets-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kjobwidgets-5.61.0.tar.xz";
+      sha256 = "5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378";
+      name = "kjobwidgets-5.61.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz";
-      sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c";
-      name = "kjs-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kjs-5.61.0.tar.xz";
+      sha256 = "968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17";
+      name = "kjs-5.61.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz";
-      sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d";
-      name = "kjsembed-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kjsembed-5.61.0.tar.xz";
+      sha256 = "d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44";
+      name = "kjsembed-5.61.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz";
-      sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea";
-      name = "kmediaplayer-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kmediaplayer-5.61.0.tar.xz";
+      sha256 = "ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181";
+      name = "kmediaplayer-5.61.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz";
-      sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd";
-      name = "knewstuff-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/knewstuff-5.61.0.tar.xz";
+      sha256 = "87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b";
+      name = "knewstuff-5.61.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz";
-      sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469";
-      name = "knotifications-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/knotifications-5.61.0.tar.xz";
+      sha256 = "f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac";
+      name = "knotifications-5.61.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz";
-      sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01";
-      name = "knotifyconfig-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/knotifyconfig-5.61.0.tar.xz";
+      sha256 = "bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee";
+      name = "knotifyconfig-5.61.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz";
-      sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90";
-      name = "kpackage-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kpackage-5.61.0.tar.xz";
+      sha256 = "8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f";
+      name = "kpackage-5.61.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz";
-      sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4";
-      name = "kparts-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kparts-5.61.0.tar.xz";
+      sha256 = "f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436";
+      name = "kparts-5.61.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz";
-      sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32";
-      name = "kpeople-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kpeople-5.61.0.tar.xz";
+      sha256 = "549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298";
+      name = "kpeople-5.61.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz";
-      sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b";
-      name = "kplotting-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kplotting-5.61.0.tar.xz";
+      sha256 = "95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba";
+      name = "kplotting-5.61.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz";
-      sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017";
-      name = "kpty-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kpty-5.61.0.tar.xz";
+      sha256 = "b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c";
+      name = "kpty-5.61.0.tar.xz";
     };
   };
   kross = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz";
-      sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872";
-      name = "kross-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/portingAids/kross-5.61.0.tar.xz";
+      sha256 = "103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e";
+      name = "kross-5.61.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz";
-      sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c";
-      name = "krunner-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/krunner-5.61.0.tar.xz";
+      sha256 = "f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be";
+      name = "krunner-5.61.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz";
-      sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395";
-      name = "kservice-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kservice-5.61.0.tar.xz";
+      sha256 = "4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9";
+      name = "kservice-5.61.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz";
-      sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e";
-      name = "ktexteditor-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/ktexteditor-5.61.0.tar.xz";
+      sha256 = "ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb";
+      name = "ktexteditor-5.61.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz";
-      sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7";
-      name = "ktextwidgets-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/ktextwidgets-5.61.0.tar.xz";
+      sha256 = "a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a";
+      name = "ktextwidgets-5.61.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz";
-      sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa";
-      name = "kunitconversion-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kunitconversion-5.61.0.tar.xz";
+      sha256 = "e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24";
+      name = "kunitconversion-5.61.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz";
-      sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030";
-      name = "kwallet-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwallet-5.61.0.tar.xz";
+      sha256 = "628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8";
+      name = "kwallet-5.61.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz";
-      sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1";
-      name = "kwayland-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwayland-5.61.0.tar.xz";
+      sha256 = "42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07";
+      name = "kwayland-5.61.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz";
-      sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0";
-      name = "kwidgetsaddons-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwidgetsaddons-5.61.0.tar.xz";
+      sha256 = "5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891";
+      name = "kwidgetsaddons-5.61.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz";
-      sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129";
-      name = "kwindowsystem-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kwindowsystem-5.61.0.tar.xz";
+      sha256 = "17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984";
+      name = "kwindowsystem-5.61.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz";
-      sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f";
-      name = "kxmlgui-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kxmlgui-5.61.0.tar.xz";
+      sha256 = "867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b";
+      name = "kxmlgui-5.61.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz";
-      sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3";
-      name = "kxmlrpcclient-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/kxmlrpcclient-5.61.0.tar.xz";
+      sha256 = "382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a";
+      name = "kxmlrpcclient-5.61.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz";
-      sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb";
-      name = "modemmanager-qt-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/modemmanager-qt-5.61.0.tar.xz";
+      sha256 = "c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a";
+      name = "modemmanager-qt-5.61.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz";
-      sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe";
-      name = "networkmanager-qt-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/networkmanager-qt-5.61.0.tar.xz";
+      sha256 = "1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3";
+      name = "networkmanager-qt-5.61.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz";
-      sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7";
-      name = "oxygen-icons5-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/oxygen-icons5-5.61.0.tar.xz";
+      sha256 = "1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26";
+      name = "oxygen-icons5-5.61.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz";
-      sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad";
-      name = "plasma-framework-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/plasma-framework-5.61.0.tar.xz";
+      sha256 = "873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe";
+      name = "plasma-framework-5.61.0.tar.xz";
     };
   };
   prison = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz";
-      sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d";
-      name = "prison-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/prison-5.61.0.tar.xz";
+      sha256 = "9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab";
+      name = "prison-5.61.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz";
-      sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df";
-      name = "purpose-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/purpose-5.61.0.tar.xz";
+      sha256 = "810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08";
+      name = "purpose-5.61.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz";
-      sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3";
-      name = "qqc2-desktop-style-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/qqc2-desktop-style-5.61.0.tar.xz";
+      sha256 = "26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4";
+      name = "qqc2-desktop-style-5.61.0.tar.xz";
     };
   };
   solid = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz";
-      sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00";
-      name = "solid-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/solid-5.61.0.tar.xz";
+      sha256 = "c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf";
+      name = "solid-5.61.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz";
-      sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823";
-      name = "sonnet-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/sonnet-5.61.0.tar.xz";
+      sha256 = "4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29";
+      name = "sonnet-5.61.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz";
-      sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643";
-      name = "syndication-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/syndication-5.61.0.tar.xz";
+      sha256 = "2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576";
+      name = "syndication-5.61.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz";
-      sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76";
-      name = "syntax-highlighting-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/syntax-highlighting-5.61.0.tar.xz";
+      sha256 = "475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721";
+      name = "syntax-highlighting-5.61.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.58.0";
+    version = "5.61.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz";
-      sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d";
-      name = "threadweaver-5.58.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.61/threadweaver-5.61.0.tar.xz";
+      sha256 = "e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843";
+      name = "threadweaver-5.61.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index d2283f5c1d578a6d554055a7d2db8c8e1d92e03e..2eb9262d189e62973880fd9eff7af4c37d90fbc4 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -6,7 +6,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "heimdal-${version}";
+  pname = "heimdal";
   version = "7.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index abbb2457f6aecb012aaba846c80d75fc446d52d9..0a130c017c0928077d108e49f4b02a6a36ac804f 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -5,11 +5,11 @@
 let
   inherit (python2Packages) python pygtk;
 in stdenv.mkDerivation rec {
-  name = "keybinder-${version}";
+  pname = "keybinder";
   version = "0.3.0";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
     sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
   };
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 91ad59ad27a03b12a8c683bd7102b1284ef5b7a0..ed2dd341f45e660b297e174d62ad99882bd4a272 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "keybinder3-${version}";
+  pname = "keybinder3";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index d3733ea5f720085da140ab9e8f76949220b3604b..3f84706bffb3b8890a55aa0418fb9992fb5301e3 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "kmsxx";
   version = "2018-10-23";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "tomba";
diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
index c49402b74e86d9c00f4ca40088c7c7ccb549bb09..991fd4d27a74b2fa13e25ea0f878707ac27e0254 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -8,10 +8,9 @@
 mkDerivation rec {
   pname = "kproperty";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7";
   };
 
diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index fc9c77e8fd614e038dd3fefb576d3ab764776716..46d55b1f550d3a7a61b4f87cd1e7cb5cc65919ec 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -7,10 +7,9 @@
 mkDerivation rec {
   pname = "kreport";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
     sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92";
   };
 
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 2f713cb59775b682ff17511890f309df209d077e..933d51b9575cadd0ef0d970215c6d7e07ac9b066 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -22,11 +22,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lame-${version}";
+  pname = "lame";
   version = "3.100";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lame/${name}.tar.gz";
+    url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz";
     sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx";
   };
 
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index e93467fba0a23de3e2b9ef933cb9d38e0ebd255f..f401f231de2eccecc972bd1854f0c3ad32a3e6ff 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "lasso-${version}";
+  pname = "lasso";
   version = "2.6.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix
index 839f0a75156b1530534e2477296af006780ec57e..ae8fc1e22dbcdc3d221057709a1d07faca26b61d 100644
--- a/pkgs/development/libraries/ldacbt/default.nix
+++ b/pkgs/development/libraries/ldacbt/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldacBT-${version}";
+  pname = "ldacBT";
   version = "2.0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 82496a54aea779b6c999505f8ac2910a3f879c60..1aa208c2044fe90c64ded5c430979298f96b678b 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   pname = "ldns";
   version = "1.7.0";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
+    url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz";
     sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1";
   };
 
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a085899d6e2b09144e5de186a8c28205b8f4388c..f91612caca1f8e1b456fbaf2e9d1573dda6a6fe5 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
 
 stdenv.mkDerivation rec {
-  name = "leatherman-${version}";
+  pname = "leatherman";
   version = "1.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index f4018cbf9614cf3aba8c60c055b5550dba29368a..6137638222eff661ce8ca9c35e4cc26e660d9902 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.95";
-  name = "lensfun-${version}";
+  pname = "lensfun";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz";
     sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
   };
 
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index dd3c42e8b7f51e05880e8b59e57c9e8d529c7f51..62c01e4f3560e8374286840576024908df3f9104 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "leptonica-${version}";
+  pname = "leptonica";
   version = "1.78.0";
 
   src = fetchurl {
-    url = "http://www.leptonica.org/source/${name}.tar.gz";
+    url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
     sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2";
   };
 
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index b18af4cf8344c2eb4017e533fab3643fc4171b95..17a754a027abd5c86c6b51a401e9eb6107f3151b 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "leveldb-${version}";
+  pname = "leveldb";
   version = "1.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 0d67c6b4dcb2e76a880d07848746339e0957af15..bda7d560fcde21342bdf1b0c5501077f5f5cd97e 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -8,11 +8,11 @@
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
-  name = "libaacs-${version}";
+  pname = "libaacs";
   version  = "0.9.0";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27";
   };
 
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 6df7bc22772feb65ffa868fa0f18461c9281e812..11b31d62b5d611aea44ef12ff145419d166d2c0c 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.6";
-  name = "libaal-${version}";
+  pname = "libaal";
 
   src = fetchurl {
-    url = "mirror://sourceforge/reiser4/${name}.tar.gz";
+    url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz";
     sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di";
   };
 
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
index aa4a40cf32ddc75fd9784beb27346a7edc002521..f953c170ab50de28323829d1f2520a2ed0bbf86d 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libabw-${version}";
+  pname = "libabw";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz";
     sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb";
   };
 
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 525ec6e35f609662d84d992ad12911fc33cc1de7..7f9dbf3a21fcacb3ff5993a21645fd736f7529de 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -2,7 +2,7 @@
 , libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "libaccounts-glib-${version}";
+  pname = "libaccounts-glib";
   version = "1.24";
 
   outputs = [ "out" "dev" "devdoc" "py" ];
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 49e5bcdd9058e74e3c09b752048c20adc867283f..a8ddab2978d134eedc4c1b4a09b6823a3dc5d7fa 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -5,7 +5,7 @@
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
 stdenv.mkDerivation rec {
-  name = "libagar-${version}";
+  pname = "libagar";
   inherit (srcs) version src;
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix
index c1e9ba7d1c73113904cdff9426a8c9fbb9fc2806..43d66b8251cfd92b308c13a855c550036ceb8c06 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/pkgs/development/libraries/libagar/libagar_test.nix
@@ -2,7 +2,7 @@
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
 stdenv.mkDerivation rec {
-  name = "libagar-test-${version}";
+  pname = "libagar-test";
   inherit (srcs) version src;
 
   sourceRoot = "agar-1.5.0/tests";
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index cc6c9464de36697e9f282088fdd8c2656ba6447b..325a7d71598b0fb491694814380970d71ce120fc 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libamqpcpp-${version}";
+  pname = "libamqpcpp";
   version = "4.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 826f72b1f5fb3efa74e2153129dbcddd46a5a0e0..698182dbd4ed9eebb5d5d09523a6dade553f4273 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.2";
-  name = "libao-${version}";
+  pname = "libao";
 
   # the github mirror is more up to date than downloads.xiph.org
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 62e0a850bad3b12a39c7001a5f383d4cc53104cf..2d9a9f18fa27936964238244952e0e15562e88c6 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "libaom-${version}";
+  pname = "libaom";
   version = "1.0.0-errata1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix
index dd3320005a41ee7ee4db53b4143c9df519ec6aa2..5b9647d275cb1e15f1f23218976da58bc5581295 100644
--- a/pkgs/development/libraries/libaosd/default.nix
+++ b/pkgs/development/libraries/libaosd/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.7-9-g177589f";
-  name = "libaosd-${version}";
+  pname = "libaosd";
 
   src = fetchFromGitHub {
     owner  = "atheme-legacy";
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 3cf8a6da73671b847e22fb881730f0020bc38d46..e3927f34fab9334b2f8652efe6cbe44ad15fbbd4 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -9,7 +9,7 @@
 assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libarchive-${version}";
+  pname = "libarchive";
   version = "3.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index a06ae978d51540056361f17fe39c3f99bbf0a51f..0c8f82138e7ffd5780fd2cc2fec7839c9b3c66cc 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libasr-${version}";
+  pname = "libasr";
   version=  "1.0.2";
 
   src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
     sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
   };
 
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index d7ebf781a04949bf2e7251d24fd6d7a34d48fde6..41406ce18eae9300040133f773389ced57ca9910 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -18,11 +18,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libass-${version}";
+  pname = "libass";
   version = "0.14.0";
 
   src = fetchurl {
-    url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
   };
 
diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
index 313cb7f8d5dc63fec35112c6031c0e5a9c63fef9..348cfa9ed5b46c66940562dafbb6b3d888cc388b 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/pkgs/development/libraries/libast/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libast-${version}";
+  pname = "libast";
   version = "0.7.1";
 
   src = fetchurl {
-    url = "http://www.eterm.org/download/${name}.tar.gz";
+    url = "http://www.eterm.org/download/${pname}-${version}.tar.gz";
     sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
   };
 
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0df8ed0f969913f5d6a6ba24279d5f2d2023108d..b576896876e49ed1dd7ef2add5afedbf3f4cb27c 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libatomic_ops-${version}";
+  pname = "libatomic_ops";
   version = "7.6.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 1ef453f24cdbf5455b4690ed11594f81670b318e..feeb4de15e1b00eb753652af68e22c37f0531b11 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -33,10 +33,11 @@ let
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {
-    name = "libav-${version}";
+    pname = "libav";
+    inherit version;
 
     src = fetchurl {
-      url = "${meta.homepage}/releases/${name}.tar.xz";
+      url = "${meta.homepage}/releases/${pname}-${version}.tar.xz";
       inherit sha1; # upstream directly provides sha1 of releases over https
     };
 
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index 6a7720b99bcc8a49b24ee89cc9364201ddb8d4f1..d39c12d58d553fd1c1f770354137e90cfe752aad 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "libb2-${version}";
+  pname = "libb2";
   version = "0.98.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix
index 09c5444a6446d00adc024ccdb81a31a86dfa110d..3c9a97684275ab23416608774dce6b7a7b57b245 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/pkgs/development/libraries/libb64/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "libb64-${version}";
+  pname = "libb64";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 2a129bc648f04629bf8017d55cde2594bd34a787..b20850e88ff071c9955f0b4ed2163b0e5f869b79 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -2,7 +2,7 @@
   which }:
 
 stdenv.mkDerivation rec {
-  name = "libbap-${version}";
+  pname = "libbap";
   version = "master-2019-04-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 3a1b77525143da98ba42cdc0e7c43256efa480be..3af98a578f202d5c43ced0e73b21861045219bed 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -8,11 +8,11 @@
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
-  name = "libbdplus-${version}";
+  pname = "libbdplus";
   version  = "0.1.2";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2";
     sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
   };
 
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 64b3832d33530cf2e64711ddb1d5dc67031ccb79..5af8acb5ed7695710b3b8b081534e6e812dcc9f5 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libbfd-${version}";
+  pname = "libbfd";
   inherit (binutils-unwrapped) version src;
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index d22518e96d425f121b98f17071744e689e4d16b6..c8c58315b648fe28aaaa22b9fc2cd7855efef0cc 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -13,7 +13,8 @@ let
   version = "2.2.0";
 
 in stdenv.mkDerivation {
-  name = "libbladeRF-${version}";
+  pname = "libbladeRF";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Nuand";
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix
index d8f2426e477bccbaa93034ddcd3b3ba95359b053..d9639cf5c145163c39e5e60cf6dde352a6a6bffd 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/pkgs/development/libraries/libbluedevil/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libbluedevil";
   # bluedevil must have the same major version (x.y) as libbluedevil!
   # do not update this package without checking bluedevil
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
   };
 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index b7ca9dda1ea778bb3af36b5810922ba9a57251e1..517251e137ef2cba689a059a780ee84211935edd 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -18,11 +18,11 @@ assert withFonts -> freetype != null;
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
-  name = "libbluray-${version}";
+  pname = "libbluray";
   version  = "1.1.2";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3";
   };
 
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index a8d1925e5c0d30292cf830237e78651fa1333462..fe4af163a542ba4106e9061b037bd02bd2835eba 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libbsd-${version}";
+  pname = "libbsd";
   version = "0.9.1";
 
   src = fetchurl {
-    url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
   };
 
diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 6244c3a351e766ccd4e26a553c6821f07a9dd2c0..5bd6b11ac7afac8d4bb0d4f77b7e9a02ede43fe3 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, perl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libbson-${version}";
+  pname = "libbson";
   version = "1.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index f68141ef3b472a8241de9d1b531ae71ba5e0bbbf..01588187936c04643be7b2e2fae9918cfe38568c 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libburn-${version}";
+  pname = "libburn";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq";
   };
 
diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
index 18593f80799ca6569be58289b8167d89913c3328..4fea84723f992b5f1ad824af7f4cbaf8be35b5e5 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -6,7 +6,8 @@
 let
   version = "2.1";
 in stdenv.mkDerivation rec {
-  name = "libbytesize-${version}";
+  pname = "libbytesize";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "storaged-project";
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
index 62d709733759c972dda40f164aff00d0037967e4..2e134c5bb6391b3678404c684a604ce066e2051b 100644
--- a/pkgs/development/libraries/libcacard/default.nix
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, nss }:
 
 stdenv.mkDerivation rec {
-  name = "libcacard-${version}";
+  pname = "libcacard";
   version = "2.7.0";
 
   src = fetchurl {
-    url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz";
+    url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz";
     sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n";
   };
 
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index 6838362c79424c522684faedb9b57ec61bc687f4..42a49713a0b44bfa4cca87de1008b81b768b8da4 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "libcangjie-${version}";
+  pname = "libcangjie";
   version = "1.4_rev_${rev}";
   rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
 
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index e016484e6779910bccf24e48aff58e69be35d406..2688881e66d38ceece6611c1d446639c2f47a076 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -3,7 +3,8 @@
 let version = "4.0.4"; in
 
 stdenv.mkDerivation {
-  name = "libcec-${version}";
+  pname = "libcec";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 0005525a7cd29dd0f5e45a324ade5beffcc6159b..e43cfb10a3780eb404a6baa4a3c64c727d1ecdb7 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -3,7 +3,8 @@
 let version = "2.1.0.1"; in
 
 stdenv.mkDerivation {
-  name = "p8-platform-${version}";
+  pname = "p8-platform";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index ecba18cd58c836e93ac66e168730b6bbc1826b1d..e161948db4043c4a1e1b0d4b3c4c29bf04f3b3e8 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -13,7 +13,7 @@ let
     ];
 in
 stdenv.mkDerivation rec {
-  name = "cef-binary-${version}";
+  pname = "cef-binary";
   version = "3.3497.1833.g13f506f";
   src = fetchurl {
     url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index 410c83953aa9424bf0f0b924eafcf57176156858..11617a0107cf324ac830ed353a8dacbf43231b18 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libchardet-${version}";
+  pname = "libchardet";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix
index d3ef799ef605e7aca1826dcd908b6b47bab1c07b..3c234d780eff0ab83d23aa1f2eebfa5bf324454d 100644
--- a/pkgs/development/libraries/libchewing/default.nix
+++ b/pkgs/development/libraries/libchewing/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, sqlite }:
 
 stdenv.mkDerivation rec{
-  name = "libchewing-${version}";
+  pname = "libchewing";
   version = "0.5.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index f101eb223106e1b8b45d7dc4cb7389de97d12b4c..d896cf637330a71a0ca6376c8dad26a748dfe9bb 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libcli-${version}";
+  pname = "libcli";
   version = "1.9.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index a2f6858a05c9b562299d372671b5350393a0896d..325afc56ae790deb0c78979d4d0aec3790cfedc5 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libclthreads-${version}";
+  pname = "libclthreads";
   version = "2.4.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 49bc2347ba776cce5af4cde7b6a7d7015004c0a3..d6e2ad398d778ca481fb6cc5920d5fcd45eca6e3 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libclxclient-${version}";
+  pname = "libclxclient";
   version = "3.9.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index f247c48821f75a98913e6a0d75a38e0d0fb7a350..8eb7ff303de793b1112027a242e683c374a217c2 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libcommuni-${version}";
+  pname = "libcommuni";
   version = "3.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index ee3f511d4359046f9fa0ab790266c33dea3487ef..cfef09c480a2e954b7fe8ffc6b0bcf0ffb421532 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libconfuse-${version}";
+  pname = "libconfuse";
   version = "3.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 894faf0b91024fb9e5d023adc4bf62f708477292..23b39bca1f3a0d1a3a86abb9eb0dcba9ac27ebaf 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "libcouchbase-${version}";
+  pname = "libcouchbase";
   version = "2.10.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index fff31a96ce778a29632c4a557b249dee1ccbd54a..ba9a6325b07d0d4d7983431d3c0873773d1c25d7 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "libcrafter-${version}";
+  pname = "libcrafter";
   version = "0.3";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix
index 3d32f4d0b95374e5d17a7f42e5f3bca2966e311d..4bf26bde228ddda9b7babd30ca0435d7694951b7 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libcsptr-${version}";
+  pname = "libcsptr";
   version = "2.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 94dc733a69b0be87967e60eca45d8719330f3112..f4e2e621c2864925bd40969542ed07cd799c16e3 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "ctemplate-${version}";
+  pname = "ctemplate";
 
   version = "2.3";
 
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index e50b8a13b95099119282f418592b99ab80532626..8ebab123524b3e773c415b8f13986e7b655977f6 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libcue-${version}";
+  pname = "libcue";
   version = "2.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 86d14fe79740d6736cc46b8c73f1a95e9dc84da5..df2e4c367bfb5b5fde1af6325cc4d0e7b86d714c 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   version = "3.20.4";
-  name = "libdap-${version}";
+  pname = "libdap";
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libuuid curl libxml2 ];
 
   src = fetchurl {
-    url = "https://www.opendap.org/pub/source/${name}.tar.gz";
+    url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
     sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i";
   };
 
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 32b0c9758f73ab2384651c14eacf4f1143165fb4..2ae4eec99ecc17a1f3dbf17ac62db0ba2be948aa 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "libdbusmenu-qt-${version}";
+  pname = "libdbusmenu-qt";
   version = "0.9.3+16";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 86b9fcd0bef38dc44969f3df3e3762b34c4c9090..0f2ba019d3fe00036756ad1f57e1696bb2c20146 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -2,11 +2,11 @@
 , libusb1, CoreServices }:
 
 stdenv.mkDerivation rec {
-  name = "libdc1394-${version}";
+  pname = "libdc1394";
   version = "2.2.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
+    url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz";
     sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b";
   };
 
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index 6c9fabf5cae7018eeb260bfc3b756cfdf8d4f9c8..3c31ba805d89563bb0b97c5e61a4760009ec24da 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "libde265-${version}";
+  pname = "libde265";
 
   src = fetchFromGitHub {
     owner = "strukturag";
diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
index a5b178caf825711d052c0f24f669e8f62f370149..b06a0a9450ab60a1155dc66672f5082a81f89702 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libdeflate-${version}";
+  pname = "libdeflate";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 78e7490cd992a238aaa41cd1570b995cb413b8b3..afbff3dc0cff0969c9cb507da0f677ebea4403ed 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "libdevil-${version}";
+  pname = "libdevil";
   version = "1.7.8";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
index 7fe7319ff15eedd89b19f239c7b9cb3fe89323b2..06ba10904a7d59f338489b303de69c2bbf885753 100644
--- a/pkgs/development/libraries/libdigidoc/default.nix
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "3.10.4";
-  name = "libdigidoc-${version}";
+  pname = "libdigidoc";
 
   src = fetchurl {
     url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index e3172c2fc1f8d2e7a8892a181e5c0e10c90941f1..4aec6fdef91719d8d785a780a5c6aca7777d70c8 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.13.7";
-  name = "libdigidocpp-${version}";
+  pname = "libdigidocpp";
 
   src = fetchurl {
      url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index 287494b6b1fd47a000514ed395fcb9028f694ea4..d7d88b38386598da2781df870ef29aa82a2dfdbc 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "libdiscid-${version}";
+  pname = "libdiscid";
   version = "0.6.2";
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
   
   src = fetchurl {
-    url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
+    url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index c94806b50c10d5ff3b231d1f3aa0268b4d6b2b4a..5598e6b2fa78db1c2d692cee33203242c9b57320 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libdivecomputer-${version}";
+  pname = "libdivecomputer";
   version = "0.6.0";
 
   src = fetchurl {
-    url = "https://www.libdivecomputer.org/releases/${name}.tar.gz";
+    url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz";
     sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0";
   };
 
diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
new file mode 100644
index 0000000000000000000000000000000000000000..478534e65e51eb2981e7f6ab7969a2a0f18a98dd
--- /dev/null
+++ b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
@@ -0,0 +1,48 @@
+From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Fri, 2 Aug 2019 10:26:37 +0100
+Subject: [PATCH] meson: support for custom nm path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When cross-compiling target toolchains i.e. binutils are often
+prefixed by its target architecture. This patch gives the user
+to option to specify the nm used during the build process.
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ meson.build       | 2 +-
+ meson_options.txt | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e292554a..64607139 100644
+--- a/meson.build
++++ b/meson.build
+@@ -327,7 +327,7 @@ pkg.generate(
+ )
+ 
+ env_test = environment()
+-env_test.set('NM', find_program('nm').path())
++env_test.set('NM', find_program(get_option('nm-path')).path())
+ 
+ if with_libkms
+   subdir('libkms')
+diff --git a/meson_options.txt b/meson_options.txt
+index 8af33f1c..b4f46a52 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -141,3 +141,9 @@ option(
+   value : false,
+   description : 'Enable support for using udev instead of mknod.',
+ )
++option(
++  'nm-path',
++  type : 'string',
++  description : 'path to nm',
++  value : 'nm'
++)
+-- 
+2.22.0
+
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index bdc191fe8a38e60e0f1bc3238026b2db0ca4b88f..29d59659f90dec40d47e0d62730f16a5bbec91be 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig meson ninja ];
   buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
 
+  patches = [ ./cross-build-nm-path.patch ];
+
   postPatch = ''
     for a in */*-symbol-check ; do
       patchShebangs $a
@@ -21,7 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   mesonFlags =
-    [ "-Dinstall-test-programs=true" ]
+    [
+      "-Dnm-path=${stdenv.cc.targetPrefix}nm"
+      "-Dinstall-test-programs=true" ]
     ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
       [ "-Dtegra=true" "-Detnaviv=true" ]
     ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index 0984eb6e00bf654b0bcb3507816a4b3f5c332d5e..aed6f05fec4fc5e74764d459eedb1aa4ab314e38 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libdvbpsi-${version}";
+  pname = "libdvbpsi";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc";
   };
 
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index f18e0622d0ccd063d847a38d2a7ca87ee035ee28..fd89077a256ab5474cfa1ad68c22cedb97284334 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, IOKit}:
 
 stdenv.mkDerivation rec {
-  name = "libdvdcss-${version}";
+  pname = "libdvdcss";
   version = "1.4.2";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
   };
 
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index b0dfd1e8fc12cc62c20d790ad1855e18914c6b30..45a73a6248831198d96f4daa017ea1aaec26a8d8 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libdvdread}:
 
 stdenv.mkDerivation rec {
-  name = "libdvdnav-${version}";
+  pname = "libdvdnav";
   version = "6.0.0";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2";
     sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph";
   };
 
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 5f0f082750350b3270c7f71f80b69b2f4e33024b..c133c0ba6f926134ef7484ca12e2aafa1ef0efc2 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation rec {
-  name = "libdvdread-${version}";
+  pname = "libdvdread";
   version = "6.0.1";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8";
   };
 
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 1a4da7713af427a51474829122d0f644d09e985b..3fd2a328558eb0577b5390beafe1519971af4754 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -17,7 +17,8 @@ let
 
 in rec {
   libdwarf = stdenv.mkDerivation rec {
-    name = "libdwarf-${version}";
+    pname = "libdwarf";
+    inherit version;
 
     configureFlags = [ "--enable-shared" "--disable-nonshared" ];
 
@@ -37,7 +38,8 @@ in rec {
   };
 
   dwarfdump = stdenv.mkDerivation rec {
-    name = "dwarfdump-${version}";
+    pname = "dwarfdump";
+    inherit version;
 
     preConfigure = ''
       cd dwarfdump
diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix
index 93ece69cf05649344df06fd3b020486adac04107..f8baa347914cabf14e53c1cc485812b0851b6b95 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/pkgs/development/libraries/libdynd/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.7.2"; in
 stdenv.mkDerivation {
-  name = "libdynd-${version}";
+  pname = "libdynd";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "libdynd";
diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix
index 293b1c28e932bf0e4bfd4604eed405cd227cf9eb..2fdb1d071b6256e7f92c9cbb0590e5527c72787a 100644
--- a/pkgs/development/libraries/libeb/default.nix
+++ b/pkgs/development/libraries/libeb/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, zlib }:
 stdenv.mkDerivation rec {
-  name = "libeb-${version}";
+  pname = "libeb";
   version = "4.4.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
index 6a4078f92cf3a4d094ccd55b8b6b6b4f8449c01b..16624a78079781e75b7ed60160f2e28466b0f84a 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
-  name = "libebur128-${version}";
+  pname = "libebur128";
 
   src = fetchFromGitHub {
     owner = "jiixyj";
diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index be9f5e772d91824ca25307c1e6d4a5a3e8101207..855386114c1cd384cbca854b478c8d9bd7a4e58f 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }:
 
 stdenv.mkDerivation rec {
-  name = "libechonest-${version}";
+  pname = "libechonest";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "http://files.lfranchi.com/${name}.tar.bz2";
+    url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2";
     sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db";
   };
 
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index 26fe2d90963a8aece2b363a8fe1eb047e2615c56..1835b924ec1a4f4820a1400dca770dea7abaac9c 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
   version = "3258";
-  name = "libelf-freebsd-${version}";
+  pname = "libelf-freebsd";
 
   src = fetchsvn {
     url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index 980cee2e68799beb0c78d25c21b7fa3e21f27ccf..8555449f28bdf7d89feeb9173b3ab3fcfb810462 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libESMTP-${version}";
+  pname = "libESMTP";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 365c128239d8f93a8ae84bbed4c44075a505301c..56710945ecb14e8d3fd094984b285e726f2ee034 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libev-${version}";
+  pname = "libev";
   version="4.27";
 
   src = fetchurl {
-    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
+    url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz";
     sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d";
   };
 
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 611287b9aaa884ecd32168bb8ea481579b35cebe..5fb46bff075620c7d0c47815b6cf3094cf29ca28 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -5,7 +5,7 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "libevent-${version}";
+  pname = "libevent";
   version = "2.1.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index d150d4a0033097f8300e1ae2f92e00df4edeff69..fd1e203ed37f5e331d305038ed8e1c621b88b6ef 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "20171104";
-  name = "libewf-${version}";
+  pname = "libewf";
 
   src = fetchurl {
     url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix
index a61d51aa6b72897b588b8580798768f34728b385..2eee9bafe44b52fdd84a5e505781ec1519fff2ec 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/pkgs/development/libraries/libexecinfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "libexecinfo-${version}";
+  pname = "libexecinfo";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2";
+    url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2";
     sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9";
   };
 
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix
index e36c4ee12b942829c389835fd42bb2943193bb8c..196f0e50bef809756d476f7c00be2b08f629bc31 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/pkgs/development/libraries/libfakekey/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "libfakekey-${version}";
+  pname = "libfakekey";
   version = "0.1";
 
   src = fetchurl {
-    url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz";
+    url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz";
     sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k";
   };
 
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index f553afdfc70929ead63814ba587a0a9d369828c2..62f1b087de5ba478866c2c0aeca88f5128228d96 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libfaketime-${version}";
+  pname = "libfaketime";
   version = "0.9.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix
index 5ac7a244df2090f4afb7420b4dec36938922e3fa..5e1c985fe2c4a2fd9249d3b9ded7c82f20a6ce95 100644
--- a/pkgs/development/libraries/libfann/default.nix
+++ b/pkgs/development/libraries/libfann/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libfann-${version}";
+  pname = "libfann";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 513a4dc3d3844e2f8ab0f2e3d96b8d0eff56b9ff..8d11cd86c45f00ff65f4ba173fa5cbd460ff1d4a 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libffcall-${version}";
+  pname = "libffcall";
   version = "2.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 4b02d651929b52d598463401be5c83aa680ab2c8..0c8a7084e095bc0ccd6e49c7745f774ac7c90c85 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -3,7 +3,7 @@ zlib, libpng, boost, qt5, guile
 }:
 
 stdenv.mkDerivation rec {
-  name = "libfive-${version}";
+  pname = "libfive";
   version = "2018-07-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index 2d2d56dda4f2cfe194ce3540226635ece7faa6e1..9c9b6c8034c41a8ce6755216791bdd03c1444a6b 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name="libfixposix-${version}";
+  pname = "libfixposix";
   version="0.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index cfae74b4b9e36b15cd30d12309be22e01636c8c9..c0595ac93d1ceb281a8271107b8a4e51873d0dcd 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -2,7 +2,7 @@
 , libobjc ? null }:
 
 stdenv.mkDerivation rec {
-  name = "libfreefare-${version}";
+  pname = "libfreefare";
   version = "0.4.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix
index 5491fab3edf22e5a8d654d1001dadb898e5c8d6a..ce7d615f4d317ad45e39872e64191344d5b10e7a 100644
--- a/pkgs/development/libraries/libfsm/default.nix
+++ b/pkgs/development/libraries/libfsm/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "libfsm-${version}";
+  pname = "libfsm";
   version = "0.1pre1869_${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
index a6fe2bc1435f4f0de3d406f6a3afee84e7230793..d83b43a782e9c7690c4a9512202507fcff0b3c30 100644
--- a/pkgs/development/libraries/libgaminggear/default.nix
+++ b/pkgs/development/libraries/libgaminggear/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libgaminggear-${version}";
+  pname = "libgaminggear";
   version = "0.15.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2";
+    url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2";
     sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz";
   };
 
diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix
index 42e812ec1f5323bd49f9b09458d4b382d7fa3b39..b6a8ae3c8dfe2305300776552cdda66cf994ecee 100644
--- a/pkgs/development/libraries/libgap/default.nix
+++ b/pkgs/development/libraries/libgap/default.nix
@@ -7,7 +7,7 @@
 # - https://github.com/markuspf/gap/issues/2
 # - https://trac.sagemath.org/ticket/22626
 stdenv.mkDerivation rec {
-  name = "libgap-${version}";
+  pname = "libgap";
   # Has to be the same version as "gap"
   version = "4.8.6";
   src = fetchurl {
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 4d8a7eac27c8b6f55b428c0f6bdc91df7df58520..36a1b7d37208632c74a291bf13958b327284ca31 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -5,11 +5,11 @@
 assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-${version}";
+  pname = "libgcrypt";
   version = "1.8.4";
 
   src = fetchurl {
-    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
+    url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
     sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
   };
 
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 51520eb0fe3807c2bd678ca66c53daa7e99fbb6b..db75ff1784f5f96af96194d8cf14d1458220e404 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.1";
-  name = "libgeotiff-${version}";
+  pname = "libgeotiff";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index 56f160838e66979db1fd3f99e1321d0ef3b6beb5..279392382785dc61fa6315dd8e8693e10e4d8bad 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "libgig-${version}";
+  pname = "libgig";
   version = "4.2.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
     sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn";
   };
 
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 9bec00b9f52dc000cdc1879569d032e0c49a4d10..24052ea4058504ebab7742ae841917102ef4c143 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -6,10 +6,9 @@
 stdenv.mkDerivation rec {
   version = "2.0.12";
   pname = "libgksu";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+    url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
     sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
   };
 
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 62c6b45c5d45097cd168295c65153123e09cf3fc..ed6139d48f6fba8ac2680fe34149f2b4a12fa974 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
-  name = "libglvnd-${version}";
+  pname = "libglvnd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix
index 89fcfdfde8daad3f754093a73ffc41dd4c52c17d..76d7ebcc8cc23abc618cfb9ccba06250ca402adf 100644
--- a/pkgs/development/libraries/libgringotts/default.nix
+++ b/pkgs/development/libraries/libgringotts/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
 
 stdenv.mkDerivation rec {
-  name = "libgringotts-${version}";
+  pname = "libgringotts";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2";
+    url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2";
     sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7";
   };
 
diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
index bd5a5f068515e05fdbf7b72a863d2fc8ff48f8df..fd34f28c1e8122efe58d7e566b353653c904d095 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.3.0";
-  name = "libgroove-${version}";
+  pname = "libgroove";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index d3dea766cbbbebe43e9389f2af3fc5d617216407..b52a2b1e0fa99a6427e0fd53ec74fda5349430a9 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, udev
+, glib
+, gobject-introspection
+, gnome3
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "libgudev";
-in stdenv.mkDerivation rec {
-  name = "libgudev-${version}";
-  version = "232";
+  version = "233";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q";
   };
 
   nativeBuildInputs = [ pkgconfig gobject-introspection ];
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index e3d7741ba869a616975905fa9bffb3e219b9a55e..9b50ddd4b7f42ea7c9f0f06dab6c0899f53e721b 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -10,7 +10,7 @@ assert appliance == null || stdenv.lib.isDerivation appliance;
 assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
-  name = "libguestfs-${version}";
+  pname = "libguestfs";
   version = "1.38.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix
index d5d35678b4fb9fbd6d1b41ace439608b6382b476..b82c547fb331c2c8db15ba176ee8de796304a05a 100644
--- a/pkgs/development/libraries/libgumath/default.nix
+++ b/pkgs/development/libraries/libgumath/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libgumath-${version}";
+  pname = "libgumath";
   version = "unstable-2018-11-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index 3182345bfd4821a896032d92225a41922c3ce623..7e1bb2daa9e143f9e0467be9f2e0471169e80123 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.0";
-  name = "libheif-${version}";
+  pname = "libheif";
 
   src = fetchFromGitHub {
     owner = "strukturag";
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index b86a48ecd1ba0f77c91b37eff9ad8713a0d4980a..d8881b929a05deae181cd93500c6b4323108a700 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -2,7 +2,7 @@
 , python3, tzdata, glib, libxml2, icu }:
 
 stdenv.mkDerivation rec {
-  name = "libical-${version}";
+  pname = "libical";
   version = "3.0.4";
 
   outputs = [ "out" "dev" ]; #"devdoc" ];
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c5379692ad3067c407cb8dca1f23d12eac9d953a..7dc90d9ae3e4a324fa1dbad5f3067e977ef5e5d1 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -6,11 +6,11 @@
 # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
 
 stdenv.mkDerivation rec {
-  name = "libiconv-${version}";
+  pname = "libiconv";
   version = "1.16";
 
   src = fetchurl {
-    url = "mirror://gnu/libiconv/${name}.tar.gz";
+    url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
     sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6";
   };
 
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 4b7d9bdc2e32d6cc75116ac6335ca5d51d61272b..674862d694c77b01e82ef740af045ba7bc67cb69 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, gperf}:
 
 stdenv.mkDerivation rec {
-  name = "libid3tag-${version}";
+  pname = "libid3tag";
   version = "0.15.1b";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 5ec5b8e04dd04082c166771a6474c5e3b84c6364..7e7b691e3c190fb1dbf5f2208c123992bef9c02b 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libidn2-${version}";
+  pname = "libidn2";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
+    url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
     sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
   };
 
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index 4fa3addc0a66f1aefb56c96fad16fb6555783c92..936d165a6cfc2ae2c6da93f034ba6f204e6cae60 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
-  name = "libiec61883-${version}";
+  pname = "libiec61883";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz";
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index df5035461afda82e07a1582771d84ba48e4058a2..9392061a269e539ac97b9e10a65a615000b8a462 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libiio-${version}";
+  pname = "libiio";
   version = "0.18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 6464e4e582011ea392da3989f72e585e7f16eeaf..7eccfc37363c2df729988bde80bf7fcd1a9a4ab2 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -5,8 +5,6 @@ stdenv.mkDerivation rec {
   pname = "libimobiledevice";
   version = "2019-04-04";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index c57590aad218d9afac2e22c18c36976e5c794032..9be58ac537adf964eac5f9c6e3209be700affe29 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -12,10 +12,10 @@ let
   mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;
 
   self = stdenv.mkDerivation rec {
-    name = "libinfinity-${version}";
+    pname = "libinfinity";
     version = "0.7.1";
     src = fetchurl {
-      url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
+      url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz";
       sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
     };
 
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix
index 6fc507daf6410bb8d2422470001123368a22c14e..75cd1a00507223b5d8a311da6f009bc8cfe77383 100644
--- a/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/pkgs/development/libraries/libinotify-kqueue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libinotify-kqueue-${version}";
+  pname = "libinotify-kqueue";
   version = "20180201";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0c759835183b009d46bfb565e000a8eeb691fd34..c1ee68a2470bd285db10ffe507ec9448a92708a4 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -26,11 +26,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-${version}";
+  pname = "libinput";
   version = "1.13.4";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
     sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk";
   };
 
diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix
index fea5a86da4461227801c95f954fa312eb4496fae..c4dca659d36607993d88244873a89c3cdb02d075 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/pkgs/development/libraries/libipfix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libipfix-${version}";
+  pname = "libipfix";
   version = "110209";
   src = fetchurl {
     url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index 71238dda1620caee3b133f00398510881336673f..561a524827888bf1c093ad468da1292424103b93 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   version = "1.10";
   pname   = "libircclient";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
+    url    = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv";
   };
 
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index ce2028e805dc3b804f46e375bf4870c274995e71..cefce19d465961a534a6077a5b853c7dc968af92 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
 
 stdenv.mkDerivation rec {
-  name = "libisoburn-${version}";
+  pname = "libisoburn";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
   };
 
diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index d528144838702175ba1a8f770689f5f27b7a43fb..59726094c4aee8dcb56f1b3d6479609fcaaa6184 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, acl, attr, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libisofs-${version}";
+  pname = "libisofs";
   version = "1.5.0";
 
   src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
     sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys";
   };
 
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 0b00cf90ba00912126bbd8a93017a67f780c051b..73801102ba38e8bfe9a9a69162331795d3ba4c78 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }:
 
 stdenv.mkDerivation rec {
-  name = "libite-${version}";
+  pname = "libite";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index 51b2dd7c7bd66fbb6d4145c266b7cb705464140e..bd1432b8a21b775bb9fe77f529b7fc6a286d8066 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "libivykis-${version}";
+  pname = "libivykis";
 
   version = "0.42.3";
 
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
index 68835c1414c33c677bf54c9af0e3dde26705856d..1790f3f68b2add9ec09d4170c4c9f0edb9451f61 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   rev = "148";
   version = "hg-2012-12-02";
-  name = "libixp-${version}";
+  pname = "libixp";
 
   src = fetchurl {
     url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip;
diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix
index 2167b4477034404db403c454fe671f7171481bcd..9e81c93240571a232157b436c0a7fc5e126306b3 100644
--- a/pkgs/development/libraries/libjreen/default.nix
+++ b/pkgs/development/libraries/libjreen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }:
 
 stdenv.mkDerivation rec {
-  name = "libjreen-${version}";
+  pname = "libjreen";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "https://qutim.org/dwnl/73/${name}.tar.bz2";
+    url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2";
     sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582";
   };
 
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index f352c8e9ed198fa2f4935f7e097df08370eacf53..a7c9427080d87c327d634354c7ecf9ed1ef3da1e 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libjson-rpc-cpp-${version}";
+  pname = "libjson-rpc-cpp";
   version = "0.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index c83143dd6b137247e9753c768ffccf2bda82ee9a..ba92bdd516557c0119bb60ab9d8b54121e5353f5 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -2,7 +2,8 @@
 let
   version = "7.6.1";
 in stdenv.mkDerivation rec {
-  name = "libjson-${version}";
+  pname = "libjson";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/libjson/libjson_${version}.zip";
     sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 93f3b2a4f84d1fb7d0288b607aaba5c4f8dd8ec9..12205a6a63b3c079b4ef612a4142f48b852fdd3e 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "libkeyfinder-${version}";
+  pname = "libkeyfinder";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 24dd34d7a6a3587f68f090158d5b088b068947e3..67d525112ccb3e873d49d0e109cffda2de9dcf9b 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "liblangtag";
   version = "0.6.1";
 
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 767485a75154cc843fa3ca907e94afd0da9432c5..ff1a39fc2049cc752617d51a4b6beba3eb436f5c 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -4,12 +4,13 @@
 let version = "1.1.0"; in
 
 stdenv.mkDerivation rec {
-  name = "liblastfm-${version}";
+  pname = "liblastfm";
+  inherit version;
 
   # Upstream does not package git tags as tarballs. Get tarball from github.
   src = fetchurl {
     url = "https://github.com/lastfm/liblastfm/tarball/${version}";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
   };
 
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
index cafd6a66aa00817b99e618e17765055ec6045056..dd999db2759957b4d271bd6e4a0c0fd99158c0f2 100644
--- a/pkgs/development/libraries/liblaxjson/default.nix
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.5";
-  name = "liblaxjson-${version}";
+  pname = "liblaxjson";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 9870e024687c9762e141fd1121006a7f1c9db5c0..fe513d378cd857d3e1d2fd9546bd596644d1cbbb 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }:
 
 stdenv.mkDerivation rec {
-  name = "liblcf-${version}";
+  pname = "liblcf";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 1a177dc22374190604d45789fe0f093fa9340f38..e8d8e971bc54639cfc55bd38abba25bff8297f24 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "liblinear-${version}";
+  pname = "liblinear";
   version = "2.30";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index c2731e44efbcc7f25cece006d4f421bd9baa1286..a61c21ffec5fc6e970183c787d650d1549d95fd9 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -5,7 +5,8 @@
 let
   version = "3.10.0";
 in stdenv.mkDerivation rec {
-  name = "liblouis-${version}";
+  pname = "liblouis";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "liblouis";
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
index 1a5a4baf80868d843b2399b403afc6c9cce7d686..471f277fb523a746efce666c194cdce6d9c6be8d 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "liblscp-${version}";
+  pname = "liblscp";
   version = "0.6.0";
 
   src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.gz";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz";
     sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k";
   };
 
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 8ff02b49e5845cb47d422eaf166ccddc63e05812..3786c5e77d3a73900dbcbbbc280575d832142f60 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
 
 stdenv.mkDerivation rec {
-  name = "libmatchbox-${version}";
+  pname = "libmatchbox";
   version = "1.11";
 
   buildInputs = [ libXft libICE pango libjpeg ];
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index 0f43c0d461642cfbc2a40d0df797e18747fe766e..7f5c8b4c4c25991a95e4a1211219900364d8856f 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.11";
-  name = "libmatheval-${version}";
+  pname = "libmatheval";
 
   nativeBuildInputs = [ pkgconfig autoconf flex ];
   buildInputs = [ guile ];
 
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz";
     sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab";
   };
 
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index f1b15a91ccac61ccd4034470098d3b93b91528e1..46ed250b7b19e49623cdafd78baf8f46e16e6405 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmaxminddb-${version}";
+  pname = "libmaxminddb";
   version = "1.3.2";
 
   src = fetchurl {
-    url = meta.homepage + "/releases/download/${version}/${name}.tar.gz";
+    url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76";
   };
 
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index de8baa7ad198c67099964e0263f0268c798467fa..a38e71bb540ee0ff2f2e21e2d56156bb56aa19e9 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libmd";
   version = "1.0.1";
 
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index bf6aa0d23fb712ec969b98eab1d371efef0f4058..adf856544c489c6b108701aa36b2837f8d54e68a 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "19.07";
-  name = "libmediainfo-${version}";
+  pname = "libmediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
     sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss";
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index e46eb9208de601c06009d26b70fa013e3fb350c5..7ec06b51e8cbd0b82d277efa39a6ec452c5f20d4 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
 
 stdenv.mkDerivation rec {
-  name = "libmesode-${version}";
+  pname = "libmesode";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix
index d3f30a752732bd2067e81ca6ac226717a6b04ace..598f0b7f789856751403790584aba63490206945 100644
--- a/pkgs/development/libraries/libmhash/default.nix
+++ b/pkgs/development/libraries/libmhash/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "mhash";
   version = "0.9.9.9";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn";
   };
 
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index f75d32c4313e655e1f0e724df8c8582a31de6437..719053e7ecf15117948ab09c04a6ca138423e52d 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-${version}";
+  pname = "libmicrohttpd";
   version = "0.9.64";
 
   src = fetchurl {
-    url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
+    url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
     sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7";
   };
 
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index aa606e2a177ea284213fe3f7a067e19f638afb70..3eb688f95721f078b324755e598aead344932dc9 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
-  name = "libmilter-${version}";
+  pname = "libmilter";
   version = "8.15.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index 9c89d2e8d7b8118d5e2279198f4dde9a31140961..8b659c46792f9d6ca6abecf96522bd0867c565b3 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "libmkv-${version}";
+  pname = "libmkv";
   version = "0.6.5.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index 8580049101600435400cbdf63d173e25567562c6..231f18377e4899929380db7356bc3f458516ae1e 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.8.9.0";
 in stdenv.mkDerivation rec {
-  name = "libmodplug-${version}";
+  pname = "libmodplug";
+  inherit version;
 
   meta = with stdenv.lib; {
     description = "MOD playing library";
@@ -14,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz";
     sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";
   };
 }
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index 512add5616a028621ae8baf6355de12f8742772f..99f04bc09de7f947b6daa1f3732c28bb3de30911 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmowgli-${version}";
+  pname = "libmowgli";
   version = "2.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index 4df38a9cc3c9594c3591e63cbd40d58758660bf7..e8392f88ac7ad2ff746a918ec185c84179b37150 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libmpack-${version}";
+  pname = "libmpack";
   version = "1.0.5";
   src = fetchFromGitHub {
     owner = "tarruda";
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 106f6fe6c37c156e9544035923284038d8aebb46..e4010280f4bdd8da96df1dd9cd3baf72dbcb1ae0 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -6,7 +6,8 @@ let
   version = "1.1.0";
 in
 stdenv.mkDerivation rec {
-  name = "libmpc-${version}"; # to avoid clash with the MPD client
+  pname = "libmpc";
+  inherit version; # to avoid clash with the MPD client
 
   src = fetchurl {
     url = "mirror://gnu/mpc/mpc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index dac7cf48aac7d0a9a66af5f256108e342aef71a1..4c886078aa8bcb27d6105c361ea1d9c0c6f5093e 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.1";
-  name = "libmpeg2-${version}";
+  pname = "libmpeg2";
 
   src = fetchurl {
-    url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
+    url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz";
     sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
   };
 
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 2b59adf8f9226306bd554fa8529681642662d740..05532df1abd4e27ffe8ad4e83620659bb52bfcd4 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
-  name = "libmusicbrainz-${version}";
+  pname = "libmusicbrainz";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake neon libdiscid libxml2 ];
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index 6653025eb05625a70ad024a4cb39730bb2302e4a..483c5ff1ff7fab89f7439f0fb80b3fb4bc1211a2 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libmx-${version}";
+  pname = "libmx";
   version = "1.4.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 8719f19acc1dd3048a2b3a81b722fc69a25fe092..cde4251e2c697a246f598251eca4e9f317085ac1 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.3.0";
 in stdenv.mkDerivation rec {
-  name = "libmypaint-${version}";
+  pname = "libmypaint";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "mypaint";
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 2b7258031c337bdefc24fa65f170547ccbc26d2f..166ff2ef5a0244654925f7aaf2dd000040b375b7 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, boost, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "libmysqlconnectorcpp-${version}";
+  pname = "libmysqlconnectorcpp";
   version = "1.1.9";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix
index b461bfb3ddfe1b4558aa5e7deb52ecec8576a8d0..9414ebdcc2a02f044a6c7cff9b7ce2af875012e2 100644
--- a/pkgs/development/libraries/libnabo/default.nix
+++ b/pkgs/development/libraries/libnabo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.7";
-  name = "libnabo-${version}";
+  pname = "libnabo";
 
   src = fetchFromGitHub {
     owner = "ethz-asl";
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
index 17626bb23e139c0aba192f85b1e8d0d4132e701e..695d46ba38ff5682f1b2fd28948ce8e824135863 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libnatpmp-${version}";
+  pname = "libnatpmp";
   version = "20150609";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
     sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
   };
 
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 38c6bb008634d653c4a2b93a944aa5306d47f6c0..bfff0c8452253b46a6b397c9cdf6fed19d8a0db6 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libndctl-${version}";
+  pname = "libndctl";
   version = "66";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 51e4deed462c9788389d0040e06e0168faedffb9..6c4fc798f335ecba6729eb384b70fc39cfeeccd3 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libndtypes-${version}";
+  pname = "libndtypes";
   version = "unstable-2018-11-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index ba116e20177f6078b709eeb36d8dc76060822085..75cea00414359c8f248d7f1bdd36035034664ffb 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libnet-${version}";
+  pname = "libnet";
   version = "1.2-rc3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libnet-dev/${name}.tar.gz";
+    url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz";
     sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix
index 95533696ddf2d185a715c0c0ba40136ec1a34be7..328688612b633b8ee07c999b5767114020547d49 100644
--- a/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "libnetfilter_acct-${version}";
+  pname = "libnetfilter_acct";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2";
     sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 41245e6539f4aafc7175fcccafd50dec4da29a8b..85fbf458ac2068c56dd671ace958ed35a4112a74 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_conntrack-${version}";
+  pname = "libnetfilter_conntrack";
   version = "1.0.7";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2";
     sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index a680e009ab6a63604650035ace84d6155fb169c6..563843cca4695f0170c4306a40e52df6a02091f7 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_cthelper-${version}";
+  pname = "libnetfilter_cthelper";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2";
     sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index d16155374ca8339df61344167cd47555aad6a46d..9f706d619c3ad1a5eef9e9c6735673bd6dc9e502 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_cttimeout-${version}";
+  pname = "libnetfilter_cttimeout";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2";
     sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
index 0d8de14513edccec8181ad653a9fd6b623e2584a..2b932bc080970a20a0d91ddfa69e995273720e9f 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_log-${version}";
+  pname = "libnetfilter_log";
   version = "1.0.1";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2";
     sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l";
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 94b3dc90a0b64e9274c7255ecceb807a2aed2d4d..5f84bc03f82f52ef6d06a72d56363b90051f3ca2 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "libnetfilter_queue-${version}";
+  pname = "libnetfilter_queue";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2";
     sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq";
   };
 
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index bef977caa28ea8b543779fe78c054128ed2fb08e..695ddadb5f398744daaf8bfa7752631f4c8ff453 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libusb, readline }:
 
 stdenv.mkDerivation rec {
-  name = "libnfc-${version}";
+  pname = "libnfc";
   version = "1.7.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index 8ed6dfa8ac0d52be146a482895e1d93e16099849..d2848d9a1e9bb133e0ccb3a20b3d606802927b88 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libnfs-${version}";
+  pname = "libnfs";
   version = "4.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index c6348b7b2e67d2fbe31f5342b07d7d560231e7bb..d9b2df6148aa52265f45c2b6702e7a3d02861b04 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -3,7 +3,7 @@
 # Note that this does not provide the ngspice command-line utility. For that see
 # the ngspice derivation.
 stdenv.mkDerivation rec {
-  name = "libngspice-${version}";
+  pname = "libngspice";
   version = "30";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index a4b0b26a345b17710c52bb4d0919f0a5d6a15690..c0c66bc1a4a01466d0d4d42ecf15829fd2131c37 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.3"; in
 
 stdenv.mkDerivation rec {
-  name = "libnih-${version}";
+  pname = "libnih";
+  inherit version;
 
   src = fetchurl {
     url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 8131420cfd656e5edd638b9f57cefdeedfab830c..7dc23aa1e8ae4e19f5136754130f41f12e3c1cb4 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -5,10 +5,11 @@ let
   deb_patch = "5";
 in
 stdenv.mkDerivation rec {
-  name = "libofa-${version}";
+  pname = "libofa";
+  inherit version;
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz";
     sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
   };
 
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index d53b1dc083083e89ed11de91b13a971741c11d68..7c14d8102fbe5d62603a2122055d4036387f1023 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libomxil-bellagio-${version}";
+  pname = "libomxil-bellagio";
   version = "0.9.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz";
     sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r";
   };
 
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 450b9058d0b95deb68d0130915c0b502ec5a6a4a..c42cd3206b41815e1e351ffea10451fe06fd8934 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libopcodes-${version}";
+  pname = "libopcodes";
   inherit (binutils-unwrapped) version src;
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix
index a29f8dc4a8042acbb29a82f7cd76c8514c636550..4ad1e2b7735816ef5565a5be0ccd49d60365b976 100644
--- a/pkgs/development/libraries/libopenaptx/default.nix
+++ b/pkgs/development/libraries/libopenaptx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libopenaptx-${version}";
+  pname = "libopenaptx";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 10d438500a6327c4e056834798b0bf7681d34691..752be52963cb8de967ec6f7d61a80575f11e7db7 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -5,7 +5,8 @@ let
   version = "1.3.1";
 in
 stdenv.mkDerivation rec {
-  name = "libopus-${version}";
+  pname = "libopus";
+  inherit version;
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
index 4ca0849447f38c641c059e2e385eee9584ae1b83..e1d70bee6c4c840e7c2766d112771828e01674db 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.2.1";
 in
 stdenv.mkDerivation rec {
-  name = "libopusenc-${version}";
+  pname = "libopusenc";
+  inherit version;
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index 885880c54c36e3b7ee0ac672ea3c88bf6e899ec8..eeb8fec5f9300967eb15e9f31bffc5b9764a6076 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
 
 stdenv.mkDerivation rec {
-  name = "libosmium-${version}";
+  pname = "libosmium";
   version = "2.15.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 952509acc2eeb7a6eaac3deb45c2ebb42064bb65..47d9c4215fdf1f8df0a0ba4cae4d5c4e6dec44d6 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -3,7 +3,8 @@
 let version = "1.6.2"; in
 
 stdenv.mkDerivation {
-  name = "libossp-uuid-${version}";
+  pname = "libossp-uuid";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix
index 7797061a71aa3e06aa8a63a5a184ae21051123d0..fa0db0cd4ffc3652d7d6568701b55e38bef0afba 100644
--- a/pkgs/development/libraries/libow/default.nix
+++ b/pkgs/development/libraries/libow/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2p1";
-  name = "libow-${version}";
+  pname = "libow";
 
   src = fetchFromGitHub {
     owner = "owfs";
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 774019de0d5b806a224c93ad0996734159f4a613..903aa66ce60d1d33fc4ce10c7fdcbb2eb284606c 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -2,13 +2,13 @@
 , openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libp11-${version}";
+  pname = "libp11";
   version = "0.4.10";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz";
   };
 
diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index b4b72e5a36d31243ad2c37fa5b6c7e8cadcf8f42..3c37cf824959931312671f621b8074a3b64d4e9d 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.24";
-  name = "libpaper-${version}";
+  pname = "libpaper";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz";
diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix
index cf97744069b30a588aa80e918113811b1222f3ca..bbdce71bad6ae5837eaa64a05e5749a04cc33e68 100644
--- a/pkgs/development/libraries/libpar2/default.nix
+++ b/pkgs/development/libraries/libpar2/default.nix
@@ -3,10 +3,11 @@
 let version = "0.4"; in
 
 stdenv.mkDerivation rec {
-  name = "libpar2-${version}";
+  pname = "libpar2";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
   };
 
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index bf1d26cf90d0af1c63a26daba8a8a0edcc87012d..d0572de537eb152c80f0c5a36ba9dd9a74a1a203 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "4.10.1";
-  name = "libpfm-${version}";
+  pname = "libpfm";
 
   src = fetchurl {
-    url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz";
+    url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz";
     sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766";
   };
 
diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix
index f8c91df64683688a220145099227758acd64e12e..b3dae0c60eaa2d1a549ec29307268a5f6094edd7 100644
--- a/pkgs/development/libraries/libpgf/default.nix
+++ b/pkgs/development/libraries/libpgf/default.nix
@@ -6,7 +6,8 @@ let
   version = "6.14.12";
 in
 stdenv.mkDerivation {
-  name = "libpgf-${version}";
+  pname = "libpgf";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix
index bf516b33d02af77cd4da8a08001b418ee0503d51..63035f74ea0ee60e446ef071c1dd3bb43894ceb7 100644
--- a/pkgs/development/libraries/libpinyin/default.nix
+++ b/pkgs/development/libraries/libpinyin/default.nix
@@ -12,7 +12,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "libpinyin-${version}";
+  pname = "libpinyin";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index d622584c9da4dde7acbc8ece0647cc28da4dbe3b..19b700ca5e305bb6c70104b56c2c95dcd5a3a892 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
   pname = "libplist";
   version = "2019-04-04";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 3b050c3dc6a099145695e4d33a8f934f2c0519bc..09bb0e4aa3f227605ac9a945dad191dec82a9bb9 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -3,7 +3,7 @@
 , SystemConfiguration, CoreFoundation, JavaScriptCore }:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-${version}";
+  pname = "libproxy";
   version = "0.4.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 7d697ee10f172ca952744a6ee4cdbd4941b628a2..60c01565e63e49100842c5ead6aa54eed4d52aed 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }:
 
 stdenv.mkDerivation rec {
-  name = "libpwquality-${version}";
+  pname = "libpwquality";
   version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "libpwquality";
     repo = "libpwquality";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd";
   };
 
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index f175bb6ea6d99eb1279529b9cf8ad0c185de89dc..f1c7874e313e33676c6211d301dad372e111d99d 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -3,7 +3,8 @@
 
 let
   generic = version: sha256: prefix: stdenv.mkDerivation rec {
-    name = "libqmatrixclient-${version}";
+    pname = "libqmatrixclient";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "QMatrixClient";
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 048ba48bb6743e6d1f4192c161f6c1a7cb728bcd..22245f5fa2abd2d638429faf7703fb3cd00e357f 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -8,7 +8,7 @@
 with lib;
 
 mkDerivation rec {
-  name = "libqtav-${version}";
+  pname = "libqtav";
   version = "1.12.0";
 
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 5eb8049437c9f279d8ef5e4d1c3341197c294fba..360b2c15a63282032e42f9bea1988ea52897812d 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lcms2, jasper, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libraw-${version}";
+  pname = "libraw";
   version = "0.19.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index d92b017712d4fe4a6cf7cfa16453a976d9fda1ca..5b39940bb3f734f3af643eadd5db342bc59d74dd 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
-  name = "liblrdf-${version}";
+  pname = "liblrdf";
 
   src = fetchurl {
     url = "https://github.com/swh/LRDF/archive/${version}.tar.gz";
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index c9debe61743d838520a76ebbf852d206401d5877..e365ec7a01aca4671bfa0d770a730e4182d26b36 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
   version = "0.6.0";
-  name = "libre-${version}";
+  pname = "libre";
   src = fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
     sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf";
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 3805965d11ca9e757830fcad7d6bb0b4edd3489a..468bcfb0a18fe778a61b61f95fc919e41641d1a6 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "librealsense-${version}";
+  pname = "librealsense";
   version = "2.25.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 50c20d12ccc8e37dc8a86dde6f3fae4b3eb847ef..aeda663342e4a308134c8f00a7f583a602dec77e 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
   version = "0.6.0";
-  name = "librem-${version}";
+  pname = "librem";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
     sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1";
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 2f78222cebb137b1dc654baa4ad312db19cb0759..f11a7eb1fe542b50035688e01c43d649dcd29591 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "librep-${version}";
+  pname = "librep";
   version = "0.92.7";
   sourceName = "librep_${version}";
 
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 7fbe25addc038d5cbb635a6ac00271af29b674b7..71b8d2bb20e6a9d827854e3bd07f1e4900ba1bae 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -3,11 +3,11 @@
 let
 
   generic = { version, sha256 }: stdenv.mkDerivation rec {
-    name = "libressl-${version}";
+    pname = "libressl";
     inherit version;
 
     src = fetchurl {
-      url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+      url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index e4e96df86c16aae4476e4e4c5baa0586384c95ca..79b05619ac5937f4a541937132cdb2ef10787a83 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
 
 stdenv.mkDerivation rec {
-  name = "librsync-${version}";
+  pname = "librsync";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix
index 479da52f8d9b6ecb570500f4c6620161e77d6327..b9ae1f829a1b8152eacf457553a970e189aa6580 100644
--- a/pkgs/development/libraries/libscrypt/default.nix
+++ b/pkgs/development/libraries/libscrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "libscrypt-${version}";
+  pname = "libscrypt";
   version = "1.21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 785dac4aef290a38cf6d323b781553ca02d3d461..b2a79967477165b4f1da11f320527a3e3e1154f0 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.0";
-  name = "libsearpc-${version}";
+  pname = "libsearpc";
 
   src = fetchFromGitHub {
     owner = "haiwen";
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 6b38bcf2c77897ef267b177ea4506c460ab11ee4..8c9c6ac107ce13058d9e957712800defdf206c13 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, getopt, makeWrapper, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "libseccomp-${version}";
+  pname = "libseccomp";
   version = "2.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 82caacf93e6abf3373d154e3b112de3e44b7253d..970c4aff246e22d1eb8624baccc44545fbb34de9 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -9,10 +9,9 @@ stdenv.mkDerivation rec {
   minor = "8";
   level = "7";
   version = "${major}.${minor}.${level}";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
+    url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz";
     sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da";
   };
 
diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix
index 2da5d68d1174a0885a542091d1d2c0c054cc3aa1..bc34318d0a9189c2af368dd18b5fddcb232de3fc 100644
--- a/pkgs/development/libraries/libsieve/default.nix
+++ b/pkgs/development/libraries/libsieve/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   version = "2.3.1";
-  name = "libsieve-${version}";
+  pname = "libsieve";
 
   src = fetchurl {
     url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 34d959423a36aca2ff459559c277ce99fdccc73a..561b547a8d7aa09416cd6228984d6032cb7712d3 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
   version = "1.8.2";
-  name = "libsixel-${version}";
+  pname = "libsixel";
 
   src = fetchFromGitHub {
     repo = "libsixel";
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index 19ebbd363e1ec09cf5d7e1a9c06f39e2f57deffe..d0f822a23f5a55d6dfa04ac3a7f0215710e3745c 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -4,7 +4,7 @@
   libgee, json-glib, skk-dicts, libxkbcommon }:
 
 stdenv.mkDerivation rec {
-  name = "libskk-${version}";
+  pname = "libskk";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
index 25f2a1e0846b3d0a9d054645232ab10cde26d3b3..208aa6c9d6161f5d6525607c4e7b48202e252b75 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -1,11 +1,11 @@
 { stdenv , fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsmi-${version}";
+  pname = "libsmi";
   version = "0.5.0";
 
   src = fetchurl {
-    url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz";
+    url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz";
     sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj";
   };
 
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 8ffae53be1965ef93bf6a6ea6c09962923747c47..263623c3d37cf8c455bc4389413f6e89bd38b006 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version  = "0.7.5";
-  name = "libsolv-${version}";
+  pname = "libsolv";
 
   src = fetchFromGitHub {
     owner  = "openSUSE";
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index f53db7241cf743994160d236ad0040e050ae49be..e7ec858cc7b38e0afb47996efe6388848a42749d 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "libsoundio-${version}";
+  pname = "libsoundio";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 52a52e7e73240a572169362e9bf3162db07bc341..5f88ba80cd6afdee8df559b92a8f42688a567518 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,12 +3,11 @@
 , libpsl, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libsoup";
   version = "2.66.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx";
   };
 
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
index 8018b84a52bed73d33ed302ae0073b95feba7ed8..bdca44dc7d0307f7df52d0c6ce9cc7ab366a8276 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -3,7 +3,8 @@
 let version = "1.8.5"; in
 
 stdenv.mkDerivation rec {
-  name = "libspatialindex-${version}";
+  pname = "libspatialindex";
+  inherit version;
 
   src = fetchurl {
     url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
index 00579600cb76d1859dc8a61582d81573cee0303d..5f547a973707c9f2720c9c49dfaefb41fdb4a1b6 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -1,10 +1,10 @@
 {stdenv, pkgconfig, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libspiro-${version}";
+  pname = "libspiro";
   version = "0.5.20150702";
   src = fetchurl {
-    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
   };
 
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 5bae04a88f94b8b7e7a0381a988cadf80ae0c7a9..9ef3d66541384463d178aaff83a2c85f2d625702 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -8,7 +8,8 @@ in
 if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux")
 then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
 else stdenv.mkDerivation {
-  name = "libspotify-${version}";
+  pname = "libspotify";
+  inherit version;
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -61,7 +62,8 @@ else stdenv.mkDerivation {
       then throw ''
         Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly
       '' else stdenv.mkDerivation {
-        name = "libspotify-samples-${version}";
+        pname = "libspotify-samples";
+        inherit version;
         src = libspotify.src;
   nativeBuildInputs = [ pkgconfig ];
         buildInputs = [ libspotify readline ]
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix
index 7d9ea25e9d2663c52e02e7e6ae93efc1b8e6541c..f8fc6a446d187384201798c2f50f7ea3a33432d5 100644
--- a/pkgs/development/libraries/libsrs2/default.nix
+++ b/pkgs/development/libraries/libsrs2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsrs2-${version}";
+  pname = "libsrs2";
   version = "1.0.18";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index c1e6a1f7fb89ba5ae85bf254f4850ea2f83f3c8d..0ef96f67505544fae6341f73d2955be8a3a17958 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }:
 
 stdenv.mkDerivation rec {
-  name = "libstrophe-${version}";
+  pname = "libstrophe";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 6eb8b6b1a8e9d09714df2d31698660ef41cfb94d..fcd010b46cc3822d0ec162addeff0270841d3b65 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libsvm-${version}";
+  pname = "libsvm";
   version = "3.23";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index 29d83bcd9d70cee4f48a0cc98b363a92449b552e..ca0407bd0aa0eb9b24ac167d081ff91d291890d9 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "libtap-${version}";
+  pname = "libtap";
   version = "1.12.0";
 
   src = fetchurl {
-    url = "https://web-cpan.shlomifish.org/downloads/${name}.tar.bz2";
+    url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
   };
 
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index f2cb879b3e073aa88d82267a945adecb6c431737..c4614103b3fe535f3f5becad64cbcfc319e27144 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.20";
-  name = "libtar-${version}";
+  pname = "libtar";
 
   # Maintenance repo for libtar (Arch Linux uses this)
   src = fetchgit {
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
index 4e859c282276c948a3e67957bc6eac987ede8d65..7a25980a38b99ef555d6462c53423dde1bf83edb 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "libtcod-${version}";
+  pname = "libtcod";
   version = "1.5.1";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix
index 0bc619051c692f819b2a22ee866ab08cc5cfe299..139de830972fd6f83aabe2f79ccbda4d5c999810 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/pkgs/development/libraries/libtelnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libtelnet-${version}";
+  pname = "libtelnet";
   version = "0.21+45f2d5c";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 7261fb7b6b745a4f56415c40910b9f16c7707c89..38a09218dd1d48ee3d06f419c915bf4b3edf34da 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "libtermkey-${version}";
+  pname = "libtermkey";
 
   version = "0.20";
 
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 55c747540f775c5a79863d490760b5a442ef0008..093d6a185443db850a3e77f8b2ee0da75ae9e7f6 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.0.10";
-  name = "libtiff-${version}";
+  pname = "libtiff";
 
   src = fetchurl {
     url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index f9e7f9684bac5071f828e86f8fdf1c6e6e60c10c..6520ddd0a9e287cbb6504a31f95b6f0fd5ecd703 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libtomcrypt-${version}";
+  pname = "libtomcrypt";
   version = "1.18.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix
index a90377dad34a23a5ae71f96231f3bba77efd2032..8ce82bcf07c75b05c566f01ea403878a080fc396 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/pkgs/development/libraries/libtommath/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libtommath-${version}";
+  pname = "libtommath";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 046229e8f1d7a90f2a0394c6d9dda413b8d262ff..26605eb41dbde34a1c6264fb596ab95170e52783 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -11,7 +11,8 @@ let
   boostPython = boost.override { enablePython = true; inherit python; };
 
 in stdenv.mkDerivation {
-  name = "libtorrent-rasterbar-${version}";
+  pname = "libtorrent-rasterbar";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "arvidn";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 50fdbf2a81f7445a2d15586db1e5772b21ecd907..9bccff49b5404c6c03347c487f867ea663bfd058 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -4,7 +4,8 @@
 let
   generic = { version, sha256 }:
   stdenv.mkDerivation rec {
-    name = "libtoxcore-${version}";
+    pname = "libtoxcore";
+    inherit version;
 
     src = fetchFromGitHub {
       owner  = "TokTok";
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index b0be3cb3c12d4a676b289153a9f95d18accd9be4..5ac456a60f61669b2ccff2536a88f3c037310067 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -3,10 +3,11 @@
 let version = "1.0.1"; in
 
 stdenv.mkDerivation rec {
-  name = "libtxc_dxtn-${version}";
+  pname = "libtxc_dxtn";
+  inherit version;
 
   src = fetchurl {
-    url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+    url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2";
     sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
   };
 
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index aad8ae00c11485e435d505a31012790cfbdb33ed..9a3671c32589754b51b895779d5040d57abc1ccd 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0"; in
 
 stdenv.mkDerivation rec {
-  name = "libtxc_dxtn_s2tc-${version}";
+  pname = "libtxc_dxtn_s2tc";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix
index 3b45d4de8842c1e4eaf4935c78e02511c7242990..7080edcd7380d03034359126e89f734432a9f7c0 100644
--- a/pkgs/development/libraries/libuecc/default.nix
+++ b/pkgs/development/libraries/libuecc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7";
-  name = "libuecc-${version}";
+  pname = "libuecc";
 
   src = fetchgit {
     url = "git://git.universe-factory.net/libuecc";
diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix
index e21f9400848d8ab8a085787d80c0e34b1f91497e..35ec5dfed7cdc385fa3062171f04bd2279235398 100644
--- a/pkgs/development/libraries/libunarr/default.nix
+++ b/pkgs/development/libraries/libunarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libunarr-${version}";
+  pname = "libunarr";
   version = "1.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
index 50bc05395895d6081ce3927d69f5af856db93a6a..7e75954fb45e47f6cbfb95651647e2068d2b9ffd 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libunibreak-${version}";
+  pname = "libunibreak";
   version = "1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz";
     sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn";
   };
 
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix
index b302e1d0ba032d52f43644fb1fef8c2f81e1e80a..b315d0f16b0430acb6b8d75c41d03a7eeacdd056 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   majorVer = "3.0";
   minorVer = "2";
   version = "${majorVer}.${minorVer}";
-  name = "libunique3-${version}";
+  pname = "libunique3";
   srcName = "libunique-${version}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index e066c07236794d1c5434175358808028fac24731..e02e5228aa4932ce76967a9b331b8b5218cd65ab 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libunistring-${version}";
+  pname = "libunistring";
   version = "0.9.10";
 
   src = fetchurl {
-    url = "mirror://gnu/libunistring/${name}.tar.gz";
+    url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz";
     sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8";
   };
 
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 9bea14bd8e859a603b15a794b53eaf83d3f4d228..70e6b698ec5d17de34c480c636f18838577600e7 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, xz }:
 
 stdenv.mkDerivation rec {
-  name = "libunwind-${version}";
+  pname = "libunwind";
   version = "1.3.1";
 
   src = fetchurl {
-    url = "mirror://savannah/libunwind/${name}.tar.gz";
+    url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
     sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3";
   };
 
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 90be77401141b28056924b35c4bc13725ba9e482..3ed45e788c4031c48e93a3d677308197a1d93d8a 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.11.1";
-  name = "liburcu-${version}";
+  pname = "liburcu";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 7d595db85dd1f2635d0a943bcb6cf5999df98535..855c6ce280ecb13401983b7f7c4c2e8c4aab0b42 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "liburing-${version}";
+  pname = "liburing";
   version = "0.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index d9e008af9770c13bf3b4eaaea3a3a52960a14a44..debccb9087d6501b485eeec3b12e69fbea2e5bf0 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "libusbmuxd";
   version = "2019-03-23";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
index f9703e3c59320d89896b04676c21dca4832981ac..ff2044242b9ff0a077678db800fbaffaf19065b1 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "libutempter-${version}";
+  pname = "libutempter";
   version = "1.1.6";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 9883de59feb1a8fa1e6abed2e173e12430a0ad18..c604ce71cb724a18888d4953f5b2eed8ebccffd8 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-utils-${version}";
+  pname = "libva-utils";
   inherit (libva) version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
index 6a067244543080c3d35b956327ac089786f1de8b..9b12f83bcb83054295a2e193d1f176d47eab8e4e 100644
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-${version}";
+  pname = "libva";
   version = "1.7.3";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2";
     sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
   };
 
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 50b995a03568606973c242058fb0a8d7adb42683..039e3308f8873eb42900dc3221e0ed8be1e3187c 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -2,7 +2,7 @@
 , libXext, libvdpau, glib, libva, ffmpeg, libGLU }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-va-gl-${version}";
+  pname = "libvdpau-va-gl";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index d68422260144534bd979c51c9acf085a1d036cc4..792a31bcf9f9f141de47eaf495307c445b3b9582 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, xorg, mesa }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-${version}";
+  pname = "libvdpau";
   version = "1.2";
 
   src = fetchurl {
-    url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2";
+    url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2";
     sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06";
   };
 
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 125259a6bee9a75ee64814343b20c06817377d81..0556e311736a3dbad6d6ee73f5c58382ee08f856 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -16,13 +16,13 @@ with stdenv.lib;
 let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
-  name = "libvirt-${version}";
+  pname = "libvirt";
   version = "5.4.0";
 
   src =
     if buildFromTarball then
       fetchurl {
-        url = "http://libvirt.org/sources/${name}.tar.xz";
+        url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
         sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
       }
     else
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index 5cb1c673be5048ea1d7796c2c0a5bd5746e2bda0..b807691671fdac0286460c8d35161bd2bc59fffe 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvisio-${version}";
+  pname = "libvisio";
   version = "0.1.7";
 
   outputs = [ "out" "bin" "dev" "doc" ];
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz";
     sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg";
   };
 
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 44b2a81b2d3c815eb64c98813377cb14867b64d0..e49ab9b38a0464a6571d70e828e10764aa86642b 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -13,7 +13,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libvmi-${version}";
+  pname = "libvmi";
   version = "0.12.0";
   libVersion = "0.0.12";
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index cd0cc9798fa08d4919afa97b2f0c5973f0d2fcc1..ee36365c03ff4efe3d848ff3a59c9f5eb2a10ec6 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -55,7 +55,7 @@ assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
 assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
-  name = "libvpx-${version}";
+  pname = "libvpx";
   version = "1.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index a1e10b6d003d6dfd859a3916472d8ffce599c6fc..a4f0a44e60bf5a280dff8a928cb3269a55c41b0e 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }:
 
 stdenv.mkDerivation rec {
-  name = "libwacom-${version}";
+  pname = "libwacom";
   version = "0.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index c11f70290a4a0a66cda45981941e2b72ddf9746c..fc9932567cfa3d941397566e296dc18544b835f4 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -26,11 +26,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libwebp-${version}";
+  pname = "libwebp";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
+    url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz";
     sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2";
   };
 
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 144bde9a23a99ec37e3d26918ad8fb8d57566b84..a297bf61f7868fee32a67eed74b1e7f737d4d79e 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
 
 stdenv.mkDerivation rec {
-  name = "libwebsockets-${version}";
+  pname = "libwebsockets";
   version = "3.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix
index 2af550c7d99aef5d1ea0743906c9764c5e090507..18f6d37768abf18f5eed9444f96aaa208bf09e2b 100644
--- a/pkgs/development/libraries/libwhereami/default.nix
+++ b/pkgs/development/libraries/libwhereami/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
-  name = "libwhereami-${version}";
+  pname = "libwhereami";
   version = "0.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 76ac946d61876b3b5f39ab02ab6059df6d10ab7d..e8f397548853aea2b7819718cecca0909d180a54 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libwps-${version}";
+  pname = "libwps";
   version = "0.4.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libwps/${name}.tar.bz2";
+    url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2";
     sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4";
   };
 
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index d56c20cb75afd146d9d8307bb9ddf40af88b78fe..271823ace288393d49a6fc4158ebc5930e08b112 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libx86-${version}";
+  pname = "libx86";
   version = "1.1";
   src = fetchurl {
-    url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz";
+    url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz";
     sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
   };
   patches = [./constants.patch ./non-x86.patch ];
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index 2e00b5b5ab9cca9b8142b4bb96867f3f457a9141..f361b3e1b1f7a1923a1f30e1dc6cde2a932b3684 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libx86emu-${version}";
+  pname = "libx86emu";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 7bd89b44d889d3557099f6b1c23c848de73fb165..fede13fcd9b44b3269dc8398d9d4ff9c4ecc3917 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -4,7 +4,8 @@ let
   version = "4.3.4";
 
 in stdenv.mkDerivation {
-  name = "libxc-${version}";
+  pname = "libxc";
+  inherit version;
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
     sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8";
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index b4ad501c2efe77ccdf5adf159b0d70c516b1d0a0..fb1f4b29423f9722bed0a8395e2aa41916f8a121 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libxcomp-${version}";
+  pname = "libxcomp";
   version = "3.5.99.16";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 773389e60f5469703807e6cfd6640eec34dd1179..9408b0c45877f4d0a373ad21e3d377059c35ff46 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -5,11 +5,12 @@ let
   version = "5.4";
 in
 stdenv.mkDerivation rec {
-  name = "libxklavier-${version}";
+  pname = "libxklavier";
+  inherit version;
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/git/libxklavier";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
   };
 
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index a2a576edc0f7f393592ec808c16c8ade9747094d..126589966464a4bb0269e6a576b449572d6a23d2 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "libxls-${version}";
+  pname = "libxls";
   version = "1.5.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 33f818f7d62c5f0b973482fee534d44328f20e4f..04954f3e1f5fbe25a46b667bb8b707271a39d94e 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -10,11 +10,11 @@ let
   python = python2;
 
 in stdenv.mkDerivation rec {
-  name = "libxml2-${version}";
+  pname = "libxml2";
   version = "2.9.9";
 
   src = fetchurl {
-    url = "http://xmlsoft.org/sources/${name}.tar.gz";
+    url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
     sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
   };
 
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index cb93ec63e6700b06cd1d43b4d461542b2274567f..9eb891544b5f1a5fe24439e1cdd5905cbe18dc32 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libxnd-${version}";
+  pname = "libxnd";
   version = "unstable-2018-11-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 2dde7fe32efb86344558b39d941e51f9714dc186..1a3efee176a0f0c232f0ca85800574d228406eae 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -11,10 +11,9 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libxslt";
   version = "1.1.33";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "http://xmlsoft.org/sources/${name}.tar.gz";
+    url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
     sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
   };
 
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index af665c6d9a4a87254d2119f7ae38073b7b9565f5..75b377ff8d4d7a4f66e2f145cf52fed92e90e1f8 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libyaml-cpp-${version}";
+  pname = "libyaml-cpp";
   version = "0.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
index 710e7a3f0729c5695f731472e199536c5207c4ce..e46064ae56e93b18e14b0ab7dbca124e30e8a32b 100644
--- a/pkgs/development/libraries/libytnef/default.nix
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "libytnef-${version}";
+  pname = "libytnef";
   version = "1.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index f3cbddf1ec41d7f8374145954d650c03c8256d0d..b16d897fb5f263fe5e127c9d4a47703885daca99 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec
 {
   version = "3.1";
-  name = "libzdb-${version}";
+  pname = "libzdb";
 
   src = fetchurl
   {
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index afa7696aca9913381618054e50a6acdebd98d8d2..fbbfb5364b0a0493f62c24d554859c010126ccc5 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.37";
-  name = "libzen-${version}";
+  pname = "libzen";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
     sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn";
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 50ed00711df7b5a557cfc8b8c37786503cdad8da..43a5f7dc841322ca7593e9be627d161b8bb4b47c 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libzip-${version}";
+  pname = "libzip";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "https://www.nih.at/libzip/${name}.tar.gz";
+    url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
     sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9";
   };
 
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index 1413da4a18dbad7d01e73f5ddda4cfdb494e4b7b..85b9308237fe3a6d227f639aeba1cbb9e4f1634f 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "libzmf";
   version = "0.0.2";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz";
     sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197";
   };
 
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 3f963c7ca19a8f1f8dd63ea8790e43d8c2b25123..8a5026e307f65775a91672fddbe7db7acd63cbae 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "lightning-${version}";
+  pname = "lightning";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "mirror://gnu/lightning/${name}.tar.gz";
+    url = "mirror://gnu/lightning/${pname}-${version}.tar.gz";
     sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v";
   };
 
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index ab0e51bae2616c28da2a966bda4057fe772fb55f..7f82d49462c5858168c71dd4f82cbc45223a150c 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "lightstep-tracer-cpp-${version}";
+  pname = "lightstep-tracer-cpp";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 9af0c20d70147c8f4226de6b128050d17082d3c0..f5cb197dfe5e84e72e47ca292d4f09cfa8fef99e 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -9,7 +9,6 @@
 , withSage ? false # sage support
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "linbox";
   version = "1.6.3";
 
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 5fa1035868d1b453603f9bcc9b2f86606750ba68..b105aa64bff9aa4fdb0ba4dd2339ee89e31f7cd7 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "linenoise-ng-${version}";
+  pname = "linenoise-ng";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
index 6bbcc725f22f43e402265617c72f32be8b0245f6..857f5247cd51fd6bd8a178962edcd67ed4bd5e10 100644
--- a/pkgs/development/libraries/linenoise/default.nix
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "linenoise-${version}";
+  pname = "linenoise";
   version = "1.0.10";  # Its version 1.0 plus 10 commits
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 99ea6343d70fd7b6449e90e199f27bfa7f1d8ed9..8b0aecdab168600add94e5063a936d1111c9cbed 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "liquid-dsp-${version}";
+  pname = "liquid-dsp";
   version = "20170307";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index ff77cd71265ee26bd8fd47063d3dcaa082aed38e..57dcb3ee6a6a1019c93abd4ee6061c39468dea48 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -2,7 +2,7 @@
 
 # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
 stdenv.mkDerivation rec {
-  name = "live555-${version}";
+  pname = "live555";
   version = "2019.08.16";
 
   src = fetchurl { # the upstream doesn't provide a stable URL
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 690a42cfb30686eeef21881084a4f675a174da70..830ec7bdaee26abed0c6d31cd5ae766a675962f2 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lmdb-${version}";
+  pname = "lmdb";
   version = "0.9.24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 232a67c23f3b3cf5b99b7199e821aa51c9309f78..f4ecba7ad1e474ad5ea613742c8961a29c973414 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -3,7 +3,7 @@
 , lmdb }:
 
 stdenv.mkDerivation rec {
-  name = "lmdbxx-${version}";
+  pname = "lmdbxx";
   version = "0.9.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix
index f0904726eedfb14e6b661db39b0b16e1d4a6c80d..c4e55b14407ca1c25a6955b765869e193c90813e 100644
--- a/pkgs/development/libraries/loadcaffe/default.nix
+++ b/pkgs/development/libraries/loadcaffe/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}:
 stdenv.mkDerivation rec {
-  name = "loadcaffe-${version}";
+  pname = "loadcaffe";
   version = "0.0pre2016.08.01";
   buildInputs = [cmake torch protobuf protobufc];
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 8e8541564245b3b42e12ed2ad7902ca9e2ca747a..04b91e5d80fb4da47e7bc78907953f86b12946bf 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "log4cxx-${version}";
+  pname = "log4cxx";
   version = "0.10.0";
 
   src = fetchurl {
-    url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz";
+    url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz";
     sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
   };
 
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index b2fba7df509bdd11e9853ef8125b535854cd4aa6..ab8c2c9385f8961873aa4f97ab8f3378eb0eb6db 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "log4shib-${version}";
+  pname = "log4shib";
   version = "1.0.9";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix
index 2ff927048ad5ed41f91bf6f9df69e0d484f2c7d4..631233f0ecbe65262dcbf354248ca66609f68053 100644
--- a/pkgs/development/libraries/loki/default.nix
+++ b/pkgs/development/libraries/loki/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "loki-${version}";
+  pname = "loki";
   version = "0.1.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index cad5d0d7ecad96256f67e8d5259548f8c415ad98..e00fc07480e25ed14ec4f08d4e6983a75b21dcd5 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.3";
-  name = "loudmouth-${version}";
+  pname = "loudmouth";
 
   src = fetchurl {
-    url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2";
+    url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2";
     sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl";
   };
 
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index c45fa6bc61aab503f6b56dce5e7014601104caea..32eec84e69ef82df5f012403aa9703433ad26289 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, boost, gtest }:
 
 stdenv.mkDerivation rec {
-  name = "lucene++-${version}";
+  pname = "lucene++";
   version = "3.0.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix
index 8a8a004a5e69a4715aecbba306d7ea3d90c48215..7355248b5c5840200b76f720817646d1413c8d70 100644
--- a/pkgs/development/libraries/mac/default.nix
+++ b/pkgs/development/libraries/mac/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, yasm }:
 
 stdenv.mkDerivation rec {
-  name = "mac-${version}";
+  pname = "mac";
   version = "4.11-u4-b5-s7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index c7794b1a8bfbfdbd84f89abf9d2265a89c8e0c75..04f2208a35dab7b8aca5753e177836c83d3ac0ca 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mailcore2-${version}";
+  pname = "mailcore2";
 
   version = "0.6.3";
 
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 3a90a4cdf33ef5fab6d632c523cdba9a5933264d..1feea915c025c641940a3cbd9d1dc0a1219071e3 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mapnik-${version}";
+  pname = "mapnik";
   version = "3.0.22";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 064f04f220cd277cfa9eab5931caa928f91ee594..cec9e5adc296a00aa3f2b2f9b468049389b32b0b 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ant, jdk}:
 
 stdenv.mkDerivation rec {
-	name = "martyr-${version}";
+	pname = "martyr";
   version = "0.3.9";
 	src = fetchurl {
-		url = "mirror://sourceforge/martyr/${name}.tar.gz";
+		url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
 		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
 	};
 
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index a72d5a825c6a1664a5fd467485af15bc417ed8e5..a06d082b2269722b5ae6b31c9a536f73ad4a7f41 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -10,13 +10,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-${version}";
+  pname = "mbedtls";
   version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw";
   };
 
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
index 8f0a6317a25710366ed6436e269e2d0541ede3c3..04ebfced52e811d34969c5628d6c2610cf4bea6d 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, hdf5 }:
 
 stdenv.mkDerivation rec {
-  name = "medfile-${version}";
+  pname = "medfile";
   version = "4.0.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index b8a8c64011ca0967282569b0ecdb839d0b70d85d..ebd68134ba55462944ae294eafa1255032242683 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-openh264-${version}";
+  pname = "mediastreamer-openh264";
   version = "0.0pre20160801";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index 94622b8a8f94897ce905655ed1b86113963ef890..902fd92056811e4be2a59b0cfc6b20bd11a72384 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }:
 
 stdenv.mkDerivation rec {
-  name = "glu-${version}";
+  pname = "glu";
   version = "9.0.0";
 
   src = fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2";
+    url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${pname}-${version}.tar.bz2";
     sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz";
   };
   postPatch = ''
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7b1b5a3cfa96ae4e86d65be9900df4ce8cefa681..7610b15296ee0e1db64e2c6e102361b397197554 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,7 +8,7 @@
 , galliumDrivers ? ["auto"]
 , driDrivers ? ["auto"]
 , vulkanDrivers ? ["auto"]
-, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
 , OpenGL, Xplugin
 , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 }:
diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix
index 788d2c5d6188de631c4988973edd1ee815a86b95..0919ee6cd2898ac644b052f29f4fc0dcf6109e32 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -5,7 +5,7 @@ let
   nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform;
 in
 stdenv.mkDerivation rec {
-  name = "microsoft_gsl-${version}";
+  pname = "microsoft_gsl";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix
index 7a06f9277c957f0ca45ed7d9ad3c8cdcbe31d36a..5f4dc5eedde541a477f8a08c03486bb0a138c8a0 100644
--- a/pkgs/development/libraries/mimetic/default.nix
+++ b/pkgs/development/libraries/mimetic/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "mimetic";
   version = "0.9.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url    = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
index 791cc9f3f91198a750f60b2f9a3b8e385833c1fc..3493bc5d967977bceab81890b017df6e7d113207 100644
--- a/pkgs/development/libraries/miniball/default.nix
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "miniball-${version}";
+  pname = "miniball";
   version = "3.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 972cc3e738c747bcb6ae9dcf57d2ced69473e967..5bdacbba11d328ff1448cbe1203b6ad15df81a5f 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mxml-${version}";
+  pname = "mxml";
   version = "3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index a56deff66e44f575e425d09b02f8682a80577c2d..5099991c117f37a0cde2a7516705fc7eae82a0ba 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mlt-${version}";
+  pname = "mlt";
   version = "6.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index f46ec57197fb7711b1d75f247eda64ce4f1e8e66..f017e4452a64327727d2117047943c51e70bcd6d 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -6,7 +6,7 @@
 let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
-  name = "mlt-${version}";
+  pname = "mlt";
   version = "6.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 2a933ef784013d89309c9dbf48afeb325a9d53f8..49116c349a86b99f5a5a489767ced44680dab66a 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mongoc-${version}";
+  pname = "mongoc";
   version = "1.8.0";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 58905cce82aba3d961b560529663267089ad78d9..2bba61975f9d42d714501dd94ee09eb17ab99e3d 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
-  name = "mono-addins-${version}";
+  pname = "mono-addins";
   version = "1.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index ba9e2a741e40b1d4ed8a1e88009f6656d7536864..89db7344f99516caf7c4d5d8b50f77086c26a842 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which, pkgconfig, mono }:
 
 stdenv.mkDerivation rec {
-  name = "mono-zeroconf-${version}";
+  pname = "mono-zeroconf";
   version = "0.9.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix
index 51591c9d8e8bef18a629a8eea6620781a08fe056..ba61cb8414a10bdc623b5afc4959fb26609f3a04 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/pkgs/development/libraries/motif/default.nix
@@ -8,11 +8,11 @@
 # refer to the gentoo package
 
 stdenv.mkDerivation rec {
-  name = "motif-${version}";
+  pname = "motif";
   version = "2.3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/motif/${name}.tar.gz";
+    url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz";
     sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs";
   };
 
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 96444ea4a23c4f347fb59dfe106a37f4feaf00c4..8162d3bb911df86d31309b5457f2b88cf39b9f43 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "movit-${version}";
+  pname = "movit";
   version = "1.6.3";
 
   src = fetchurl {
-    url = "https://movit.sesse.net/${name}.tar.gz";
+    url = "https://movit.sesse.net/${pname}-${version}.tar.gz";
     sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb";
   };
 
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index 6b607e94bd494fa96c12b5a405d9abfb77672a19..baefab487e520dd5c87cef6338a14fbb3f763361 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, mpfr}:
 stdenv.mkDerivation rec {
-  name = "mpfi-${version}";
+  pname = "mpfi";
   version = "1.5.3";
   file_nr = "37331";
   src = fetchurl {
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index e32c83af8a7563260da5ade5603f40844083126c..a91d220be33e650063cd3973dd65bb9005f5b89d 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "4.0.2";
-  name = "mpfr-${version}";
+  pname = "mpfr";
 
   src = fetchurl {
     urls = [
       #"https://www.mpfr.org/${name}/${name}.tar.xz"
-      "mirror://gnu/mpfr/${name}.tar.xz"
+      "mirror://gnu/mpfr/${pname}-${version}.tar.xz"
     ];
     sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx";
   };
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 1c6b8df1511462cc7cff493c2df00af31374aea2..2232bfb9a38b80c869d3c4f018e3c2024e3b659a 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -3,7 +3,7 @@
 } :
 
 stdenv.mkDerivation  rec {
-  name = "mpich-${version}";
+  pname = "mpich";
   version = "3.3.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index fe9cd6f492e5a3a5fb0f718d04dd98d26b0be6da..3b40f02c01c3a043bcbbde7086f6e4dc41297ba6 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
-  name = "mpir-${version}";
+  pname = "mpir";
   version = "3.0.0";
 
   nativeBuildInputs = [ m4 which yasm ];
diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index 1430a3dfca156b5354f9c1224c851f40a709c7f5..3767b22ba0d8286b04174ad217931051cb4f17bc 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "mps-${version}";
+  pname = "mps";
   version = "1.117.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 29ec205d7a11267e2ae93f58c786612ff7741d92..04f84d49f84402dbf23da299b7817f4d21f3a65e 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "msgpack-${version}";
+  pname = "msgpack";
+  inherit version;
 
   inherit src patches;
 
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
index e177694e894e04c45a310ed8686c832895f42171..b200a12ef95450b7721385127228b1868e965bda 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "msgpuck-${version}";
+  pname = "msgpuck";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index ef8525cf54d735a9ebebdbe267da06e2cb4bc721..da41aceeef527e4f7d2db4507629142d6c6d4eec 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -2,7 +2,7 @@
 , boost, openssl, zlib, libsodium, olm, nlohmann_json }:
 
 stdenv.mkDerivation rec {
-  name = "mtxclient-${version}";
+  pname = "mtxclient";
   version = "0.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 53f348f93f8ea350f5e4813af8a64d71dac739cb..d058322660cf014b07600d07773526f19890483b 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "muparser-${version}";
+  pname = "muparser";
   version = "2.2.3";
   url-version = stdenv.lib.replaceChars ["."] ["_"] version;
 
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index f4a869255f8c157a6c47285e56c5357d2a91a572..0907f0174c99554913f5df952a9a954f417b56fd 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -4,7 +4,7 @@
 let
   renderSystem = if withOgre then "3" else "4";
 in stdenv.mkDerivation rec {
-  name = "mygui-${version}";
+  pname = "mygui";
   version = "3.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index f29fb9564f316ff1860e45eeb742b88827f0b4db..5c0238fe41ea2aff52e31144853247d1983688d5 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.0";
-  name = "nanoflann-${version}";
+  pname = "nanoflann";
   
   src = fetchFromGitHub {
     owner = "jlblancoc";
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 8f72b333aa480b5cf16f05ca724d3a816299b701..94bc8186f30c8d55d205df0c0048c34258ef00c6 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
-  name = "nanomsg-${version}";
+  pname = "nanomsg";
 
   src = fetchFromGitHub {
     owner = "nanomsg";
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 55e9f44eae3184382c5ef9274a0cf09ff1595f37..c842eac4311e6f4122184349e05583330637df70 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.8.1";
-  name = "nco-${version}";
+  pname = "nco";
 
   buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ];
 
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index cbe1f98405939dd4b69aa851de2feda5bd688e1e..7f08d0a753513dd22d07ee35a9cc354c1678852e 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.6.3";
 in
 stdenv.mkDerivation {
-  name = "ndn-cxx-${version}";
+  pname = "ndn-cxx";
+  inherit version;
   src = fetchFromGitHub {
     owner = "named-data";
     repo = "ndn-cxx";
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index 913a4a087a97b78a377bba750930d9a85b6583ff..83d01f85d0a45b6282d5a0d2f6a91ae8ded68c02 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -3,7 +3,8 @@
 let version = "2.8"; in
 
 stdenv.mkDerivation rec {
-  name = "ndpi-${version}";
+  pname = "ndpi";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ntop";
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index 87f9b5effacd12fc5cd8e6ccb7e70afe0829ab08..fbffb138e969d5db2eb8a18b5bb46d886141dda5 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -15,10 +15,10 @@ in
 
 stdenv.mkDerivation rec {
   version = "0.29.6";
-  name = "neon-${version}";
+  pname = "neon";
 
   src = fetchurl {
-    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
     sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
   };
 
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 61a40753a56f03ade1f08f4e69f5c017db933f0c..ffefc8e51c4d6c7d75e029e7f90ca4be6b1eb11f 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -15,10 +15,10 @@ in
 
 stdenv.mkDerivation rec {
   version = "0.30.2";
-  name = "neon-${version}";
+  pname = "neon";
 
   src = fetchurl {
-    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
     sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
   };
 
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index a57884912baea8120b647c03b3a73d1207f17589..665145a92ac4111f03c8cad5986a85e0df251581 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, netcdf, hdf5, curl }:
 stdenv.mkDerivation rec {
-  name = "netcdf-cxx4-${version}";
+  pname = "netcdf-cxx4";
   version = "4.3.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index bb621a3eda6c522aa0beba55b42d0862312635a4..c9c52636a5b74bebf66ebe6937f083deea31b19c 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
 stdenv.mkDerivation rec {
-  name = "netcdf-fortran-${version}";
+  pname = "netcdf-fortran";
   version = "4.4.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index cc5a115ed71e4c6f5d8b0f385eb02b2a16010f85..442fcf2e7615023aac7b91a50a1f1b599b5b48a6 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
 let version = "6.0.0"; in
 stdenv.mkDerivation {
-  name = "nix-plugins-${version}";
+  pname = "nix-plugins";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "shlevy";
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index 3c5ae8537a414ed87c0a7a751f7baa75e36baf26..4609fd1a3769380e8b0cade0f2700ecc1a44c763 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -2,7 +2,7 @@
 , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
 
 stdenv.mkDerivation rec {
-  name = "notify-sharp-${version}";
+  pname = "notify-sharp";
   version = "3.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index 43732406064e348b790fbe4934da763418c6373b..2cbf88633e7bbcb8cb063640343cf5fda4ae97d5 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "npapi-sdk-${version}";
+  pname = "npapi-sdk";
 
   version = "0.27.2";
 
   src = fetchurl {
-    url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2";
 
     sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1";
   };
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 4772f1111aca19e5f8d269677cf6b3f1bcd4532d..b62fa1cb704f0dc0258707755be7e9276b8e37c6 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -5,7 +5,8 @@
 let version = "4.21"; in
 
 stdenv.mkDerivation {
-  name = "nspr-${version}";
+  pname = "nspr";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index b410686865f2a73ec18184d35de27e2d70d0959f..b7b4ea45d8b01d52bc7a8bd2f9c2ce19607739ab 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
-  name = "nss-${version}";
+  pname = "nss";
   inherit version;
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
+    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
     sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w";
   };
 
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
index dac65e1c2f9a2932ffa7aa18723ad271bc00344b..5ea43097b8cae2fc2df14bfb360a40eb63b2cc7c 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "ntbtls-${version}";
+  pname = "ntbtls";
   version = "0.1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 12d3c9ad9420096f0209d7288f06b3131ced818c..e83fe2e7e7b63efcbee9d079721f785078bef409 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -13,7 +13,7 @@
 assert withGf2x -> gf2x != null;
 
 stdenv.mkDerivation rec {
-  name = "ntl-${version}";
+  pname = "ntl";
   version = "11.3.2";
 
   src = fetchurl {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     perl # needed for ./configure
   ];
 
-  sourceRoot = "${name}/src";
+  sourceRoot = "${pname}-${version}/src";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index c0a73fa984e7fbd73ab72a7b89bb374864c25132..b79f940affa3e2d5ef32ce7225cd4054baa898c6 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -5,10 +5,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntrack-${version}";
+  pname = "ntrack";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
   };
 
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 91318c802d8fbc47c71925d986ee416bcfd5f0e6..db542ec93a92a279d0192eae9a4a7321f7681cb6 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }:
 
 stdenv.mkDerivation rec {
-  name = "nuspell-${version}";
+  pname = "nuspell";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 77167361ff20ef17b49e496dda17f355519dbec1..73b5e3fe772ee4b916d8c8a8e8e5d9e6aa869325 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "nvidia-texture-tools-${version}";
+  pname = "nvidia-texture-tools";
   version = "2.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index abdc7502052baed902c3d0575fe8388180ef3ed5..6cab843a22b101b10cbbba9f230e64408f7cd9c1 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
-  name = "ocl-icd-${version}";
+  pname = "ocl-icd";
   version = "2.2.10";
 
   src = fetchurl {
-    url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz";
+    url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz";
     sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2";
   };
 
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index aa188650860957444a86f6c31276be7776f03f86..a540d89ed3b7dc1040a41563ba545a76a6767dcc 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ode-${version}";
+  pname = "ode";
   version = "0.12";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 42babc32ecdb43fc0d8db9b36d280805a41ef41c..2855d1139c3d4cd126f18722c8f533f559c10b7b 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -11,7 +11,6 @@
 stdenv.mkDerivation rec {
   pname = "ogre";
   version = "1.9.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "OGRECave";
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index f1b6060e1663e75226a09a2e30c8d1bd76f06634..dc3bf8cf0097edff7e964b089d421d4d56be4e01 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -10,7 +10,7 @@
 , withSamples ? false }:
 
 stdenv.mkDerivation rec {
-  name = "ogre-${version}";
+  pname = "ogre";
   version = "1.12.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
index e4045bcd5dc494846487405af179f879052d9cfd..0844c44c8a8bc91f8d188d90a60cea9922251b8d 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }:
 
 stdenv.mkDerivation rec {
-  name = "ogre-paged-${version}";
+  pname = "ogre-paged";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 253d185fa0cdcb31ae99ac7df2627b06b80db50a..15e83cf9d7697d97ecf75d4aea2c39e65401b818 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ois-${version}";
+  pname = "ois";
   version = "${majorVersion}.${minorVersion}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 49daff30e7b564651e6ac0976db783a6823cf3ac..dd3f83a0130db39797d16ad26121bb17b93878da 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "olm-${version}";
+  pname = "olm";
   version = "3.0.0";
 
   meta = {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz";
+    url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz";
     sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c";
   };
 
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index e64d21c87ed0a6bf27fed4ab18855ada20049bc1..8a1e1d37c1d5c7de454eeeb99e8f7800769787f9 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "onig-${version}";
+  pname = "onig";
   version = "6.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix
index b60a53e55ca1beb41b934175de4dfe684826b69b..32b131159572fca947e55da4699838d8e47f66d8 100644
--- a/pkgs/development/libraries/opae/default.nix
+++ b/pkgs/development/libraries/opae/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "opae-${version}";
+  pname = "opae";
   version = "1.0.0";
 
   # the tag has a silly name for some reason. drop this in the future if
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 3c082926e06c78b1c5c9d4eb0b84043fc736aae3..89ac85b752b7f20b62952cd683eaa10a42a26588 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -11,12 +11,12 @@ assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "1.19.1";
-  name = "openal-soft-${version}";
+  pname = "openal-soft";
 
   src = fetchFromGitHub {
     owner = "kcat";
     repo = "openal-soft";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
   };
 
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 81754ffad4d20b1e97f7c949ab19a7ebccf0f295..26bcf3d20ff6312972b7d9d075e5cc45b5dede6e 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "openbabel-${version}";
+  pname = "openbabel";
   version = "2.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 4d3e9e9a04eb1a163791136fec7dcacbd474aadc..5aeb07de9235925d15246ac4e6cd0dde11b7665d 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "0.5";
-  name = "openbr-${version}";
+  pname = "openbr";
 
   src = fetchFromGitHub {
     owner = "biometrics";
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index 2b2fc3ff4d5c2bc304fa09794ccce228bda50205..292b824709b2f821d7d20fbd1cdc20e0fbf0ba9f 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -2,13 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "openbsm";
-  name = "${pname}-${version}";
   version = "1.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}";
+    rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}")}";
     sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
   };
 
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index 613aeddd77bef906f63b1ff82d4027f36e6d2775..5ed2dd5e23d27627d6cad53efaddcf401cf23ed5 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
 
 stdenv.mkDerivation rec {
-  name = "opencl-clhpp-${version}";
+  pname = "opencl-clhpp";
   version = "2.0.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index cd3da4a7960fea036a4717eb4eb2b5866bd61516..9bd25bfb93a83d66128afa3eb6d3697b58c9de6d 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -2,7 +2,7 @@
 , darwin}:
 
 stdenv.mkDerivation rec {
-  name = "opencollada-${version}";
+  pname = "opencollada";
 
   version = "1.6.68";
 
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 3081c6c839c8e7c0fdf8854c30aa9ff6952306bb..cbd05848173a9212a4914277ecddb6a78ff44e82 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "opencolorio-${version}";
+  pname = "opencolorio";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix
index 9a8787ad7f49eb69328a9728b75318fad6ede650..e2d34ae5f07bd6a599823a6b3803ef141f8c3140 100644
--- a/pkgs/development/libraries/opencore-amr/default.nix
+++ b/pkgs/development/libraries/opencore-amr/default.nix
@@ -4,7 +4,8 @@ let
     version = "0.1.5";
 in 
 stdenv.mkDerivation {
-  name = "opencore-amr-${version}";
+  pname = "opencore-amr";
+  inherit version;
   src = fetchurl {
     url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 11c66f0d497b1241b29e5f2c4a3d0d3230e5cd44..1fdddf930cfd1c8b7febe5c928828d683136886a 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "opencsg-${version}";
+  pname = "opencsg";
   src = fetchurl {
     url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
     sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix
index 5ad7eecace1b0505e82df4bc6433f24df75605ed..5f1c2b5c6f60a73a2c0c6e736baf7800b3ccb50d 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openct-${version}";
+  pname = "openct";
   version = "0.6.20";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "openct";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2";
   };
 
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 34615f44eb4e1f0dc491e98d17073714966dc42d..d3efb022a0e01d99b7e9bb63dabe9e8698a0ef68 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -141,7 +141,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opencv-${version}";
+  pname = "opencv";
   inherit version src;
 
   postUnpack = lib.optionalString buildContrib ''
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 44bd9c32aef6a79d7e01a9b72edb20d986ca8f59..205a87d78e8fb6d4046a07b109da0c572d6ad201 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -154,7 +154,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opencv-${version}";
+  pname = "opencv";
   inherit version src;
 
   postUnpack = lib.optionalString buildContrib ''
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 784071c6e4d40a78a5d777b86586e82f28e83db2..b91a1489eb697c04f9b3c965d2f4d386c9f20a66 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -19,7 +19,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opencv-${version}";
+  pname = "opencv";
   version = "2.4.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 17e2c9098a10891d98ac2b27bdc3ceb351a99188..775695901425a72472c0933f2d96dfad2d485f2b 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opendht-${version}";
+  pname = "opendht";
   version = "1.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index 71885ba46f10d0b736608d68dd45bc72dea94bda..66496af12f93ff0dcb7e061574ef7e72928aa203 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -2,11 +2,11 @@
 , autoreconfHook, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "opendkim-${version}";
+  pname = "opendkim";
   version = "2.10.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
+    url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz";
     sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
   };
 
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 072848d7bbcad9cb4f9e091c8086c4a6979c0e68..9eef138c532e6dfe5aae954086f05621b129727d 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -6,11 +6,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openexr-${version}";
+  pname = "openexr";
   version = lib.getVersion ilmbase;
 
   src = fetchurl {
-    url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";
   };
 
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index 099bd8d1e973b43145c663c17d954c740b77deac..5d26063adb61d1a9b59b420bfbc35e58fdd241fe 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "openexrid-unstable-${version}";
+  pname = "openexrid-unstable";
   version = "2017-09-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index cd3210dd08b1cbf049ce8fb3a9e95efc0a9e4296..6554d025311b91bdd6bd7cf1373d892dfc221b18 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "openfst";
   version = "1.7.2";
 
   src = fetchurl {
-    url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
+    url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
     sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1";
   };
   meta = {
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix
index 42edb1958ce0107c3b906a5337a35d0810b08bc0..abc60f026e578b469684697826eafc748a74eeb7 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/pkgs/development/libraries/openfx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "openfx-${version}";
+  pname = "openfx";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index c8208ce27bae872c7ab383df34ba3bf56c05aed8..cd91a13259782ca19a79313c25d9c8b87d4522c7 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "openh264-${version}";
+  pname = "openh264";
   version = "1.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index e26f4160921f483c6530c289178a31ac4d0fc7fd..55d003d2d92b4c2f2db8dccb23645d9e1c22240a 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -24,7 +24,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openjpeg-${version}";
+  pname = "openjpeg";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "uclouvain";
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 760fc3e3232991360273e60deb3a1aaba41dca1d..06e4726054e97413f62929dabde688bb2dc83114 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -12,10 +12,11 @@ let
   version = "4.0.1";
 
 in stdenv.mkDerivation rec {
-  name = "openmpi-${version}";
+  pname = "openmpi";
+  inherit version;
 
   src = with stdenv.lib.versions; fetchurl {
-    url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
+    url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
     sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
   };
 
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
index ed646b9e221b3cc173156281fd5afbf9af5ae981..6d53d23ae0e78501d419824c082e39a5d18474e2 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "openpa";
   version = "1.0.4";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz";
+    url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz";
     sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy";
   };
 
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 339f6064999707287bffb21148bff31ec50d71e5..b217527269dde2d72699c73bf5bee73d31265fe3 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "openpam-${version}";
+  pname = "openpam";
   version = "20170430";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz";
+    url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz";
     sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
   };
 
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 9488ef484c6f3ff3eeb7f28ff968704f75937ce8..0edf6dfa728366ba9b69091b4c30d4acbea004ae 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensaml-cpp-${version}";
+  pname = "opensaml-cpp";
   version = "3.0.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index f07ebad9e81040ae64b73de0a6f88b10303417b5..46028d3a7ea48fd0052906eac289285a64863cc7 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssl-chacha-${version}";
+  pname = "openssl-chacha";
   version = "2016-08-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 67b903970d3e8adff97f0b80f158ca4f921da13b..bd4802b8775b4bb930ef40b1277b2a3a8adf5f6d 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -8,10 +8,11 @@ with stdenv.lib;
 
 let
   common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
-    name = "openssl-${version}";
+    pname = "openssl";
+    inherit version;
 
     src = fetchurl {
-      url = "https://www.openssl.org/source/${name}.tar.gz";
+      url = "https://www.openssl.org/source/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 72e532ae782965a947a4c5fe4ef3427d0d6344b4..81ef6a3bf5d12c2d82345e3596ff5a969af420f2 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensubdiv-${version}";
+  pname = "opensubdiv";
   version = "3.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
index 00f4f45df96a8c3eb6b8946f618484993a53679d..f29972a64bd9d7027788a45ebed54150b7cf37ce 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
-  name = "opentracing-cpp-${version}";
+  pname = "opentracing-cpp";
   version = "1.5.1";
   src = fetchFromGitHub {
     owner = "opentracing";
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index af88172c57a1764a10a72092ef1bd68f5564284d..800acebac34c77e067ac50171db28cceb4c36010 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "openvdb-${version}";
+  pname = "openvdb";
   version = "6.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index a986b71bc1dd1b24a91eae4649b40a53b9037476..134ec74d530abb147e761ba0eb6f717ed5033b49 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -2,7 +2,7 @@
 , curl, libxml2, pam, sblim-sfcc }:
 
 stdenv.mkDerivation rec {
-  name = "openwsman-${version}";
+  pname = "openwsman";
   version = "2.6.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 5a5e8ffaef7ca653148a1b1765656b8c3eadb17d..c3407289f020d1cb7cf24851f4e429cd248f39d1 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -6,7 +6,8 @@ let
   version = "2018-11-13";
 
 in stdenv.mkDerivation rec {
-  name = "openzwave-${version}";
+  pname = "openzwave";
+  inherit version;
 
   # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw.
   # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference.
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index ce917ccbe7f4cb0e7229135fd8e996c063a78485..a243b5c0b5163485622220c266d47824f816dcef 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
     sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0";
   };
-  name = "libosip2-${version}";
+  pname = "libosip2";
 
   meta = {
     license = stdenv.lib.licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index a1e7215fd9a28c4f85aaf915c3072eb360345e98..551c70cebcc2c0bb3986bdc3d3063fe96807db17 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,7 +1,7 @@
 { cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "osm-gps-map-${version}";
+  pname = "osm-gps-map";
   version = "1.1.0";
 
   src = fetchzip {
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index 47c6a27639d41af1c9ad5633ffee243dddc9cc1a..67c4e75c1e12a5ea8051dd804b4f28710f5be90c 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pagmo2-${version}";
+  pname = "pagmo2";
   version = "2.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 6fb123f509499773cea103bfcd761423d1ac43e0..44293d52da48560d11e00148c1ac6bf4c0d2e55f 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pangolin-${version}";
+  pname = "pangolin";
 
   version = "2017-08-02";
 
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index b45ed296691621c5a939cbab020775307abfdf06..d90a27ed545874f51dc4f46b8179395104ebf07e 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec
 {
-  name = "partio-${version}";
+  pname = "partio";
   version = "2018-03-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 2050e5cdfe79bb2c70f1aad0f5a4750bc867370d..32fc27f9ab4da032e8d54704ad54bc7db4340499 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -4,7 +4,7 @@
 , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "pcaudiolib-${version}";
+  pname = "pcaudiolib";
   version = "2016-07-19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index 654698c1b32d8e1b84d10ffde867fdb7969d9e43..58fbb26532e2ef18c54fe7ccd7bcfd12d21db3b9 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.94";
-  name = "pcg-c-${version}";
+  pname = "pcg-c";
 
   src = fetchzip {
-    url = "http://www.pcg-random.org/downloads/${name}.zip";
+    url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip";
     sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv";
   };
 
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index f080de82ddc2f258cac456df00aaf14f42ef7619..e27c71314d9752b0df443ddbdeffef9d2e92c227 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pcre2-${version}";
+  pname = "pcre2";
   version = "10.33";
   src = fetchurl {
-    url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
+    url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
     sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m";
   };
 
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix
index 4cc607345e8cdc82487c3d15ff0586c5853f51a6..473fb3bfd4829339bfc5c27b6ad34d0bbb24dc83 100644
--- a/pkgs/development/libraries/phash/default.nix
+++ b/pkgs/development/libraries/phash/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "pHash";
   version = "0.9.4";
 
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 4d68d3718c0ae0a37a7102d053320cf447ca40c6..2dd0cc10c947ce23cc4da9e08ba62b69a33a439a 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -6,7 +6,7 @@
 with lib;
 
 let
-  v = "4.10.2";
+  v = "4.10.3";
 
   soname = if withQt5 then "phonon4qt5" else "phonon";
   buildsystemdir = "share/cmake/${soname}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
-    sha256 = "02c8fyyvg5qb0lxwxmnxc5grkg6p3halakjf02vmwmvqaycb3v9l";
+    sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index 6edea7f51419e0f5344204dee90935d1fe7b898e..cf9e201b3f6add59e83990209051b9edfee68ab2 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -4,10 +4,11 @@
 let
   generic = version: sha256:
   stdenv.mkDerivation rec {
-    name = "physfs-${version}";
+    pname = "physfs";
+    inherit version;
 
     src = fetchurl {
-      url = "${meta.homepage}/downloads/${name}.tar.bz2";
+      url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
index d542c6cf1d777078d8cabd96f05ebedc916f3ebe..5302ad21258a26c5bb1310f8a564b8e087c1c67a 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "apfel-${version}";
+  pname = "apfel";
   version = "3.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix
index 983523e1f2fb123e6716153fe7b9de3e434fd062..2ba87024bc51b98ddbb39e69b5a0e205d3b119e5 100644
--- a/pkgs/development/libraries/physics/apfelgrid/default.nix
+++ b/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
 
 stdenv.mkDerivation rec {
-  name = "apfelgrid-${version}";
+  pname = "apfelgrid";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
index 1ad5dcb8b25b57f21c0a64b3a3f8ed9b06e0ad25..edda5148068ad2ec922fbee76c62a637bc2effb4 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
 
 stdenv.mkDerivation rec {
-  name = "applgrid-${version}";
+  pname = "applgrid";
   version = "1.4.70";
 
   src = fetchurl {
-    url = "https://www.hepforge.org/archive/applgrid/${name}.tgz";
+    url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz";
     sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
   };
 
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f01fab74635b86cc8d8438140449b7965f405e52..2a1846e40a64ae9c1d21d6f3a233c1dfcbc958ac 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2006";
-  name = "cernlib-${version}";
+  pname = "cernlib";
 
   src = fetchurl {
     url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 3828cfda2aff486f631de4a9638ddf214df99aa1..826362cc586b9d9097b869a734c55bf98a95cb5e 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "fastjet-${version}";
+  pname = "fastjet";
   version = "3.3.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index e3291907d31fc7b357e963efb9c738478fb65156..5ef446319a8a89d9f1885172a41d31263b00a08a 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "fastnlo_toolkit-${version}";
+  pname = "fastnlo_toolkit";
   version = "2.3.1pre-2402";
 
   src = fetchurl {
-    url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
+    url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz";
     sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
   };
 
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 5f51c6a194c79a5ebbf143aa442151d78f59d68d..fb108dd7c2572b79b9b7da105d1eff40704089f4 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -37,7 +37,7 @@
 
 stdenv.mkDerivation rec {
   version = "10.4.1";
-  name = "geant4-${version}";
+  pname = "geant4";
 
   src = fetchurl{
     url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index 0b1f3f0490d201de327aad25ed632613c0c22fcb..dd39fbbc84b7a2a3f50a982e52d53f845c14e3ec 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -16,7 +16,7 @@ in
 
 stdenv.mkDerivation rec {
   inherit (geant4_nomt) version src;
-  name = "g4py-${version}";
+  pname = "g4py";
 
   sourceRoot = "geant4.10.04.p01/environments/g4py";
 
diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix
index d61a68ebe341fb3c64a69b72299a526cb31b238f..665cd417dc09c7a3d2948dba5de33195db3c39c6 100644
--- a/pkgs/development/libraries/physics/hepmc2/default.nix
+++ b/pkgs/development/libraries/physics/hepmc2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "hepmc-${version}";
+  pname = "hepmc";
   version = "2.06.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index c4717800f70d4ea3739870f944dd3325c554d58e..3116c4d36bba3802571a8e14ab1d94b7471e52b6 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, coreutils, root }:
 
 stdenv.mkDerivation rec {
-  name = "hepmc3-${version}";
+  pname = "hepmc3";
   version = "3.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 7a146bb7309acb383d108a1911f19e31f3370179..d252e62286b0aa064d20905f2ac079898f1037c5 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "herwig-${version}";
+  pname = "herwig";
   version = "7.1.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
index 9c379f6a3474acfe2d97ac5a167677ea0ed8a470..9e68fbd3fc4d8aa72ba343fda56af03f204a0f98 100644
--- a/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran, perl }:
 
 stdenv.mkDerivation rec {
-  name = "hoppet-${version}";
+  pname = "hoppet";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "https://hoppet.hepforge.org/downloads/${name}.tgz";
+    url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz";
     sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz";
   };
 
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 3ad0b3dc4cc1585ab87ca818f3a8cabf8a9c6c42..dff9fb1c1dd111f0a3aa26f5908e0c56da864d49 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "lhapdf-${version}";
+  pname = "lhapdf";
   version = "6.2.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index b287e52b24313a01636ca54b9d5edcb9db27773b..74b4ba4224e78e5b34bb6fd6414d6f5f42d7737d 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fastnlo, rivet, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "mcgrid-${version}";
+  pname = "mcgrid";
   version = "2.0.2";
 
   src = fetchurl {
-    url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
+    url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz";
     sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
   };
 
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix
index a608a7f6b0f71ab5c288451aa418c842b9a731ab..1518c23718aaad458cab1c5de07e57536582526b 100644
--- a/pkgs/development/libraries/physics/mela/default.nix
+++ b/pkgs/development/libraries/physics/mela/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "mela-${version}";
+  pname = "mela";
   version = "2.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 2f79a2b76ab9c93fb3647ab4d6bab27752c1ae03..20df49d9ae7f3647015f16d09b7ef1de3c7ed616 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nlojet++-${version}";
+  pname = "nlojet++";
   version = "4.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index e6b351c206df7ac2cc765855267e85dd05852a90..0398175a9a28feb9a0c2d9562ba68f89a6e0be44 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "pythia-${version}";
+  pname = "pythia";
   version = "8.243";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
index 620f227250dda4dd91464df75434b730fed19fa1..ad5f994620ff4d3d31dfe423214d22364996b45a 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "QCDNUM-${version}";
+  pname = "QCDNUM";
   version = "17-01-13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index c068424e416ef0f4d15d85ed35aae3f97b8b8aeb..914eee5c286b257a4798d1cbcb9f109d5bb9a1d8 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "rivet-${version}";
+  pname = "rivet";
   version = "2.7.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 272761977bae6b79ddb4ec84ecbcd30836f15f7a..fa293eab3500b5f45d73185fc69275694ce47d79 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "thepeg-${version}";
+  pname = "thepeg";
   version = "2.1.5";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 08afe6d6452216e384d49d8b17551c2476960131..c6c6f742d0bf35181983ec2a63b376c7286bcfff 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "yoda-${version}";
+  pname = "yoda";
   version = "1.7.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index d3bbb86797463ad8be0a6ca05fb97c81468ec9c3..1f9996ec2134611af97f68260e8d9ec950b0c45b 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-${version}";
+  pname = "pixman";
   version = "0.38.4";
 
   src = fetchurl {
-    url = "mirror://xorg/individual/lib/${name}.tar.bz2";
+    url = "mirror://xorg/individual/lib/${pname}-${version}.tar.bz2";
     sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4";
   };
 
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 5cf5d34b9aff6d197c9029f9207c5b8d660c615a..ce511544a42d53264adccd27404ac7a4317486c6 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "pkcs11-helper-${version}";
+  pname = "pkcs11-helper";
   version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
-    rev = "${name}";
+    rev = "${pname}-${version}";
     sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns";
   };
 
diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix
index ceb49fc015386a7642f853c52e7b944289c9aa45..e945154c00343f69881788674d1cd6ef9917f938 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/pkgs/development/libraries/pmdk/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pmdk-${version}";
+  pname = "pmdk";
   version = "1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index 3f6a609121a11702e7d72793a1124690ae604ec0..8509468f59a24878b9df80b0b884be58110304bb 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -4,7 +4,7 @@
 assert docSupport -> doxygen != null;
 
 stdenv.mkDerivation rec {
-  name = "pngpp-${version}";
+  pname = "pngpp";
   version = "0.2.10";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index e766657c19a42228e3b1f891be415f80ddf47762..c19e343f19aec5192c1a26d0f940aace40411eef 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "poco-${version}";
+  pname = "poco";
 
   version = "1.9.2";
 
   src = fetchurl {
-    url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
+    url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz";
     sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd";
   };
 
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 722c1cae8721c6fefd70cd8198f3a714fbfb131e..809159b8c2f107b94e463257429e41cde2b1d7f2 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.6";
-  name = "podofo-${version}";
+  pname = "podofo";
 
   src = fetchurl {
-    url = "mirror://sourceforge/podofo/${name}.tar.gz";
+    url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
     sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
   };
 
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index f790c62f5af23e0ad2c3772270b38e9906990327..ffe7f46b77d8a2d782d2f6f0d407511278b091d5 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "portmidi-${version}";
+  pname = "portmidi";
   version = "217";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 566d88dcdb560766eaf32655936292eb2801145d..8f6adaf03d9be0cd90e22d563d463eda0d06ee6c 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -3,7 +3,8 @@
 let version = "1.2"; in
 
 stdenv.mkDerivation rec {
-  name = "ppl-${version}";
+  pname = "ppl";
+  inherit version;
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index a98521a2d1ee4890d90131906d04a8cc7d7ad0ad..957b59a6f662a2048f71fb012eeed20be79cb558 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -7,7 +7,8 @@
 
 let
 mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
+  pname = "protobuf";
+  inherit version;
 
   # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 1a20d806b968b2ebfcc5f3eb707152cad82f9528..773e31391758ddbb5453571b133648f6fdf58ff6 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
+  pname = "protobuf";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix
index e0c5d4db930578c6c8766548c376e2433016bb36..91c0ae5624e87422bd607760faaed320d2be489a 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-c-${version}";
+  pname = "protobuf-c";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
index 25e0f14d026b9a74c6afa3bb85a7af4e22c835e8..0bbfab62fcd8b6670c295481fd4776d88e8c0743 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "protozero-${version}";
+  pname = "protozero";
   version = "1.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 74c6e8ef1b308b613dbed83c36ecc9d3154e2932..d182517159616115744cdf2305f760fd255bd479 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:
 
 stdenv.mkDerivation rec {
-  name = "pugixml-${version}";
+  pname = "pugixml";
   version = "1.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index b5a01698e5e95e820828e98323872d73bf475e18..66a395801b273bceb4e8702e97a7e0dc999262c7 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libupnp-${version}";
+  pname = "libupnp";
   version = "1.8.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix
index aa1f8d10ba975af9c030f506fbc4a7ba9a46a953..7dfbdc4d64a0a75a6f18a89ca79022c28479bf5e 100644
--- a/pkgs/development/libraries/pybind11/default.nix
+++ b/pkgs/development/libraries/pybind11/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }:
 
 stdenv.mkDerivation rec {
-  name = "pybind-${version}";
+  pname = "pybind";
   version = "2.2.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
index 4b5b7ace074bfddb66ed8eac7d3496fc882c4b17..2b630de14b26c0278b0c3160b821b4c56908162e 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.2";
-  name = "python-qt-${version}";
+  pname = "python-qt";
 
   src = fetchurl {
     url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 885b7b378cc3f8474f9df31b4cde8f40e51ed14c..19b11a60e7b6d91ae914880951496766dac17ba3 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl_1_0_2, cmake, pkgconfig, qt, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "qca-${version}";
+  pname = "qca";
   version = "2.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index a7077c69dd8db721790cd705c0f8f4fd847b5b8d..2156c0e5350a63baeccafd63e1677ee5b178810d 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.0";
-  name = "qjson-${version}";
+  pname = "qjson";
 
   src = fetchFromGitHub {
     owner = "flavio";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index ba62324d586ed6e1c30aa38953313efc07f71171..d3f4a8e88e2ef6992761e504eab6ce2ff7868f8c 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-11-24";
-  name = "qmltermwidget-unstable-${version}";
+  pname = "qmltermwidget-unstable";
 
   src = fetchFromGitHub {
     repo = "qmltermwidget";
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 5bccbf74965a0f5cee992ddd8d1f066c318f594c..789a63bef74d94b26d62e922e2b37b196ffdf55f 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -3,10 +3,11 @@
 let version = "8.4.2";
 in
 stdenv.mkDerivation rec {
-  name = "qpdf-${version}";
+  pname = "qpdf";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz";
     sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9";
   };
 
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 1bc63d0e2b9d5f0a650130c23ee373d906b32dda..7b4addd91617f6a629463c3233f2a33c0953c849 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -59,7 +59,6 @@ let
     qtserialport = [ ./qtserialport.patch ];
     qtwebengine = [
       ./qtwebengine-no-build-skip.patch
-      ./qtwebengine-CVE-2019-5786.patch
     ]
       ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
     qtwebkit = [ ./qtwebkit.patch ]
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index aa3a0fe94898d86b11cf10a9e22bc04a9b2d172c..a4d2fc82ff2d403dce52ccecf5c58181b4454f36 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index aa987acbe92ed7e30e5b84f31f016b87dfec2202..87ed0ddc4d4c425deee4f414a9a3fe17fff87018 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
@@ -1,8 +1,7 @@
-diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
-index 61bea952b2..9909dae726 100644
---- a/mkspecs/common/mac.conf
-+++ b/mkspecs/common/mac.conf
-@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL     = \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf	2019-07-10 09:35:08.917628566 -0500
+@@ -24,7 +24,7 @@
  
  QMAKE_FIX_RPATH         = install_name_tool -id
  
@@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644
  QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
  
  QMAKE_LFLAGS_REL_RPATH  =
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..05e60ff45f 100644
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -21,7 +21,7 @@ load(cmake_functions)
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf	2019-07-10 09:35:08.917628566 -0500
+@@ -21,7 +21,7 @@
  # at cmake time whether package has been found via a symlink, and correct
  # that to an absolute path. This is only done for installations to
  # the /usr or / prefix.
@@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644
  contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
  
  CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-@@ -51,45 +51,20 @@ split_incpath {
+@@ -51,45 +51,20 @@
          $$cmake_extra_source_includes.output
  }
  
@@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644
  
  static|staticlib:CMAKE_STATIC_TYPE = true
  
-@@ -169,7 +144,7 @@ contains(CONFIG, plugin) {
+@@ -169,7 +144,7 @@
        cmake_target_file
  
      cmake_qt5_plugin_file.files = $$cmake_target_file.output
@@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) {
+@@ -318,7 +293,7 @@
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644
  
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..4c7c8da21a 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2019-07-10 09:35:08.917628566 -0500
+@@ -3,30 +3,6 @@
      message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
  endif()
  
@@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644
  !!IF !equals(TEMPLATE, aux)
  # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
  set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
-@@ -52,11 +28,7 @@ endmacro()
+@@ -52,11 +28,7 @@
  macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
      set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
          \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -69,11 +41,7 @@
      )
  
  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
      if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
          set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -89,24 +57,13 @@
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644
      )
  !!ELSE
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -122,7 +79,6 @@
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
  !!ENDIF
  !!ENDIF
@@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644
  !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
      include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
  !!ENDIF
-@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -272,25 +228,13 @@
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_DEBUG_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -309,25 +253,13 @@
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_RELEASE_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -346,11 +278,7 @@
      macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -259,19 +256,17 @@ index 3ed6dd5889..4c7c8da21a 100644
          _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
          set_target_properties(Qt5::${Plugin} PROPERTIES
              \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 99f68b78f5..dde69cb7c2 100644
---- a/mkspecs/features/mac/default_post.prf
-+++ b/mkspecs/features/mac/default_post.prf
-@@ -63,199 +63,3 @@ qt {
-         }
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf	2019-07-10 09:35:08.917628566 -0500
+@@ -64,202 +64,6 @@
      }
  }
--
+ 
 -# Add the same default rpaths as Xcode does for new projects.
 -# This is especially important for iOS/tvOS/watchOS where no other option is possible.
 -!no_default_rpath {
--    QMAKE_RPATHDIR += @executable_path/Frameworks
+-    QMAKE_RPATHDIR += @executable_path/../Frameworks
 -    equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
 -}
 -
@@ -463,10 +458,13 @@ index 99f68b78f5..dde69cb7c2 100644
 -    xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}
 -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"
 -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index e3534561a5..3b01424e67 100644
---- a/mkspecs/features/mac/default_pre.prf
-+++ b/mkspecs/features/mac/default_pre.prf
+-
+ !macx-xcode {
+     generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
+     generate_xcode_project.target = xcodeproj
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf	2019-07-10 09:35:08.917628566 -0500
 @@ -1,60 +1,2 @@
  CONFIG = asset_catalogs rez $$CONFIG
  load(default_pre)
@@ -528,11 +526,10 @@ index e3534561a5..3b01424e67 100644
 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
 -xcode_copy_phase_strip_setting.value = NO
 -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
-diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
-index 8360dd8b38..8b13789179 100644
---- a/mkspecs/features/mac/sdk.prf
-+++ b/mkspecs/features/mac/sdk.prf
-@@ -1,58 +1 @@
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf	2019-07-10 09:35:08.917628566 -0500
+@@ -1,54 +1 @@
  
 -isEmpty(QMAKE_MAC_SDK): \
 -    error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
@@ -568,10 +565,6 @@ index 8360dd8b38..8b13789179 100644
 -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
 -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
 -
--sysrootified =
--for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
--QMAKE_INCDIR_OPENGL = $$sysrootified
--
 -QMAKESPEC_NAME = $$basename(QMAKESPEC)
 -
 -# Resolve SDK version of various tools
@@ -591,37 +584,34 @@ index 8360dd8b38..8b13789179 100644
 -    $$tool = $$sysrooted $$member(value, 1, -1)
 -    cache($$tool_variable, set stash, $$tool)
 -}
-diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
-index 65212b2abf..accd4c07f0 100644
---- a/mkspecs/features/qml_module.prf
-+++ b/mkspecs/features/qml_module.prf
-@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_
- # Tools need qmldir and plugins.qmltypes always installed on the file system
- qmldir.files = $$qmldir_file $$fq_aux_qml_files
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf	2019-07-10 09:35:08.917628566 -0500
+@@ -54,7 +54,7 @@
+ 
+ qmldir.files = $$qmldir_file
  install_qml_files: qmldir.files += $$fq_qml_files
--qmldir.path = $$instbase/$$TARGETPATH
+-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH
  INSTALLS += qmldir
  
- !debug_and_release|!build_all|CONFIG(release, debug|release) {
-diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
-index cd6377dcc6..e98bf98151 100644
---- a/mkspecs/features/qml_plugin.prf
-+++ b/mkspecs/features/qml_plugin.prf
-@@ -56,7 +56,7 @@ qml1_target {
-     instbase = $$[QT_INSTALL_QML]
- }
+ qmlfiles.base = $$_PRO_FILE_PWD_
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -50,7 +50,7 @@
+ 
+ DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
  
--target.path = $$instbase/$$TARGETPATH
+-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH
  INSTALLS += target
  
  # Some final setup
-diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
-index 8354f30eea..62028fef8e 100644
---- a/mkspecs/features/qt_app.prf
-+++ b/mkspecs/features/qt_app.prf
-@@ -30,7 +30,7 @@ host_build:force_bootstrap {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -30,7 +30,7 @@
      target.path = $$[QT_HOST_BINS]
  } else {
      !build_pass:qtConfig(debug_and_release): CONFIG += release
@@ -630,11 +620,10 @@ index 8354f30eea..62028fef8e 100644
      CONFIG += relative_qt_rpath  # Qt's tools and apps should be relocatable
  }
  INSTALLS += target
-diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
-index 3bb3823a8e..655b7b7db8 100644
---- a/mkspecs/features/qt_build_paths.prf
-+++ b/mkspecs/features/qt_build_paths.prf
-@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -24,6 +24,6 @@
  !force_independent {
      # If the module is not built independently, everything ends up in qtbase.
      # This is the case in non-prefix builds, except for selected modules.
@@ -643,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644
 +    MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT
 +    MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
  }
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 4ad9946ae0..6d66f29c26 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -34,8 +34,8 @@
          qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
          qt_libdir = $$[QT_HOST_LIBS]
      } else {
@@ -658,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644
      }
      contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
          lib_replace.match = "[^ ']*$$rplbase/lib"
-diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
-index 3139c443c6..1b4f2fddd8 100644
---- a/mkspecs/features/qt_docs.prf
-+++ b/mkspecs/features/qt_docs.prf
-@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -45,7 +45,7 @@
  
  QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
  !build_online_docs: \
@@ -671,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644
  PREP_DOC_INDEXES =
  DOC_INDEXES =
  !isEmpty(QTREPOS) {
-@@ -64,8 +64,8 @@ DOC_INDEXES =
+@@ -64,8 +64,8 @@
          DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)
  } else {
      prepare_docs: \
@@ -682,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644
  }
  
  qtattributionsscanner.target = qtattributionsscanner
-@@ -88,12 +88,12 @@ prepare_docs {
+@@ -88,12 +88,12 @@
      qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)
  
      inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
@@ -697,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644
      inst_qch_docs.CONFIG += no_check_exist no_default_install no_build
      INSTALLS += inst_qch_docs
  
-diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
-index 43b58817fe..e635b8f67a 100644
---- a/mkspecs/features/qt_example_installs.prf
-+++ b/mkspecs/features/qt_example_installs.prf
-@@ -88,7 +88,7 @@ sourcefiles += \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -88,7 +88,7 @@
      $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
      $$DBUS_ADAPTORS $$DBUS_INTERFACES
  addInstallFiles(sources.files, $$sourcefiles)
@@ -710,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644
  INSTALLS += sources
  
  check_examples {
-diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1903e509c8..ae7b585989 100644
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -69,7 +69,7 @@
  defineTest(qtPrepareTool) {
      cmd = $$eval(QT_TOOL.$${2}.binary)
      isEmpty(cmd) {
@@ -723,10 +708,9 @@ index 1903e509c8..ae7b585989 100644
          exists($${cmd}.pl) {
              $${1}_EXE = $${cmd}.pl
              cmd = perl -w $$system_path($${cmd}.pl)
-diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
-index 8f98987b99..21b3bb8b32 100644
---- a/mkspecs/features/qt_installs.prf
-+++ b/mkspecs/features/qt_installs.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf	2019-07-10 09:35:08.918628595 -0500
 @@ -12,16 +12,10 @@
  #library
  !qt_no_install_library {
@@ -746,7 +730,7 @@ index 8f98987b99..21b3bb8b32 100644
      !static: target.CONFIG = no_dll
      INSTALLS += target
  }
-@@ -29,33 +23,33 @@
+@@ -29,35 +23,35 @@
  #headers
  qt_install_headers {
      gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
@@ -762,6 +746,8 @@ index 8f98987b99..21b3bb8b32 100644
      private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
 -    private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
 +    private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+     generated_privates: \
+         private_headers.CONFIG += no_check_exist
      INSTALLS += private_headers
  
      qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
@@ -786,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644
          privpritarget.files = $$MODULE_PRIVATE_PRI
          INSTALLS += privpritarget
      }
-diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
-index 40528a65e2..903f795284 100644
---- a/mkspecs/features/qt_plugin.prf
-+++ b/mkspecs/features/qt_plugin.prf
-@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf	2019-07-10 09:35:08.918628595 -0500
+@@ -88,7 +88,7 @@
      }
  }
  
@@ -799,11 +784,63 @@ index 40528a65e2..903f795284 100644
  INSTALLS += target
  
  TARGET = $$qt5LibraryTarget($$TARGET)
-diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index e0652fdcf9..450b2a2d28 100644
---- a/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -2668,6 +2668,15 @@
+         QStringList *app_libpaths = new QStringList;
+         coreappdata()->app_libpaths.reset(app_libpaths);
+ 
++        // Add library paths derived from PATH
++        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &path: paths) {
++            if (!path.isEmpty()) {
++                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
++            }
++        }
++
+         QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH");
+         if (!libPathEnv.isEmpty()) {
+             QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h	2019-07-10 09:35:08.920628655 -0500
+@@ -212,7 +212,7 @@
+ 
+ // --------------------------------------------------------------------------
+ 
+-#if !defined(QT_BOOTSTRAPPED)
++#if 0
+ 
+ QT_END_NAMESPACE
+ #include <os/activity.h>
+@@ -290,7 +290,19 @@
+ 
+ #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
+ 
+-#endif // !defined(QT_BOOTSTRAPPED)
++#else // !defined(QT_BOOTSTRAPPED)
++
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
++
++#define QT_APPLE_LOG_ACTIVITY2(...)
++#define QT_APPLE_LOG_ACTIVITY1(...)
++#define QT_APPLE_LOG_ACTIVITY(...)
++
++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
++
++#endif
+ 
+ // -------------------------------------------------------------------------
+ 
+Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in	2019-07-10 09:35:08.918628595 -0500
+@@ -3,7 +3,7 @@
      add_executable(Qt5::qmake IMPORTED)
  
  !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
@@ -812,7 +849,7 @@ index e0652fdcf9..450b2a2d28 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
+@@ -18,7 +18,7 @@
      add_executable(Qt5::moc IMPORTED)
  
  !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
@@ -821,7 +858,7 @@ index e0652fdcf9..450b2a2d28 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
+@@ -35,7 +35,7 @@
      add_executable(Qt5::rcc IMPORTED)
  
  !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
@@ -830,7 +867,7 @@ index e0652fdcf9..450b2a2d28 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain)
+@@ -116,7 +116,7 @@
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
      set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -839,7 +876,7 @@ index e0652fdcf9..450b2a2d28 100644
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
  !!ENDIF
-@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain)
+@@ -130,7 +130,7 @@
      set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -848,10 +885,9 @@ index e0652fdcf9..450b2a2d28 100644
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
  !!ENDIF
-diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-index c357237d0e..6f0c75de3c 100644
---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in	2019-07-10 09:35:08.918628595 -0500
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
@@ -860,10 +896,9 @@ index c357237d0e..6f0c75de3c 100644
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-index 706304cf34..546420f6ad 100644
---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in	2019-07-10 09:35:08.918628595 -0500
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
@@ -872,31 +907,10 @@ index 706304cf34..546420f6ad 100644
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index 463e30e1c3..0e1ab669e4 100644
---- a/src/corelib/kernel/qcoreapplication.cpp
-+++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths()
-         QStringList *app_libpaths = new QStringList;
-         coreappdata()->app_libpaths.reset(app_libpaths);
- 
-+        // Add library paths derived from PATH
-+        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
-+        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
-+        for (const QString &path: paths) {
-+            if (!path.isEmpty()) {
-+                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
-+            }
-+        }
-+
-         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
-         if (!libPathEnv.isEmpty()) {
-             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
-index bed62a02bd..73158993f7 100644
---- a/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -70,7 +70,11 @@
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
  {
@@ -909,7 +923,7 @@ index bed62a02bd..73158993f7 100644
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
+@@ -644,12 +648,16 @@
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
@@ -931,10 +945,9 @@ index bed62a02bd..73158993f7 100644
          }
      }
  
-diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
-index 1d947159e2..b36865fc48 100644
---- a/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in	2019-07-10 09:35:08.919628625 -0500
 @@ -2,11 +2,7 @@
  if (NOT TARGET Qt5::qdbuscpp2xml)
      add_executable(Qt5::qdbuscpp2xml IMPORTED)
@@ -948,7 +961,7 @@ index 1d947159e2..b36865fc48 100644
      _qt5_DBus_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::qdbuscpp2xml PROPERTIES
-@@ -17,11 +13,7 @@ endif()
+@@ -17,11 +13,7 @@
  if (NOT TARGET Qt5::qdbusxml2cpp)
      add_executable(Qt5::qdbusxml2cpp IMPORTED)
  
@@ -961,10 +974,9 @@ index 1d947159e2..b36865fc48 100644
      _qt5_DBus_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
-diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..fb4183bada 100644
---- a/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in	2019-07-10 09:35:08.919628625 -0500
 @@ -2,7 +2,7 @@
  !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
  
@@ -974,7 +986,7 @@ index 07869efd7d..fb4183bada 100644
  !!ELSE
  set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
  !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO
+@@ -17,13 +17,13 @@
      set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
@@ -990,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-index b5a0a5bbeb..6c20305f4d 100644
---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -265,12 +265,9 @@
      m_possibleLocations.reserve(7);
      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
          m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
@@ -1008,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644
  }
  
  QString TableGenerator::findComposeFile()
-diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 57629ac03a..8a7f219a98 100644
---- a/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp	2019-07-10 09:35:08.919628625 -0500
+@@ -317,10 +317,10 @@
  #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
@@ -1025,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644
              xcursorFound = xcursorLib.load();
          }
          if (xcursorFound) {
-diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
-index fb1c425d8e..bb8bab9795 100644
---- a/src/plugins/platformthemes/gtk3/main.cpp
-+++ b/src/plugins/platformthemes/gtk3/main.cpp
+Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp	2019-07-10 09:35:08.919628625 -0500
 @@ -39,6 +39,7 @@
  
  #include <qpa/qplatformthemeplugin.h>
@@ -1037,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644
  
  QT_BEGIN_NAMESPACE
  
-@@ -54,8 +55,22 @@ public:
+@@ -54,8 +55,22 @@
  QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params)
  {
      Q_UNUSED(params);
@@ -1061,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644
  
      return 0;
  }
-diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
-index 6498ea84ef..d821ced7fc 100644
---- a/src/testlib/qtestassert.h
-+++ b/src/testlib/qtestassert.h
+diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp	2019-07-10 09:35:08.920628655 -0500
+@@ -43,7 +43,7 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
+ 
+ using namespace QTestPrivate;
+ 
+diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h
+--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h	2019-07-10 09:35:08.919628625 -0500
 @@ -44,10 +44,13 @@
  
  QT_BEGIN_NAMESPACE
@@ -1081,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644
  
  QT_END_NAMESPACE
  
-diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-index 99d87e2e46..a4eab2aa72 100644
---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in	2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in	2019-07-10 09:35:08.919628625 -0500
+@@ -3,7 +3,7 @@
      add_executable(Qt5::uic IMPORTED)
  
  !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
@@ -1094,63 +1114,33 @@ index 99d87e2e46..a4eab2aa72 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
-index b14a494296..779c4eda95 100644
---- a/src/corelib/kernel/qcore_mac_p.h
-+++ b/src/corelib/kernel/qcore_mac_p.h
-@@ -211,7 +211,7 @@ private:
- 
- // --------------------------------------------------------------------------
- 
--#if !defined(QT_BOOTSTRAPPED)
-+#if 0
- 
- QT_END_NAMESPACE
- #include <os/activity.h>
-@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
- 
- #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
- 
--#endif // !defined(QT_BOOTSTRAPPED)
-+#else // !defined(QT_BOOTSTRAPPED)
-+
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
-+
-+#define QT_APPLE_LOG_ACTIVITY2(...)
-+#define QT_APPLE_LOG_ACTIVITY1(...)
-+#define QT_APPLE_LOG_ACTIVITY(...)
-+
-+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
-+
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
-index 2c1005ad80..244147ea7d 100644
---- a/src/testlib/qappletestlogger.cpp
-+++ b/src/testlib/qappletestlogger.cpp
-@@ -43,7 +43,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- 
- using namespace QTestPrivate;
- 
-diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
-index 1268730cc6..a50e9b0764 100644
---- a/src/testlib/qtestlog.cpp
-+++ b/src/testlib/qtestlog.cpp
-@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
- #endif
-     }
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-     // Logger that also feeds messages to AUL. It needs to wrap the existing
-     // logger, as it needs to be able to short circuit the existing logger
-     // in case AUL prints to stderr.
+diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
+index c40f58c987..e69de29bb2 100644
+--- a/mkspecs/features/mac/sdk.mk
++++ b/mkspecs/features/mac/sdk.mk
+@@ -1,25 +0,0 @@
+-
+-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
+-    CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
+-    CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
+-    ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
+-        # We don't want to complain about out of date SDK unless the target needs to be remade.
+-        # This covers use-cases such as running 'make check' after moving the build to a
+-        # computer without Xcode or with a different Xcode version.
+-        TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)
+-        ifeq ($(TARGET_UP_TO_DATE),0)
+-            ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)
+-                $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)
+-            else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
+-                $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
+-            else ifneq ($(CURRENT_MAC_SDK_VERSION),)
+-                $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
+-            else
+-                $(info Unknown error resolving current platform SDK version.)
+-            endif
+-            $(info This requires a fresh build. Please wipe the build directory completely,)
+-            $(info including any .qmake.stash and .qmake.cache files generated by qmake.)
+-            $(error ^)
+-        endif
+-    endif
+-endif
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
deleted file mode 100644
index ec9a432ea70845b5b21ebfcc5f3c47c86348e45f..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-@@ -135,14 +135,16 @@
-   if (!raw_data_ || error_code_)
-     return nullptr;
- 
--  DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
--  if (finished_loading_) {
--    array_buffer_result_ = result;
--    AdjustReportedMemoryUsageToV8(
--        -1 * static_cast<int64_t>(raw_data_->ByteLength()));
--    raw_data_.reset();
-+  if (!finished_loading_) {
-+    return DOMArrayBuffer::Create(
-+        ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
-   }
--  return result;
-+  array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-+  AdjustReportedMemoryUsageToV8(-1 *
-+                                static_cast<int64_t>(raw_data_->ByteLength()));
-+
-+  raw_data_.reset();
-+  return array_buffer_result_;
- }
- 
- String FileReaderLoader::StringResult() {
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix
index d83edc97e94f8c78feae5d37f7ca8de211590529..ce567c3a2bcd9cf5eef76a364946062e153be714 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   qt3d = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1";
-      name = "qt3d-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz";
+      sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d";
+      name = "qt3d-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52";
-      name = "qtactiveqt-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz";
+      sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f";
+      name = "qtactiveqt-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtandroidextras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm";
-      name = "qtandroidextras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f";
+      name = "qtandroidextras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtbase = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy";
-      name = "qtbase-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz";
+      sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701";
+      name = "qtbase-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtcanvas3d = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj";
-      name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz";
+      sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea";
+      name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtcharts = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww";
-      name = "qtcharts-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz";
+      sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9";
+      name = "qtcharts-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f";
-      name = "qtconnectivity-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz";
+      sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661";
+      name = "qtconnectivity-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf";
-      name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313";
+      name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag";
-      name = "qtdeclarative-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz";
+      sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7";
+      name = "qtdeclarative-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtdoc = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h";
-      name = "qtdoc-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz";
+      sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f";
+      name = "qtdoc-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtgamepad = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz";
-      sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac";
-      name = "qtgamepad-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz";
+      sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642";
+      name = "qtgamepad-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtgraphicaleffects = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1";
-      name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
+      sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73";
+      name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtimageformats = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z";
-      name = "qtimageformats-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz";
+      sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2";
+      name = "qtimageformats-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtlocation = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh";
-      name = "qtlocation-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz";
+      sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6";
+      name = "qtlocation-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtmacextras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr";
-      name = "qtmacextras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed";
+      name = "qtmacextras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw";
-      name = "qtmultimedia-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz";
+      sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301";
+      name = "qtmultimedia-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1";
-      name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz";
+      sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332";
+      name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtpurchasing = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr";
-      name = "qtpurchasing-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz";
+      sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e";
+      name = "qtpurchasing-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtquickcontrols = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb";
-      name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz";
+      sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46";
+      name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtquickcontrols2 = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9";
-      name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
+      sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a";
+      name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09";
-      name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz";
+      sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42";
+      name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtscript = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp";
-      name = "qtscript-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz";
+      sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e";
+      name = "qtscript-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtscxml = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw";
-      name = "qtscxml-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz";
+      sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19";
+      name = "qtscxml-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtsensors = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz";
-      sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5";
-      name = "qtsensors-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz";
+      sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc";
+      name = "qtsensors-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtserialbus = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz";
-      sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb";
-      name = "qtserialbus-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz";
+      sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d";
+      name = "qtserialbus-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtserialport = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r";
-      name = "qtserialport-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz";
+      sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51";
+      name = "qtserialport-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtspeech = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r";
-      name = "qtspeech-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz";
+      sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5";
+      name = "qtspeech-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtsvg = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb";
-      name = "qtsvg-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2";
+      name = "qtsvg-everywhere-src-5.12.3.tar.xz";
     };
   };
   qttools = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p";
-      name = "qttools-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz";
+      sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8";
+      name = "qttools-everywhere-src-5.12.3.tar.xz";
     };
   };
   qttranslations = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz";
-      sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv";
-      name = "qttranslations-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz";
+      sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca";
+      name = "qttranslations-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv";
-      name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
+      sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22";
+      name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwayland = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m";
-      name = "qtwayland-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff";
+      name = "qtwayland-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5";
-      name = "qtwebchannel-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz";
+      sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a";
+      name = "qtwebchannel-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebengine = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x";
-      name = "qtwebengine-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz";
+      sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317";
+      name = "qtwebengine-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebglplugin = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5";
-      name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz";
+      sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3";
+      name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4";
-      name = "qtwebsockets-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz";
+      sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577";
+      name = "qtwebsockets-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwebview = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz";
-      sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p";
-      name = "qtwebview-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz";
+      sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5";
+      name = "qtwebview-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtwinextras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6";
-      name = "qtwinextras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b";
+      name = "qtwinextras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtx11extras = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz";
-      sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06";
-      name = "qtx11extras-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz";
+      sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613";
+      name = "qtx11extras-everywhere-src-5.12.3.tar.xz";
     };
   };
   qtxmlpatterns = {
-    version = "5.12.0";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
-      sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk";
-      name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
+      sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61";
+      name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 2c300d1c2f166a367565d36330eb7445d9c37480..8250e42a1b6cbcf934502a0e9a6a795a8f2e11cf 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -234,6 +234,8 @@ stdenv.mkDerivation {
       "-widgets"
       "-opengl desktop"
       "-icu"
+      "-L" "${icu.out}/lib"
+      "-I" "${icu.dev}/include"
       "-pch"
     ]
     ++ lib.optionals (compareVersion "5.11.0" < 0)
@@ -270,10 +272,18 @@ stdenv.mkDerivation {
 
     ++ [
       "-system-zlib"
+      "-L" "${zlib.out}/lib"
+      "-I" "${zlib.dev}/include"
       "-system-libjpeg"
+      "-L" "${libjpeg.out}/lib"
+      "-I" "${libjpeg.dev}/include"
       "-system-harfbuzz"
+      "-L" "${harfbuzz.out}/lib"
+      "-I" "${harfbuzz.dev}/include"
       "-system-pcre"
       "-openssl-linked"
+      "-L" "${openssl.out}/lib"
+      "-I" "${openssl.dev}/include"
       "-system-sqlite"
       ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
       ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
@@ -302,10 +312,14 @@ stdenv.mkDerivation {
           "-system-xcb"
           "-xcb"
           "-qpa xcb"
+          "-L" "${libX11.out}/lib"
+          "-I" "${libX11.out}/include"
+          "-L" "${libXext.out}/lib"
+          "-I" "${libXext.out}/include"
+          "-L" "${libXrender.out}/lib"
+          "-I" "${libXrender.out}/include"
 
-          "-system-xkbcommon"
           "-libinput"
-          "-xkbcommon-evdev"
 
           "-no-eglfs"
           "-no-gbm"
@@ -326,6 +340,19 @@ stdenv.mkDerivation {
           "-no-feature-renameat2"
           "-no-feature-getentropy"
         ]
+        ++ lib.optionals (compareVersion "5.12.1" < 0) [
+          # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1
+          "-system-xkbcommon"
+          "-xkbcommon-evdev"
+        ]
+        ++ lib.optionals (cups != null) [
+          "-L" "${cups.lib}/lib"
+          "-I" "${cups.dev}/include"
+        ]
+        ++ lib.optionals (mysql != null) [
+          "-L" "${mysql.out}/lib"
+          "-I" "${mysql.out}/include"
+        ]
     );
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index ae99035d22673d5fedb371e682fafc8df17e54a3..b7857372d1cd8145c30c1218c7482f1533bc0a6b 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
-  name = "qt-mobility-${version}";
+  pname = "qt-mobility";
   src = fetchFromGitHub {
     owner = "qtproject";
     repo = "qt-mobility";
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index 1578593b8aea9d1bd51400b00f5126181ae4b853..3c4c192bd4b9e265bf7dcbe7d63cbaaabbe23368 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "qtinstaller-${version}";
+  pname = "qtinstaller";
 
   propagatedBuildInputs = [ qtdeclarative qttools ];
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 84be9876c1cb5be691498a133379c570eba99a90..2e47a213565735d6a656037d59a4614342907551 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -2,9 +2,8 @@
 stdenv.mkDerivation rec {
   pname = "quesoglc";
   version = "0.7.2";
-  name = "${pname}-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl";
   };
   buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ];
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index 35d16ee5e19b60e6aa23b2b49b117922989152f6..14bfd40a5932be5b27a0a695b3cde877e25b3a6f 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "quickder";
-  name = "${pname}-${version}";
   version = "1.2-6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
index 5ed05ec6b3222c9c0ca18ac509bb3b2338db43c9..79d4d6524241fc11473031c2e44eccff5cca8f0e 100644
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, which, coreutils, fetchzip, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "qxt-${version}";
+  pname = "qxt";
   version = "0.6.2";
   
   src = fetchzip {
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index 286c5c868dffc110e322fe59c6633c24a279ff0f..fe48d99b383c30cd2e8433cb2ecd78034d5ccf45 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
 
 stdenv.mkDerivation rec {
-  name = "rabbitmq-c-${version}";
+  pname = "rabbitmq-c";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 256b756ed45db0c7a440decc72adad2704fccb64..e02b22af756565a578e5154d056077c42d9dbd4d 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "range-v3-${version}";
+  pname = "range-v3";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index 9d8ce8cef2020c8791b6831b2f6c9eb576aa6934..92c42d19af620b0bf8f79c2ebb3e638c0c3ec079 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec{
-  name = "rapidcheck-${version}";
+  pname = "rapidcheck";
   version = "unstable-2018-09-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
index a1671aa3e0f929cf82df0131bfc2a0672548e406..ea91c1507dc3405ad6c8d4d5cea1a5c1629d3d81 100644
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ b/pkgs/development/libraries/rapidjson/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "rapidjson-${version}";
+  pname = "rapidjson";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix
index 99f88091690708a746a6e9fafe5ab79af9e78507..ca072f2ca4b0a08d505ea54e10eef0b3f339d2cf 100644
--- a/pkgs/development/libraries/rapidxml/default.nix
+++ b/pkgs/development/libraries/rapidxml/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "rapidxml";
   version = "1.13";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.zip";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.zip";
     sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63";
   };
 
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 9f4fe54e80560e89ab29f2f98e6fd4c3250553a7..165e9716a977ca3b35ea49eba200ae8a3295c43d 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "rdkafka-${version}";
+  pname = "rdkafka";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index a6a5fbed4fc5dec403ce5f646617536d9b9d2da5..e36b6f9488a5893407870ca827bac5bfcb14495b 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "re2-${version}";
+  pname = "re2";
   version = "20190401";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index e96b4f1ebe271040515a1088abc45ea933f5cdc4..11d5c3780154de8828da46456e58b2bf102ea042 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "readline-${version}";
+  pname = "readline";
   version = "7.0p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix
index eefef9727663be7df612c40fe64a2591481a79b5..cdc36617c52d0255370d7531ff52f0d82dbe1f7c 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/pkgs/development/libraries/readline/8.0.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "readline-${version}";
+  pname = "readline";
   version = "8.0p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index 681fc3a012fe20d6c6e702fbf427f66b16eb4621..a43700ce439ea22dbb88e6f45fcab9ebbfa1f00a 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "rep-gtk-${version}";
+  pname = "rep-gtk";
   version = "0.90.8.3";
   sourceName = "rep-gtk_${version}";
 
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
index 195db9a168585f2ec4cffef72b1921c833384b75..82a2998be1ef3237b559f2285dc6a411161d1e99 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/pkgs/development/libraries/rote/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "rote-${version}";
+  pname = "rote";
   version = "0.2.8";
 
   src = fetchurl {
     sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
-    url = "mirror://sourceforge/rote/${name}.tar.gz";
+    url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index daa499061c5ba0671e3d5b14bd4355562571e01b..b69cd56d35d07236cb30395c68b2342264d07aa1 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, path, runtimeShell }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "safefile";
   version = "1.0.5";
 
   src = fetchurl {
-    url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz";
+    url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz";
     sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78";
   };
 
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
index ba0b8f4e996fafac6660af9b5021a8f5db3a2427..9ffa2efc376cf3da37759d3027728ce07bbbfab7 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, curl }:
 
 stdenv.mkDerivation rec {
-  name = "sblim-sfcc-${version}";
+  pname = "sblim-sfcc";
   version = "2.2.9"; # this is technically 2.2.9-preview
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
index f727728943bde7d0bff5dfe41a1748297a139cc9..75beddcd22ca6ea273a6098003ab898416a04d53 100644
--- a/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.6.0";
-  name = "papi-${version}";
+  pname = "papi";
 
   src = fetchurl {
     url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 2ee9144b316d717799a86271535ac51708337f5f..367fc635c8b9a35707c46a6a0eb27939e3875790 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "htslib";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
   };
 
diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix
index 22bcc56c82abdee1cd6f95cb4ed4e8ed0e263f3f..e6c58b96e5c7bf4950b42372033486ed3833e1ca 100644
--- a/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "mirtk-${version}";
+  pname = "mirtk";
 
   src = fetchFromGitHub {
     owner = "BioMedIA";
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 4668839ebb9c39938149c978de0f132b4075b0c0..d43331464067b96b161ea60e1d8495b139e566fa 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "QuadProgpp-${version}";
+  pname = "QuadProgpp";
   version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 05373cd1cbda37f16502304a0cc072a4c535ffbd..36576de056317784632916125472eccbd94b9749 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -7,7 +7,8 @@ let
   version = "3.7.0";
 in
 stdenv.mkDerivation {
-  name = "arpack-${version}";
+  pname = "arpack";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "opencollab";
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 286be260052b06429e24e48dbde26ec0e396d5e6..9c412f93d1374e606f848402d9df1eb870589aa4 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "blas-${version}";
+  pname = "blas";
   version = "3.8.0";
 
   src = fetchurl {
-    url = "http://www.netlib.org/blas/${name}.tgz";
+    url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
     sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm";
   };
 
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 16850fb1665ec1cfad99e88bae5ba286801ba600..bc276b9923c8e2bcb8011ae08c7c3ed87c1c2c12 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.5";
-  name = "brial-${version}";
+  pname = "brial";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 4746f77a21646b113443536c3320e8f984ae5e35..d22858d64d0c922daa44a0d648ec1714050b3f41 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -61,7 +61,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "caffe2-${version}";
+  pname = "caffe2";
   version = "0.8.1";
   src = fetchFromGitHub {
     owner = "caffe2";
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index 537fcb93a87e9a55230ad7af4563326da7157b3e..52c775c9a0d0d90ab1be3d35a70bfc9162f18fb3 100644
--- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -5,8 +5,6 @@ in let
   # SuiteSparse must use the same openblas
   suitesparse = suitesparse_.override { inherit openblas; };
 in stdenv.mkDerivation rec {
-
-  name = "${pname}-${version}";
   pname = "cholmod-extra";
   version = "1.2.0";
 
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index 40dbfc53e2cbca2354628eff0d040159934e2c40..8a474e06e55691b8382e15b48bc39cbc8c6c84fc 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clblas-${version}";
+  pname = "clblas";
   version = "2.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index 2441aff9fa307e9e3891c7aad604f779019aa694..5193c2db5c5b895b2e7958cf1149e1ecafb70031 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.21";
-  name = "cliquer-${version}";
+  pname = "cliquer";
 
   # autotoolized version of the original cliquer
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix
index 645a865eb955b36deacef3e793656743956a6c20..77973a95449492aa22233a4069fd8e29f98850dd 100644
--- a/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/pkgs/development/libraries/science/math/ecos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ecos-${version}";
+  pname = "ecos";
   version = "2.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
index 4ae5ea522555cc1d82e16c68f61ba7384a5ab043..a93ede63a263724db770631d2c9719d0dfba2ceb 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -30,7 +30,8 @@ let
   version = "2017.1.0";
 
   dijitso = pythonPackages.buildPythonPackage {
-    name = "dijitso-${version}";
+    pname = "dijitso";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
       sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
@@ -54,7 +55,8 @@ let
   };
 
   fiat = pythonPackages.buildPythonPackage {
-    name = "fiat-${version}";
+    pname = "fiat";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz";
       sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l";
@@ -72,7 +74,8 @@ let
   };
 
   ufl = pythonPackages.buildPythonPackage {
-    name = "ufl-${version}";
+    pname = "ufl";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz";
       sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg";
@@ -90,7 +93,8 @@ let
   };
 
   ffc = pythonPackages.buildPythonPackage {
-    name = "ffc-${version}";
+    pname = "ffc";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
       sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0";
@@ -109,7 +113,8 @@ let
   };
 
   instant = pythonPackages.buildPythonPackage {
-    name = "instant-${version}";
+    pname = "instant";
+    inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz";
       sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q";
@@ -125,7 +130,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name = "dolfin-${version}";
+  pname = "dolfin";
+  inherit version;
   src = fetchurl {
     url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
     sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds";
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix
index 2891429c8578aaf58215c0352b1b7e0a2aa727fe..6fd16535459af24c8a207f9dfe17d561323f6a63 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.0";
   pname = "flintqs";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sagemath";
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 30453086d457d4f2b3670b0e6dce928ba39ad8eb..1995fb9c85de44087f4ed84a14fd33674326d6af 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, openblas, gfortran }:
 
 stdenv.mkDerivation rec {
-  name = "ipopt-${version}";
+  pname = "ipopt";
   version = "3.12.13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 51fbd9f14cb49a236ab31760d9720fc02111adb1..0f23f08145e9b4d2463ad846f4d891219cbd33cb 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   version = "1.23";
   pname = "lcalc";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix
index be650f3c3ce896e9c1f4d56ab816a059b408bb4f..c8f1138d69ff04099da26259bee83ed7ef370adc 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "libbraiding-${version}";
+  pname = "libbraiding";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix
index e96ee475d7d24fc225af6f7b2dfb2f13d0cbaf36..a2c0dd4fa177fe731509c483026bc05629419518 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.02r5";
-  name = "llibhomfly-${version}";
+  pname = "llibhomfly";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 46538d0022e77025c417307a95b945e9eed1a688..2e5bb5e371f548c69d47f6807050b7ecdeb72ff3 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -12,7 +12,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "liblapack-${version}";
+  pname = "liblapack";
+  inherit version;
   src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz";
     sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
index 3cf5c3619a9e578de55c364b948831c7c69b632e..b0cfbca5aa3317107a9d6e60e60490b8fd45189e 100644
--- a/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "lrs";
   version = "7.0";
 
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index b9ee1e2a10d788d59f35ac7bdd211da7d5cc1817..b8c4fa671484255d3bea1dfc90c3a9bc9d6ee3a1 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "20140914";
-  name = "m4ri-${version}";
+  pname = "m4ri";
 
   src = fetchFromBitbucket {
     owner = "malb";
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index 23fc03655cf37507128f5877bce8dfda00e0fccd..6a664b1dffff9b52a838775323165e36913cdf71 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "20150908";
-  name = "m4rie-${version}";
+  pname = "m4rie";
 
   src = fetchFromBitbucket {
     owner = "malb";
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index 8444d88809af22d0c137ff8f59d8823d4e2ad648..d036e39d01aec0f33e6ff4fc2e82cabcdc1a51d8 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
 let version = "2.0.2";
 
 in stdenv.mkDerivation {
-  name = "magma-${version}";
+  pname = "magma";
+  inherit version;
   src = fetchurl {
     url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
     sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk";
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index d967bbf8c3e1b43357e8baeb352f04a984c4e405..f8d392691ab26a2b6482eb857ae45d3063e4217a 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -86,13 +86,13 @@ let
   mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
 in
 stdenv.mkDerivation rec {
-  name = "openblas-${version}";
-  version = "0.3.6";
+  pname = "openblas";
+  version = "0.3.7";
   src = fetchFromGitHub {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1";
+    sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz";
   };
 
   inherit blas64;
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 01b0faf89f90b1b2c5ff435fa3b21f084e0cf10e..6fc96623a33c6da2bebdef7addd243fbbfa881e0 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "openlibm-${version}";
+  pname = "openlibm";
   version = "0.6.0";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 2dd63ebfc854f3ad61ad93d82256a7ae7e1411eb..c6e065320a26a3d8838e7971c8aa2465d0068360 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -4,7 +4,7 @@
 , pythonProtobuf }:
 
 stdenv.mkDerivation rec {
-  name = "or-tools-${version}";
+  pname = "or-tools";
   version = "v7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
index ca35ce2f4134c68d0e754dffe5b24ce8e46cb0fa..3a9ef7704596f8415a6ec209a2715103ce62d1cf 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "parmetis-${version}";
+  pname = "parmetis";
   version = "4.0.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index ac8129c9032f9c5c37d1d21860f19ccfa2f37bca..c2eda9dac48b5c28d23366cc6c4f74146e9c65b4 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -6,7 +6,7 @@
 , python }:
 
 stdenv.mkDerivation rec {
-  name = "petsc-${version}";
+  pname = "petsc";
   version = "3.8.4";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix
index 7394fb9e1b411ae5537c0f59fc9f7e7817f247b3..e7dfaecf1de0154eafe98fea7ffa654a78f1faf0 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/pkgs/development/libraries/science/math/planarity/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "planarity";
   version = "3.0.0.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "graph-algorithms";
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix
index 3eee63dbf4f6e31b6cc5ac7c26d0ea2330c41e8f..faa219044bd3ff49e6eeabfcf4a0ebc21a1dc250 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "primesieve-${version}";
+  pname = "primesieve";
   version = "7.4";
 
   nativeBuildInputs = [cmake];
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index fda54fe44ab117971c755c4b599c0bdc6976c2c4..66c573245db1546ba933997ddb9c0159c712e1de 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "rankwidth";
   version = "0.7";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 624885c501aaea5f3a849a5fd303a42a3a300a39..207406388e0e325901f4ba038dcbb1bcfc778f5a 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
   pname = "rubiks";
   version = "20070912";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index b4c6574d13a65dc3f4a74b9ca9a8f28115cf09aa..14277c8c6318d732cb90e33a586fd80dc713492e 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -4,7 +4,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "scalapack-${version}";
+  pname = "scalapack";
   version = "2.0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index f9d1a84b1f03aa6164992746b2ce4bae131e64f2..51a72585c0cf31eb202d95efbce68cc669745af9 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  name = "scs-${version}";
+  pname = "scs";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 7e71eafef697a42c35bfb0a6a12aee1cb4f813ad..48de128edc536d23388dc7060e9e4e36bf3b165e 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -5,7 +5,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "4.2.1";
-  name = "suitesparse-${version}";
+  pname = "suitesparse";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
     sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix
index 9938a3096a02f180e6a3e9d4a1efaeedc3f740c2..570c981448565638513889af045d945bd7042b77 100644
--- a/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/pkgs/development/libraries/science/math/superlu/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2.1";
-  name = "superlu-${version}";
+  pname = "superlu";
 
   src = fetchurl {
     url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index 2e543abd411b9b2ad7e4b3e351334f1d876e2a93..e67f61599b57298b03d3b5665f4aae0505917ae8 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.023.5";
-  name = "sympow-${version}";
+  pname = "sympow";
 
   src = fetchFromGitLab {
     group = "rezozer";
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index ad4d4c017376de1b909b688974aa3e8648f4b02a..4ee6f6cb99270565153a2184d6b9cdf3460b883f 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -10,7 +10,6 @@
 stdenv.mkDerivation rec {
   version = "0.9.1";
   pname = "zn_poly";
-  name = "${pname}-${version}";
 
   # sage has picked up the maintenance (bug fixes and building, not development)
   # from the original, now unmaintained project which can be found at
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix
index 5f2263d821d025dbe9f5f90ee8bd310290f303ba..640eefbd7336efe3603cb3653b875c273966f985 100644
--- a/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/pkgs/development/libraries/science/robotics/ispike/default.nix
@@ -2,11 +2,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ispike-${version}";
+  pname = "ispike";
   version = "2.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ispike/${name}.tar.gz";
+    url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz";
     sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
   };
 
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix
index ba291dc97ff223c44c24f3a464303610395557e9..eb8d17c64573ece585f0cdad6031521c7f87aedb 100644
--- a/pkgs/development/libraries/scriptaculous/default.nix
+++ b/pkgs/development/libraries/scriptaculous/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
-  name = "scriptaculous-${version}";
+  pname = "scriptaculous";
   version = "1.9.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 533fefa9f19458b99c713125bd67cf62acd1eeeb..63b6ae94a385ef9c4b0186245fa40c6e380fd360 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "serd-${version}";
+  pname = "serd";
   version = "0.30.0";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
   };
 
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 1b043d33ad6a10daf1ad54365baa5c287b95140a..cf73e205830b15b5e1d79c5bfeb05df0be03870e 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sfml-${version}";
+  pname = "sfml";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix
index 1e9a8ba6a58b6ff9644d087a10aab0cbd7afc721..261658b0547ee88b2507f127f6b8dc4296f59644 100644
--- a/pkgs/development/libraries/sfsexp/default.nix
+++ b/pkgs/development/libraries/sfsexp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sfsexp-${version}";
+  pname = "sfsexp";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index dd9b01a0a01eb4ce906a0804fe6f8b05d206c605..77b9714066dd4749ce3f63045a34a243650268e5 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }:
 
 stdenv.mkDerivation rec {
-  name = "shibboleth-sp-${version}";
+  pname = "shibboleth-sp";
   version = "3.0.4.1";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index f795dfef9e4c0b961e42bdc8f9b464ecd6b1348c..14af55c2afc1aef108e0d79633278866dca1507e 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.6";
-  name = "graphite2-${version}";
+  pname = "graphite2";
 
   src = fetchurl {
     url = "https://github.com/silnrsi/graphite/releases/download/"
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix
index 941e75b8ba92d0e3cab8b2f78df589760bb99df1..14cefdea77b4589d856fc7778d6b6cb5048f8222 100644
--- a/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/pkgs/development/libraries/smarty3-i18n/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "smarty-i18n-${version}";
+  pname = "smarty-i18n";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index 66bfd601a62d7dafe77c247511a3051a9bf22937..4876c39ce83ce6080e4e820c40907d965107902c 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "smarty3-${version}";
+  pname = "smarty3";
   version = "3.1.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 36077d71126a525d5bb62990bcbe2a8a318ad902..73cc88882d0f94ccf01140c0f7db0104516d5c37 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "snappy-${version}";
+  pname = "snappy";
   version = "1.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix
index 48ee1af0e30dc3ccde6e8f57037398ad2ee7b46d..edcb3549c310bfda6f327c8b91c628c227b61995 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/pkgs/development/libraries/sonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "sonic-${version}";
+  pname = "sonic";
   version = "2016-03-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 10258e791ba68a86bdf90bd28f73983cd8c248ee..c1c22cb910d71ff40f416a8c73ef3ba94d65ecb5 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "sord-${version}";
+  pname = "sord";
   version = "0.16.2";
 
   src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
   };
 
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index be2fc503e390079cf730b78b0d5844a0965093fa..c2dc20cc392783a786086818cfd1dff3fd305942 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, audiofile, libtiff}:
 stdenv.mkDerivation rec {
   version = "0.0.6";
-  name = "spandsp-${version}";
+  pname = "spandsp";
   src=fetchurl {
     url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index cab0e69ad1a76cd86f21986579498205b81d39fc..a18edc0a6dffd3e3815bbc1d7125633037fec0d8 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "spdk-${version}";
+  pname = "spdk";
   version = "19.04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index b27fd0843bc0cc5ea406039fda057fd05f9278e1..43360d781cdbb8c0915634f4f201c685ad06dd10 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -27,11 +27,11 @@ let
     else
       throw "You need to enable at least one output module.";
 in stdenv.mkDerivation rec {
-  name = "speech-dispatcher-${version}";
+  pname = "speech-dispatcher";
   version = "0.8.8";
 
   src = fetchurl {
-    url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
+    url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz";
     sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw";
   };
 
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index 6cf8d97cb67ce8a38d67beee23ba74805ab1ef87..9365ee006d144831ffbc35f37b75f79cab243967 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -3,7 +3,7 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation rec {
-  name = "sqlcipher-${version}";
+  pname = "sqlcipher";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index f0390486b10e89591518fa86d3dbeff895fcd136..3c5761b767ec6caabf1772b64ae29116b8550fdd 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -5,7 +5,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sqlite-analyzer-${version}";
+  pname = "sqlite-analyzer";
   version = "3.28.0";
 
   src = assert version == sqlite.version; fetchurl {
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ea1c38ea476bde68587d98a222521ea184bfc57c..9ba5da0c910cb2bc0c94427b4eaacacecb55c539 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sqlite-${version}";
+  pname = "sqlite";
   version = "3.28.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
index e5d322330e8e96bfd8625f9ee13528003010b1b9..e4c1f8eb5f681790c4cf2032f8aaf802c5a84c59 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fuse, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sqlar-${version}";
+  pname = "sqlar";
   version = "2018-01-07";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix
index bb66174c88411007fdb312e158b376151c81b73d..5edb2d92b551a5216ba2dad873b95e91f67f6047 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/pkgs/development/libraries/srt/default.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "srt";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "Haivision";
     repo = "srt";
     rev = "v${version}";
-    sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4";
+    sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index c9073fc0b7e779c3e96d06abdc0fbba6689367b7..3940faf1d6d17460e38f572b72a375d46b30630c 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libsrtp-${version}";
+  pname = "libsrtp";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index fc771a493b6d25a868b7ded8d8f0cecd52bc945b..82cbce8055e862ec01938113de43da5d34d003db 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.12";
 in
 stdenv.mkDerivation {
-  name = "libstartup-notification-${version}";
+  pname = "libstartup-notification";
+  inherit version;
   src = fetchurl {
     url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
     sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix
index 4f36ac2ba1c752ea98f9eca36ef879e82dc23252..440f0c22ea6f41b999781b3f067b2c2a7d841845 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/pkgs/development/libraries/stb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "stb-${version}";
+  pname = "stb";
   version = "20180211";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 36768acd991ac7d5f2eb52943597aaabc104fd83..8121b7a501f7a749cffc6f6f29eaecdc15001aaf 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "strigi-${version}";
+  pname = "strigi";
   version = "0.7.8";
 
   src = fetchurl {
-    url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+    url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2";
     sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23";
   };
 
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 2244803f4d323937eb1f1a407590d6d75520a2d8..5589a5560eb0d994d8442421270901cc666b6660 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "stxxl-${version}";
+  pname = "stxxl";
   version = "1.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
index 35bacff0525a5f17e273c57caaf74feeba78e52a..9a5f4db2debb50c4488ba90f71ac06b282f0f832 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -3,11 +3,11 @@
 # NOTE: for subunit python library see pkgs/top-level/python-packages.nix
 
 stdenv.mkDerivation rec {
-  name = "subunit-${version}";
+  pname = "subunit";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8";
   };
 
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix
index 2e6e2d3fbbfd6c427bde51de6988a298080b7c61..628ab7e28ef16bf889cb71862fbebd963c417dcc 100644
--- a/pkgs/development/libraries/svrcore/default.nix
+++ b/pkgs/development/libraries/svrcore/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, nss, nspr }:
 
 stdenv.mkDerivation rec {
-  name = "svrcore-${version}";
+  pname = "svrcore";
   version = "4.0.4";
 
   src = fetchurl {
-    url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2";
+    url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2";
     sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7";
   };
 
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index e30da732a46cfbf04b6039b220753fd1c3b786d5..c8c60c1f8ea61e268c1f5085a9232641370f8e8b 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python, fetchurl, openssl, boost, scons }:
 stdenv.mkDerivation rec {
-  name    = "swiften-${version}";
+  pname = "swiften";
   version = "4.0.2";
 
   nativeBuildInputs = [ scons];
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index a8a110cf9b14b6b9a4b928630ac6768889bb1b02..3d146a5a227b4cd4cbbd56a48004d93545bcd5b8 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "sword-${version}";
+  pname = "sword";
   version = "1.7.4";
 
   src = fetchurl {
-    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
+    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz";
     sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
   };
 
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 424dc116c7e9baf1f0bd411f1870cb8bbd49222e..47b93ab373a63a74869decd8947daaf5acdcfb19 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "symengine-${version}";
+  pname = "symengine";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 6577ebeae28e61abc677e17d0880772af21dbac4..6fd1d1ca941d80302dade7b2b879f23da0f40c2e 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
     
 stdenv.mkDerivation rec {
-  name = "szip-${version}";
+  pname = "szip";
   version = "2.1.1";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz";
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 27ac0fdd5ff90edee8a3a67d60ff1835d6a6e4ee..227d3c4c54761c07c33f0d4d36e50c5d1434a2ce 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -12,10 +12,10 @@ assert withPngSupport -> libpng != null;
 assert stdenv.isDarwin -> Carbon != null;
 
 stdenv.mkDerivation rec {
-  name = "tachyon-${version}";
+  pname = "tachyon";
   version = "0.99b2";
   src = fetchurl {
-    url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz";
+    url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
     sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
   };
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index 86006806baa06c69a1549b102c0ab4bb6d7fd5a0..28ce5c60481c6f4fe9c2fdcbe01994b16e27833b 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }:
 
 stdenv.mkDerivation rec {
-  name = "taglib-sharp-${version}";
+  pname = "taglib-sharp";
   version = "2.1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 89b163a0917c95a81fb0bbed4917a4f806a712f7..6fe4e45521ed80db56fd2539911251d3f613c653 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
 
 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "tbb-${version}";
+  pname = "tbb";
   version = "2019_U8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 24b1d477b8a07452f6245f78a497e6167b295da9..40e137204e2630c7dc4f8cdd6d30bc7c664019dc 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "tcllib-${version}";
+  pname = "tcllib";
   version = "1.19";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index 4e1f0bcab0357fd34d20a715cef5aa1790d677ce..f1fd6760c61d9a7e5d2cc9060c5b66fcb4381619 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tcltls-${version}";
+  pname = "tcltls";
   version = "1.6.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
index eefc976a62b017c0b4723ebc5864209f37e91c82..8ebf0156be8fc0c12960314db8e45526d602ac26 100644
--- a/pkgs/development/libraries/termbox/default.nix
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "termbox-${version}";
+  pname = "termbox";
   version = "1.1.2";
   src = fetchFromGitHub {
     owner = "nsf";
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 8d72d9a7d8ec2e0ef4d0feb4454e49397aa2981c..646cc60406a5edd37a1d93f0d33bb9929092c03d 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.5";
-  name = "theft-${version}";
+  pname = "theft";
 
   src = fetchFromGitHub {
     owner  = "silentbicycle";
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 92cc76273ba161018910819624b0fae69452898f..0fce957df229b238f16714405fdfc98cf9b5d7e5 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "thrift-${version}";
+  pname = "thrift";
   version = "0.12.0";
 
   src = fetchurl {
-    url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
+    url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
     sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3";
   };
 
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 7f1b3ebcbf5b24c7eb27b33dce81f206ac943ef5..4fc1da1fe0a3acda21ea614d82aa1eacef78ea3b 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "tinyxml-2-${version}";
+  pname = "tinyxml-2";
   version = "6.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index d61076e569bc9e270933dd55b9935e1aa99c15f2..cc7c996f7c3a2e8edf5205dbc7b7b666252b8273 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -4,7 +4,8 @@ let
   version = "2.6.2";
   SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
 in stdenv.mkDerivation {
-  name = "tinyxml-${version}";
+  pname = "tinyxml";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index 232c95e6257e26a581e41b8f938f0af82bd6a27d..61d9c710801c2e638825bbb86cd8429ecda7decb 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.4.3";
-  name = "tix-${version}";
+  pname = "tix";
   src = fetchurl {
      url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
      sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 229e4cfaa6c0f2d9dae6d67e5992f03c5e10c3ad..d7162067debadd751e57fdb34c4a1343471e2c6e 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "tnt-${version}";
+  pname = "tnt";
   version = "3.0.12";
   
   src = fetchurl {
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 9edfcc88f1640ab5ad847bb0a33c6cbc5b89f1dc..13b4e6b97a9a1961d9dae07d8eeca010e0473f4a 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tntdb-${version}";
+  pname = "tntdb";
   version = "1.3";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}.tar.gz";
+    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
     sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
   };
 
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix
index aaff759525b64dcb928e8092050b740261dabd68..86b0080a824245d708c1c0089f70c5d4c746f1d1 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/pkgs/development/libraries/tntnet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
 
 stdenv.mkDerivation rec {
-  name = "tntnet-${version}";
+  pname = "tntnet";
   version = "2.2.1";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}.tar.gz";
+    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
     sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
   };
 
diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix
index e5803d644f3bd99dcc6e1487720a25a7e96f21c6..6dd519441114c2596b4f8130f3b858f1b9264d29 100644
--- a/pkgs/development/libraries/torch-hdf5/default.nix
+++ b/pkgs/development/libraries/torch-hdf5/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, torch, cmake, hdf5}:
 stdenv.mkDerivation rec {
-  name = "torch-hdf5-${version}";
+  pname = "torch-hdf5";
   version = "0.0pre2016-07-01";
   buildInputs = [cmake torch hdf5];
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix
index d4c61890afb13a45596130fd080f5f32dfb4c5e1..ff8c26062d3c4463bf6dd859b069f5f48c4a0594 100644
--- a/pkgs/development/libraries/torch/default.nix
+++ b/pkgs/development/libraries/torch/default.nix
@@ -4,7 +4,7 @@
   }:
 stdenv.mkDerivation rec{
   version = "0.0pre20160820";
-  name = "torch-${version}";
+  pname = "torch";
   buildInputs = [
     luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4
     libjpeg zeromq3 ncurses openssl libpng readline pkgconfig
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 552bd4c1c51df45fec19499e1c2e33279e4ef790..af2fc6c879a703fd4ac61ec881711fe498202ae8 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "trompeloeil-${version}";
+  pname = "trompeloeil";
   version = "34";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index bcc91d058f0428f3c673272e78d56e2d4f7ed21c..d5af39d3f2a1e4e00d1ab3238159c8115bc2c12d 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tsocks-${version}";
+  pname = "tsocks";
   version = "1.8beta5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tsocks/${name}.tar.gz";
+    url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz";
     sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4";
   };
 
diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix
index a752da8cb57d0cc749fe3b0201100f7f64c4fa26..46b65a08eaab34d0969e822b6b0d5b9533a97df0 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/pkgs/development/libraries/twolame/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "twolame-${version}";
+  pname = "twolame";
   version = "2017-09-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix
index 9c899eb21ba7f689576b72eb47befb0b9ceca6bc..18f270e70db595bd45586cbfb40571e8a1102927 100644
--- a/pkgs/development/libraries/udns/default.nix
+++ b/pkgs/development/libraries/udns/default.nix
@@ -4,7 +4,7 @@
 # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1
 
 stdenv.mkDerivation rec {
-  name = "udns-${version}";
+  pname = "udns";
   version = "0.4";
 
   configurePhase = "./configure --enable-ipv6";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s";
 
   src = fetchurl {
-    url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz";
+    url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz";
     sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i";
   };
 
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 664bc29a72de3264c4d26f08841d2d04ad927c93..faee73fd393a9d0b6c66d0fa3e4919d206e1fee3 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "udunits-${version}";
+  pname = "udunits";
   version = "2.2.27.6";
   
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index 6eef95309aab5dc1df4468875d9af86fe2265d03..1b5fbe6c2cae8ff87184049ed33a69be5101ca22 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version="0.5.0";
-  name = "uhttpmock-${version}";
+  pname = "uhttpmock";
 
   src = fetchFromGitLab {
     repo = "uhttpmock";
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 6a22855630640742c3b73cac72170397c4abff85..e257088c41fb6f42631536d6bd002c1c31280191 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -3,13 +3,13 @@
 , usbutils, which, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "umockdev-${version}";
+  pname = "umockdev";
   version = "0.13.1";
 
   outputs = [ "bin" "out" "dev" "doc" ];
 
   src = fetchurl {
-    url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla";
   };
 
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 717edda18a2b51b30550648c3ea4db27ff001b47..73ca55cffd08c9de7027c00a5251a5e0f5c24e7f 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "unibilium-${version}";
+  pname = "unibilium";
 
   version = "2.0.0";
 
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index a902b6f84514bbcefc5fe98d2d0f71a05679544a..7fa8fe81c1109da7ff4bfb36582d0803aa6e0145 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
 
 stdenv.mkDerivation rec {
-  name = "libunicap-${version}";
+  pname = "libunicap";
   version="0.9.12";
 
   src = fetchurl {
-    url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz";
+    url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz";
     sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix
index aa4a7890b23ef27b7aa6161828b46770b525b0fe..96f318ff0ef50353cad09cc469682ab2f3f89240 100644
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ b/pkgs/development/libraries/unicorn-emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name    = "unicorn-emulator-${version}";
+  pname = "unicorn-emulator";
   version = "1.0.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index 90a28df6a15a58485840ac1e0fc35f33e726b153..0e5971945f3d6f764874707320ce66d60421362b 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "unittest-cpp-${version}";
+  pname = "unittest-cpp";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 1275df69f5968f10808e3bafed87223354b3cce5..3a51e2c986a77a959176ad1f304f5a92fe747c40 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "unixODBC-${version}";
+  pname = "unixODBC";
   version = "2.3.7";
 
   src = fetchurl {
-    url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
+    url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz";
     sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5";
   };
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 99535ec395ea6f0519a1fd5ed1adf78d22ff7554..b9aa1696d4878879b9248d77bc91be03bc2b969d 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -4,11 +4,11 @@
 
 {
   psql = stdenv.mkDerivation rec {
-    name = "psqlodbc-${version}";
+    pname = "psqlodbc";
     version = "10.01.0000";
 
     src = fetchurl {
-      url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+      url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
       sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7";
     };
 
@@ -28,11 +28,11 @@
   };
 
   mariadb = stdenv.mkDerivation rec {
-    name = "mariadb-connector-odbc-${version}";
+    pname = "mariadb-connector-odbc";
     version = "2.0.10";
 
     src = fetchurl {
-      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz";
+      url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
       sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
     };
 
@@ -57,12 +57,12 @@
   };
 
   mysql = stdenv.mkDerivation rec {
-    name = "mysql-connector-odbc-${version}";
+    pname = "mysql-connector-odbc";
     majorVersion = "5.3";
     version = "${majorVersion}.6";
 
     src = fetchurl {
-      url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz";
+      url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${pname}-${version}-src.tar.gz";
       sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr";
     };
 
@@ -86,7 +86,7 @@
   };
 
   sqlite = stdenv.mkDerivation rec {
-    name = "sqlite-connector-odbc-${version}";
+    pname = "sqlite-connector-odbc";
     version = "0.9993";
  
     src = fetchurl {
@@ -121,7 +121,7 @@
   };
 
   msodbcsql17 = stdenv.mkDerivation rec {
-    name = "msodbcsql17-${version}";
+    pname = "msodbcsql17";
     version = "${versionMajor}.${versionMinor}.${versionAdditional}-1";
 
     versionMajor = "17";
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 89efdc006a546f4083ee3e041598776c54a18978..9c48488bff8eb5e244baf025ff367cbda5792f20 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }:
 
 stdenv.mkDerivation rec {
-  name = "uriparser-${version}";
+  pname = "uriparser";
   version = "0.9.1";
 
   # Release tarball differs from source tarball
   src = fetchurl {
-    url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2";
+    url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
     sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m";
   };
 
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 3d09545c93170ec71d8a3d2081cf611cb556f568..2eee80a76969f18c34a3214c3a546ed83765ba47 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb }:
 
 stdenv.mkDerivation rec {
-  name = "usbredir-${version}";
+  pname = "usbredir";
   version = "0.8.0";
 
   src = fetchurl {
-    url = "https://spice-space.org/download/usbredir/${name}.tar.bz2";
+    url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2";
     sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47";
   };
 
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index c15259c585adc178387cfbd4403b4b528580443a..18eae87e11c6c863d23180d7f0f0476bc53ab3c9 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ustr-${version}";
+  pname = "ustr";
   version = "1.0.4";
 
   src = fetchurl {
-    url = "http://www.and.org/ustr/${version}/${name}.tar.bz2";
+    url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
   };
 
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index b80984303d76073d302bb9f8df47f20f2073eab6..e1f3c0bd39c2abe381dbec6443e2b09572d078ee 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.1.0";
 in
 stdenv.mkDerivation rec {
-  name = "uthash-${version}";
+  pname = "uthash";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
index 827274251ed9a737edd620221f43a7051bb9646c..7f9e8508a657ff35c7de73319f15bd0cdd6f2fc9 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -12,7 +12,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index a7dddd141246e27390d88d0ec856972c02095873..e134c9ea60f5ef15e9c62f19a51ff2f2b3ebe438 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -10,12 +10,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "3.16.14.11";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
-        + "${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2";
     sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
   };
 
diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix
index 2b9fa5cc04c08ffe718ba8e9ef418e27cc2ee99b..cb53765e394b534d74bda875a61c6ab536ae25de 100644
--- a/pkgs/development/libraries/v8/5_x.nix
+++ b/pkgs/development/libraries/v8/5_x.nix
@@ -102,7 +102,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "5.4.232";
 
   inherit doCheck;
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index f7c4f34e8e6e43ebecea40d0a37a865b33707307..2d9c5d4b92a37fdb0b77324bcf6c02d9f083602a 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -44,7 +44,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "7.4.255";
 
   doCheck = true;
diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
index e0ca0e14b66882b06e933cf81024aabdb0b4d27a..a72c9473d4ab1a9476d83473017f6cbd8e8a12c6 100644
--- a/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -111,7 +111,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v8-${version}";
+  pname = "v8";
   version = "6.4.388.40";
 
   inherit doCheck;
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
index 56ded2c56447f98e0ccac0d55090d13c5afbcb74..678d7dd265c4b61d011a8a1c8c9812ae2221bd1d 100644
--- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
+++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }:
 
 stdenv.mkDerivation rec {
-  name = "intel-hybrid-driver-${version}";
+  pname = "intel-hybrid-driver";
   version = "1.0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 640f50eb45bf171e2eae55daec1969fe00048320..722079ff3478970c88d48eb4b6fd68b25c04ccb2 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-vaapi-driver-${version}";
+  pname = "intel-vaapi-driver";
   # TODO: go back to stable releases with the next stable release after 2.3.0.
   #       see: https://github.com/NixOS/nixpkgs/issues/55975 (and the libva comment v)
   rev = "329975c63123610fc750241654a3bd18add75beb"; # generally try to match libva version, but not required
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index abdf9fbeed3ca508ae5dbaaf5d6fb118d443c538..8a2e3af4791c744783100e8ec8e64a7161f689d4 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vapoursynth-mvtools-${version}";
+  pname = "vapoursynth-mvtools";
   version = "21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index 1af70056d2ebcde763ce3287f2e9e4c5f939c6c4..18b2659cc5df68de024f6612f4e6bf01a567c0b1 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "Vc-${version}";
+  pname = "Vc";
   version = "0.7.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 66c8e4fbc5310b4111a803ab8965b219b4b29dad..2194c7be38b912d873d530b61bdd5665e9841a31 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "Vc-${version}";
+  pname = "Vc";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index b7249c8ee82c005242104e798f5dcaf2a5ca19b0..eb37d14b532b8444456b5fd4d13787a289bb3262 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, eigen }:
 
 stdenv.mkDerivation rec {
-  name = "vcg-${version}";
+  pname = "vcg";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix
index e516c94866a29cbc9c2cdc1bcf25297f23f80e5f..eb88b36a14227c96a22af80d73a1ee169cecdd68 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/pkgs/development/libraries/vid-stab/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "vid-stab-${version}";
+  pname = "vid-stab";
   version = "0.98b";
   
   src = fetchurl {
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index fb69d4bf63e7a7976cdb0e040aae15b342a1ca0f..625ec2cee38908122d0d183d0898f0d93106cdd9 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -5,7 +5,7 @@ let
   inherit (python2Packages) python numpy;
   # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
 in stdenv.mkDerivation rec {
-  name = "vigra-${version}";
+  pname = "vigra";
   version = "1.11.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 72803e09f075028e1636ec8dda0043b9624dfbb4..71bd608e93a15e7e54d83d11d796ad74a6f9c21b 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "virglrenderer-${version}";
+  pname = "virglrenderer";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2";
     sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
   };
 
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index e0398487abc3f92132fe3c123f3194063d87e647..a68880c2f9526783468ec88570ac6fb893bb1147 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vmime-${version}";
+  pname = "vmime";
   version = "0.9.2";
   src = fetchFromGitHub {
     owner = "kisli";
diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix
index 18b9278539fc841770579ef30fc5748881da0e4c..b9eb29422c54d6a70409a8e8a3713881b6bbbb4b 100644
--- a/pkgs/development/libraries/vmmlib/default.nix
+++ b/pkgs/development/libraries/vmmlib/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.2";
-  name = "vmmlib-${version}";
+  pname = "vmmlib";
 
   src = fetchFromGitHub {
     owner = "VMML";
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index f6669f2f8fea4fb443382f05c0ce0c4efc3e7d22..77cd3be0cbdae6db40322da3c125ce9c63c9dde4 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -7,7 +7,8 @@
 let
   version = "0.3.11";
 in stdenv.mkDerivation rec {
-  name = "volume_key-${version}";
+  pname = "volume_key";
+  inherit version;
 
   src = fetchgit {
     url = https://pagure.io/volume_key.git;
diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix
index 4f72cc138acf01e7888b193d920ba57cdf36da00..efd60fe66fb503b3a074f9190c7bfc1508464fb9 100644
--- a/pkgs/development/libraries/vrb/default.nix
+++ b/pkgs/development/libraries/vrb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "vrb-${version}";
+  pname = "vrb";
   version = "0.5.1";
 
   src = fetchurl {
-    url = "http://vrb.sourceforge.net/download/${name}.tar.bz2";
+    url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2";
     sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f";
   };
 
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index e706c730ddd367f3b875e4010df53dba3b4e222a..fd0e90941b89b5ca9248408c9330b5b2e19798f8 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "vsqlite-${version}";
+  pname = "vsqlite";
   version = "0.3.13";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 9e3886c264ebd8270430ba3dcc8f37b8eb136a60..032181e458ea7b4c2d4ae4da52d8ccb44cd5b4d7 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
-  name = "vulkan-headers-${version}";
-  version = "1.1.114.0";
+  pname = "vulkan-headers";
+  version = "1.1.106";
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index dd09d5d3c7c4a9795a5790063dfe2e177a9f27de..5631665a69169e244cdd7d603ea95e67cea3ffae 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -7,7 +7,7 @@ in
 
 assert version == vulkan-headers.version;
 stdenv.mkDerivation rec {
-  name = "vulkan-loader-${version}";
+  pname = "vulkan-loader";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 8af33c10319c52e9fad2632556058ee860a57585..f3f87b3ba60405b660a5036115dc40b0f89f54ca 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libiconv, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "wavpack-${version}";
+  pname = "wavpack";
   version = "5.1.0";
 
   enableParallelBuilding = true;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
 
   src = fetchurl {
-    url = "http://www.wavpack.com/${name}.tar.bz2";
+    url = "http://www.wavpack.com/${pname}-${version}.tar.bz2";
     sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r";
   };
 
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
index 3fda417d8e1ff89d592090ff11dea2bbafe08ec7..7572051b1de08f1d6d1b389fe8cca65a81701ef9 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -7,11 +7,11 @@
 assert expat != null;
 
 stdenv.mkDerivation rec {
-  name = "wayland-${version}";
+  pname = "wayland";
   version = "1.9.0";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
   };
 
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index b14dc03385cfd7dcbe40c2546658db02077be8c3..d2af8b084e685909846f9132bbfdcd809623768c 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "wayland-protocols-${version}";
+  pname = "wayland-protocols";
   version = "1.17";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
     sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz";
   };
 
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 5f9015fa9609af3baf818780a619c897bc57801e..b0c8c1edd66b04ded99bb0a7fffa328641ebb75d 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "6.4";
-  name = "wcslib-${version}";
+  pname = "wcslib";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
-    url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
+    url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
     sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k";
   };
 
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 04758ace7fa45ea0feb26f956b21a69f51f4eb33..25868cdb886e8ca91b587eb6e800bfe875b99b4f 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
+  pname = "webkitgtk";
   version = "2.4.11";
 
   meta = with stdenv.lib; {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://webkitgtk.org/releases/${name}.tar.xz";
+    url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
     sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
   };
 
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 927301589b4c890bb107e3b5fdcf8f3817ad0762..71b30960bacdc83b526d9e54c11cf6c1b6bb1344 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
+  pname = "webkitgtk";
   version = "2.24.3";
 
   meta = {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://webkitgtk.org/releases/${name}.tar.xz";
+    url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
     sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl";
   };
 
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix
index d84f30aad55ba5ada4fd189f9b57f77f095a7f98..84fbda503eac0c425e005f33efca9082828c270e 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/pkgs/development/libraries/websocket++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "websocket++-${version}";
+  pname = "websocket++";
   version = "0.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index bccf4f69e9d24e023fd347f2d5ea03667f947dbe..2ebad693de5055b169cebaf29d91338904a9c9b1 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -25,7 +25,7 @@ let
   optLeveldb = shouldUsePkg leveldb;
 in
 stdenv.mkDerivation rec {
-  name = "wiredtiger-${version}";
+  pname = "wiredtiger";
   version = "3.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 549e492e944cf47a95d181e6d1d410f1bddd3acb..780d7df47cb02868ddeb8643b908be44ea97c8dc 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "wolfssl-${version}";
+  pname = "wolfssl";
   version = "4.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index ba77189b2a5583c9032fb5bb44f9ce1df7edd943..60f911765992eb8508c52d8b5d9962310897ad42 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -7,7 +7,8 @@ let
   generic =
     { version, sha256 }:
     stdenv.mkDerivation rec {
-      name = "wt-${version}";
+      pname = "wt";
+      inherit version;
 
       src = fetchFromGitHub {
         owner = "emweb";
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index ce8e3f0f677cf3b9408fe576f86cbd58acfaf740..bdc8f8c3435ccecebb8e383e4a8dcd185314823a 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "wxSVG-${version}";
+  pname = "wxSVG";
   srcName = "wxsvg-${version}";
   version = "1.5.20";
 
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 49f12842533b3d05c2844c927e9448b2269b14e4..a528166f68a0db108c1e981874a5ec4259fd9bd9 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -2,7 +2,7 @@
 , darwin }:
 
 stdenv.mkDerivation rec {
-  name = "wxsqlite3-${version}";
+  pname = "wxsqlite3";
   version = "3.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 998f6a9e5f69c9c6b13be855703c500a30676a92..9ca15d4977b916107e67fe7ecbeb4861fe46593e 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "wxsqliteplus-${version}";
+  pname = "wxsqliteplus";
   version = "0.3.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index b952e8b126736fd63c225b4a6da80410882db636..38ee4376ac2d5c9b06d3b13cf665cc8001ed9d61 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.8.12.1";
-  name = "wxGTK-${version}";
+  pname = "wxGTK";
 
   src = fetchurl {
     url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 369d011f9b3c4cc52302b3b7697b560fafb3b373..02367e18a95bd5a369ded61ea43b0385da46f7d7 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -15,7 +15,8 @@ let
   version = "2.9.4";
 in
 stdenv.mkDerivation {
-  name = "wxwidgets-${version}";
+  pname = "wxwidgets";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index b33b0b15331a0339bed22ef5d56c3f93b9a03073..a12447562b81b5df0bcdf6ab98c8e8996f728735 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -18,7 +18,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "3.0.4";
-  name = "wxwidgets-${version}";
+  pname = "wxwidgets";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index cbe8bd8ac5eecb67d86e57a820b7d7b8b0d34104..5236996199d6bb093d0f027e0fdfafe9233a5fad 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.4";
-  name = "wxmac-${version}";
+  pname = "wxmac";
 
   src = fetchzip {
     url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index cee967ef2aa02ba2dc0a1c57d73a6d96ea16000e..8fe75153de6d64b43ddee12bcb2b04bdc0cd5f3c 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "3.1.2";
-  name = "wxwidgets-${version}";
+  pname = "wxwidgets";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index f2189cb014ec5bf9ad13253fb2da263c30d75af3..634847941d005eea47d57e8a9c83238767d41abf 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,7 +16,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "x265-${version}";
+  pname = "x265";
   version = "3.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index aeb741dbae7ba3e2eabc314edc7727aeb8bb4aaa..92a932a01a4aa9e5b2ff6d68338195420820b161 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -5,7 +5,7 @@ let
              if stdenv.isDarwin then "macosx" else
              throw "Unsupported platform";
 in stdenv.mkDerivation rec {
-  name = "xalan-c-${version}";
+  pname = "xalan-c";
   version = "1.11";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 271c7adf3d981d975c3d68deebf62d0acccd5bfd..362f704a05d8d69ca65717683add1f2dc85aa982 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -3,7 +3,8 @@
 
 let
   generic = version: sha256: stdenv.mkDerivation rec {
-    name = "xapian-${version}";
+    pname = "xapian";
+    inherit version;
     passthru = { inherit version; };
 
     src = fetchurl {
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 1203f19d6c82ac0980b163183c490c18c71c7a2b..6c8eda6358b22c3b9a544c74e1685f7b6902a865 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }:
 
 stdenv.mkDerivation rec {
-  name = "xapian-omega-${version}";
+  pname = "xapian-omega";
   inherit (xapian) version;
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix
index 31c31164e0102484cafb32b8b212e6901fcdac33..d7ec3ae9c1e8c65f49321387f310cf4377586127 100644
--- a/pkgs/development/libraries/xavs/default.nix
+++ b/pkgs/development/libraries/xavs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
-  name = "xavs-${version}";
+  pname = "xavs";
   version = "55";
 
   src = fetchsvn {
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index e343c301127fa2fcdf12799648c2d513f8ad0cdc..705bd6b87fc6ddece582fbc3703ceff00ca5d2a8 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -2,7 +2,7 @@
 , xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
+  pname = "xcb-util-cursor-0.1.1-3-unstable";
   version = "2017-04-05";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 8ad4e6d6a8a60eac774728595eaa1a786c18a905..704884c23f3e99ffefb588f248adb997d41099a2 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xerces-c-${version}";
+  pname = "xerces-c";
   version = "3.2.2";
 
   src = fetchurl {
-    url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
+    url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz";
     sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx";
   };
 
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 74d263a94179cdd9dd69f3d5121053e648945012..f4687bd46f85b7f12e60ef8ce41c0798f5cbe307 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -7,7 +7,7 @@
 assert ncclSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
-  name = "xgboost-${version}";
+  pname = "xgboost";
   version = "0.90";
 
   # needs submodules
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 718554b20a48b5ea9d580e5d47740a7741e00a47..3d1b4ea74db8a07b5d3bb934d2b304498053ad05 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "xlslib-${version}";
+  pname = "xlslib";
   version = "2.5.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index 35ae93e79392cc27aa4f4ad4a12c635779590eb2..e6ececf8513e9ca84dbb26e2d82b78767bf6e359 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xml-security-c-${version}";
+  pname = "xml-security-c";
   version = "2.0.2";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
+    url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz";
     sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3";
   };
 
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index fbe515f6217f50b390fff7af34be390a2e1e6ddc..d5e1eb08fa495e1ff6d93273a3e932a84b659fe6 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xml-tooling-c-${version}";
+  pname = "xml-tooling-c";
   version = "3.0.4";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index b19bf000b0d4dc8d85821294fc4d16a9e337d130..3e54944a3779efbd4a89d751ce51d4511a69cf1c 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -5,7 +5,8 @@ let
   version = "1.2.28";
 in
 stdenv.mkDerivation rec {
-  name = "xmlsec-${version}";
+  pname = "xmlsec";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
index 051a194af98e45caf23826ea6d138bf9a016bd05..5a267bbfe76787ea560ebb1c2c200765d355be41 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -4,7 +4,7 @@ let
   fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
 in
 stdenv.mkDerivation rec {
-  name = "xsd-${version}";
+  pname = "xsd";
   version = "4.0.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 17d7320cb6486f04dc9a7c5e52f443e4e34283bc..5ec96157a79c0bb1b20a1613fa0f96cb17623c77 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "xvidcore-${version}";
+  pname = "xvidcore";
   version = "1.3.5";
 
   src = fetchurl {
-    url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
+    url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w";
   };
 
diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index 70701f2d070e25a0ae667a26f07f83a292dc8b78..51165f47a219cff372cdad5f0375bc876f0cc8be 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/pkgs/development/libraries/xxHash/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "xxHash-${version}";
+  pname = "xxHash";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix
index c9c84f4e1d89922f61030bd0d504d56ff7e304dc..155e46c8f8c6a5c62023abdf21c6b236f6318613 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/pkgs/development/libraries/xylib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  name = "xylib-${version}";
+  pname = "xylib";
   version = "1.5";
 
   src = fetchurl {
-    url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd";
   };
 
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 82b53402fc789d1426c220cb13db932f86f225f1..a2e60eacf9894c1bf1dd558cd0ffce782f1cec18 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "zeroc-ice-${version}";
+  pname = "zeroc-ice";
   version = "3.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 8a89d2ae1c74cd962ae833a1c8fa0ad8a5b9fe46..db5d90e2f021028d3f529e0cd045d05be8602e6b 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-${version}";
+  pname = "zeromq";
   version = "4.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 9b7a90266284a364df07df993e9b623a30b15054..1b74b8c5388b0546633ba7a575847357f0270fae 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "zimlib-${version}";
+  pname = "zimlib";
   version = "1.4";
 
   src = fetchurl {
-    url = "http://www.openzim.org/download/${name}.tar.gz";
+    url = "http://www.openzim.org/download/${pname}-${version}.tar.gz";
     sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq";
   };
 
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
index 330b91e995d9809749f3b4421f78b318dec6b34f..5c6015757420786cf66985a60b9579a9f516daff 100644
--- a/pkgs/development/libraries/zlog/default.nix
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.14";
-  name = "zlog-${version}";
+  pname = "zlog";
 
   src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
     sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5";
   };
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix
index f7e849f6a3345fc268272124ffde3cf387ab2462..98211e6e3eb56207715c9f243dfcdd5674ee95f5 100644
--- a/pkgs/development/libraries/zmqpp/default.nix
+++ b/pkgs/development/libraries/zmqpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
 
 stdenv.mkDerivation rec {
-  name = "zmqpp-${version}";
+  pname = "zmqpp";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
index 65509d766b963a6ad4447a99ac684a8cfefb134d..78983f0954394fbc99f366641f113f1a9eccd331 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "zxcvbn-c-${version}";
+  pname = "zxcvbn-c";
   version = "2.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 010c73336b9244bca1ae36a0504e7924cfee561e..8b199d3e89a233caeb9c5f1d5d4003fe563ee6a2 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,7 +1,7 @@
 { docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "zziplib-${version}";
+  pname = "zziplib";
   version = "0.13.69";
 
   src = fetchurl {
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 08339802950422d74b696611da1e668a18f0d5cd..46d417fd2aac52534d9e8943dd7ea6cac882da5b 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -37,7 +37,7 @@ let lispPackages = rec {
   };
 
   quicklisp-to-nix-system-info = stdenv.mkDerivation rec {
-    name = "quicklisp-to-nix-system-info-${version}";
+    pname = "quicklisp-to-nix-system-info";
     version = "1.0.0";
     src = ./quicklisp-to-nix;
     nativeBuildInputs = [sbcl];
@@ -58,7 +58,7 @@ let lispPackages = rec {
   };
 
   quicklisp-to-nix = stdenv.mkDerivation rec {
-    name = "quicklisp-to-nix-${version}";
+    pname = "quicklisp-to-nix";
     version = "1.0.0";
     src = ./quicklisp-to-nix;
     buildDependencies = [sbcl quicklisp-to-nix-system-info];
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index 5ef83ed77b3bc2d00a93629b3dfa5dc3da415b45..d16f63152b844c2bcba4510344a925e50f757ad5 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.0";
-  name = "amdadl-sdk-${version}";
+  pname = "amdadl-sdk";
 
   src = requireFile {
     name = "ADL_SDK_6.0.zip";
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index 79651db23ea4d991693f255c5d62358134d71ec3..ba6d5559f26b1f39de47d28413f74baa52809ab1 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -36,7 +36,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "amdapp-sdk-${version}";
+  pname = "amdapp-sdk";
+  inherit version;
 
   src = fetchurl {
     url = stdenv.lib.getAttrFromPath [version "url"] src_info;
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 4527a8700f6ee8db7581b67041d3984cb8432378..48ea088a73c92985d7e6e2ac0ed7216247270d28 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -4,7 +4,8 @@ let
   version = "2.0.0";
 in
 stdenv.mkDerivation {
-  name = "avr-libc-${version}";
+  pname = "avr-libc";
+  inherit version;
 
   src = fetchurl {
     url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 0456c8eae769c748dc6517fbafd36facc8bf38d1..b84f358cbee0d4ec200f38e339d8deb2a9d2fa3d 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -3,7 +3,8 @@
 let
   version = "0.25";
 in stdenv.mkDerivation {
-  name = "mspdebug-${version}";
+  pname = "mspdebug";
+  inherit version;
   src = fetchFromGitHub {
     owner = "dlbeer";
     repo = "mspdebug";
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index 4230672e12f34d63558df7c8608f047f4794dee3..df0ef999dd6a323c88501c904b546ec3330a6478 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -2,7 +2,8 @@
 
 let version = "3.1.0";
 in stdenv.mkDerivation {
-  name = "newlib-${version}";
+  pname = "newlib";
+  inherit version;
   src = fetchurl {
     url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
     sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
index 0ec8664dac9e511562e21c35ca33d6c789d3ea85..8abe4b2550e03b00d3c8182c68826eac95b1ab52 100644
--- a/pkgs/development/misc/qmk_firmware/default.nix
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -6,7 +6,8 @@
 let version = "0.6.144";
 
 in stdenv.mkDerivation {
-  name = "qmk_firmware-${version}";
+  pname = "qmk_firmware";
+  inherit version;
   src = fetchFromGitHub {
     owner = "qmk";
     repo = "qmk_firmware";
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index e66bb6fe2118111d5e02c16975a9f2eeb309b30c..bc806410b1ea9cdb30ff532fe9ed0c4176996db6 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -15,7 +15,8 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "betaflight-${version}";
+  pname = "betaflight";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "betaflight";
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index 683883ddbce90e1d09f3cec08339e546265ec5fd..5014cdce8f378e0adc793de59acfc7d2d6cea26a 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -8,7 +8,8 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "inav-${version}";
+  pname = "inav";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "iNavFlight";
diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
index a2ddda34347a4dd0d0fa309c2f1708649099b6a2..eed4b43d6a363e5e62a94e7e5ac9a5b375ead9ea 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.6";
 in
 stdenv.mkDerivation {
-  name = "abootimg-${version}";
+  pname = "abootimg";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ggrandou";
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index b6d35051733a17e12ab705ae581838ef26e84208..8578e51e939d244c00fb13f2016227f1f984ed49 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, python3, platform-tools, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "adb-sync-${version}";
+  pname = "adb-sync";
   version = "2016-08-31";
 
   src = fetchgit {
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix
index fffe2fbbcbedd0f0cd1ba50cb5cc80ccabcda2fc..2033fa78ae58b5a3b6e2ad6aead684bad9456d3f 100644
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }:
 
 stdenv.mkDerivation rec {
-  name = "adbfs-rootless-${version}";
+  pname = "adbfs-rootless";
   version = "2016-10-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix
index 9cee1c9e5dee86456fc675c2a0078a3ac178e64a..706fa2c65998a7ae807e8cea2aaca0fa9bc5c014 100644
--- a/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/pkgs/development/mobile/imgpatchtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, bzip2, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "imgpatchtools-${version}";
+  pname = "imgpatchtools";
   version = "0.3";
 
   src = fetchzip {
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index f149cb622e1326b3429d04733325109878aa8d48..cd58ea4e20cfb01604dbefe4e78d31938cf9b295 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "cmake-modules-webos-${version}";
+  pname = "cmake-modules-webos";
   version = "19";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index 52b50635e33659454de8667a3081222ff4fe7fe3..e7afdb32137b2933cd59640d1b7e307367a4f37a 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, webos, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "novacom-${version}";
+  pname = "novacom";
   version = "18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index f82009b0c39c500aa354f55c83afa95d4c90dee5..4d62dd305d3a7faca20f558442053d58ed59d444 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -4,7 +4,7 @@ webos, cmake, pkgconfig,
 libusb }:
 
 stdenv.mkDerivation rec {
-  name = "novacomd-${version}";
+  pname = "novacomd";
   version = "127";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix
index 8128dc1cb6f5490d2f2f77674156d1c33110b508..4606ebd517218799f2edf86524c09cb15cc1fcc8 100644
--- a/pkgs/development/ocaml-modules/base64/2.0.nix
+++ b/pkgs/development/ocaml-modules/base64/2.0.nix
@@ -3,7 +3,8 @@
 let version = "2.0.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-base64-${version}";
+  pname = "ocaml-base64";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index a7e591e049e61b54aa10f27911461935e1503cb4..21897e3bf10ff7ecf41d7e49e0064e5be83445df 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -5,7 +5,7 @@ then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  name = "camomile-${version}";
+  pname = "camomile";
   version = "0.8.2";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index 48517036dc6d52d43853d4ba4feb7744db85835c..a30b574f19bc0d3c7b4327365b243746f098fb5e 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
 
 stdenv.mkDerivation rec {
-  name = "camomile-${version}";
+  pname = "camomile";
   version = "0.8.5";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index 4832f5c39af3bb93021dc48f24ddd11a6903a980..2a4d7004faa0c117062d6f6d2b793e745bfcd28b 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
-  name = "ocaml-cow-${version}";
+  pname = "ocaml-cow";
 
   src = fetchFromGitHub {
     owner  = "mirage";
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index 7720650ddfc92a87bd18c64f320e235616f9d206..17da11708c60cb2684ed62b601ebbf3114ea1089 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -5,7 +5,7 @@ then throw "cryptgps is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  name = "ocaml-cryptgps-${version}";
+  pname = "ocaml-cryptgps";
   version = "0.2.1";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 412146244278a283e067338e7ffcdcbcc6211dfa..1811e21cf58f37e7a32567635af79dfbc8d02c7e 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -18,7 +18,7 @@ let param =
 in
 
 stdenv.mkDerivation rec {
-  name = "cryptokit-${version}";
+  pname = "cryptokit";
   inherit (param) version;
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index d08259af247c5ae1dd4a925d23b7603047aa5536..dc6b1751283749df9e0792d43e3c6bd675344e0b 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, findlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-curses-${version}";
+  pname = "ocaml-curses";
   version = "1.0.4";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix
index 318353168336650e6f72a9375a967ef71f4af4e2..9239d2543ee3bfaf92a54de462c9c703e25ac669 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/pkgs/development/ocaml-modules/dolog/default.nix
@@ -3,7 +3,8 @@
 let version = "3.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-dolog-${version}";
+  pname = "ocaml-dolog";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz";
     sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb";
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 010df7d8df92c5e417e2a88771f7808afd663cb8..25e75ceeba365c0b2a3824ad21f04f6a940566d9 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec
 {
   pname = "eliom";
   version = "6.7.0";
-  name = "${pname}-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
index e8d9267aa8581f7900fdd1e0184d489c1e5a3660..93e2b3b8429581bbb3292820e6e37af69a49d247 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
 
 stdenv.mkDerivation rec {
-  name = "higlo-${version}";
+  pname = "higlo";
   version = "0.6";
   src = fetchFromGitHub {
     owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix
index 8a11d22c2c11953a77c7903c971da216be5ca870..40db8246f4aa89ffe04545f53266deae44cb08e4 100644
--- a/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/pkgs/development/ocaml-modules/iso8601/default.nix
@@ -3,7 +3,8 @@
 let version = "0.2.4"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-iso8601-${version}";
+  pname = "ocaml-iso8601";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz";
     sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi";
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 6b01929db76861b1d687b23f9ce14472d5d0a80a..e78dd91f00a3d43cf2b381b0201a288056a47df3 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -14,7 +14,7 @@ let param =
 in
 
 stdenv.mkDerivation rec {
-  name = "lablgtk-${version}";
+  pname = "lablgtk";
   inherit (param) version;
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index 3bced92cc3e3dec2cb1c917149958fb3d4744e7b..c91a5712137921f84843828bb95487df7910243b 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -3,7 +3,8 @@
 let version = stdenv.lib.getVersion llvm; in
 
 stdenv.mkDerivation {
-  name = "ocaml-llvm-${version}";
+  pname = "ocaml-llvm";
+  inherit version;
 
   inherit (llvm) src;
 
diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix
index 9a8a6259a7784b94a32abc7f0591e525e9e69b09..65acbd6cc42882b8eabad42a7e71ac63f90b0387 100644
--- a/pkgs/development/ocaml-modules/magic-mime/default.nix
+++ b/pkgs/development/ocaml-modules/magic-mime/default.nix
@@ -3,7 +3,8 @@
 let version = "1.0.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-magic-mime-${version}";
+  pname = "ocaml-magic-mime";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
index e69b9dabeabcc37c81a09625272690653ee82223..d767c20f6385de0a3846f46d1c0b02fe713d3991 100644
--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -1,7 +1,8 @@
 { version, src, stdenv, ocaml, findlib, ocamlbuild, ... }:
 
 stdenv.mkDerivation {
-  name = "menhir-${version}";
+  pname = "menhir";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index b789b133aaf3f3d7a91c2357889f0e981c66290b..11405c0ebe5e295a7700857f2dc1a45faffea705 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-libvirt-${version}";
+  pname = "ocaml-libvirt";
   rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
   version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
 
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 10d8484e3efa205a53b08510cecfd05e8f2de3ec..e210ffa11523e3efd70c20937d2dc26d52d98a42 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-text-${version}";
+  pname = "ocaml-text";
   version = "0.8";
 
   src = fetchzip {
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 20b63e3a8eefdbd81a72049a12f28763c21dce90..27442075064c23db285ded8e49c257ce8c3c7243 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }:
 
 stdenv.mkDerivation rec {
-  name = "ocamlfuse-${version}";
+  pname = "ocamlfuse";
   version = "2.7.1_cvs5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index e005024d222518c7315a813415665efd5fe086cb..887dce586897ce5e0f3b000cad8bb7515cfe7edd 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, lablgtk}:
 
 stdenv.mkDerivation rec {
-  name = "ocamlgraph-${version}";
+  pname = "ocamlgraph";
   version = "1.8.8";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix
index d6d0c3292bb56e0b323cf74ccb5361523dce1626..8063f284728b27b1ee7194c6b3905d338953623b 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -6,7 +6,8 @@ let
   sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8";
 
 in stdenv.mkDerivation {
-  name = "ocaml-make-${version}";
+  pname = "ocaml-make";
+  inherit version;
 
   src = fetchurl {
     url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
index 9c4c2e21edddcc85d8898d5b91b3ec132981c7d6..468e387f8f11ddf85415a76c0c740aabe92c1f8c 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -4,11 +4,11 @@
 assert lib.versionOlder ocaml.version "4";
 
 stdenv.mkDerivation rec {
-  name = "ocamlnat-${version}";
+  pname = "ocamlnat";
   version = "0.1.1";
 
   src = fetchurl {
-    url = "http://benediktmeurer.de/files/source/${name}.tar.bz2";
+    url = "http://benediktmeurer.de/files/source/${pname}-${version}.tar.bz2";
     sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 6117d30665f07c67575feb064a8bbc264a7d4bb9..0452b1b7dfe4082c7d644299d658cecaaa184f0c 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -4,7 +4,7 @@ if stdenv.lib.versionOlder ocaml.version "4.03"
 then throw "ocf not supported for ocaml ${ocaml.version}"
 else
 stdenv.mkDerivation rec {
-  name = "ocf-${version}";
+  pname = "ocf";
   version = "0.5.0";
   src = fetchFromGitHub {
     owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 569f5081355c64fe84f53d5d0fbb8e723fcbb05e..0263d3284ffacbedb02e0a49bec6f9a8841ab768 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -17,7 +17,8 @@ in
 let inherit (param) version; in
 
 stdenv.mkDerivation {
-  name = "ocsigen-deriving-${version}";
+  pname = "ocsigen-deriving";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
     inherit (param) sha256;
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 147b4200cf6987a08e003a63708c478b92fbfcaa..9499bff84a1085e03b6c2b0cd20143e0b23a623c 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -14,7 +14,7 @@ in
 
 stdenv.mkDerivation rec {
   version = "2.11.0";
-  name = "ocsigenserver-${version}";
+  pname = "ocsigenserver";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index bbe38ac89942828bdd54cde9b4b2f1cf8998af8b..83d47fbb3af89b717ee340ee37b812b14ec3a80e 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
-  name    = "piqi-ocaml-${version}";
+  pname = "piqi-ocaml";
 
   src = fetchurl {
     url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 6be1595f7c59da807c5aa917e21ddfcdd71a0faf..fb06820f19611d1e42553bd60f47654c59c03b0a 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.14";
-  name    = "piqi-${version}";
+  pname = "piqi";
  
   src = fetchurl {
     url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 38e1b3c7467d341342d7958ecded7c48c2f5d374..0b3f13bc54f214bf6f4e9712a688cb2fb65ccf08 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-sqlite3-${version}";
+  pname = "ocaml-sqlite3";
   version = "2.0.9";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index ab6a7d8f5235c417fd50d8764f35da73ad6b0dc9..079e810bfdc63f034b6f0cf369b5d48d8871facb 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.7";
-  name = "uuidm-${version}";
+  pname = "uuidm";
   src = fetchurl {
     url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
     sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8";
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 8282c38a1e7fcc37f759418cc5e3e6de04351e1c..2f633eed7a35f456ee194523bda5fc65678a77f3 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017.02.28";
-  name = "pharo-launcher-${version}";
+  pname = "pharo-launcher";
   src = fetchurl {
     url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip";
     sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0";
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 3bd72434eb3c63ce1a06d18f060ffe2d10d4bff6..ec4168508a7be056e9556454e0669067f14376d3 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "pharo-share-${version}";
+  pname = "pharo-share";
 
   dontUnpack = true;
 
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
index 75fceb7deedc12fea0ca2779c5d821d068403f13..cb0986e1d7f0b11824e0bce9c915ffa03813aba4 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Pygments";
-  version = "2.3.1";
+  version = "2.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a";
+    sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748";
   };
 
   propagatedBuildInputs = [ docutils ];
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 5769109f77419007ab3db6c2daa67414aeeefef1..049ceb124ea0a90c2c6c01141990ec15a8012170 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -40,14 +40,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
 
-  # Don't error on cryptography deprecation warning
-  postPatch = ''
-    substituteInPlace pytest.ini --replace "filterwarnings = error" ""
+  checkPhase = ''
+    pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms"
   '';
 
-  # coroutine 'noop2' was never awaited
-  doCheck = false;
-
   meta = with lib; {
     description = "Asynchronous HTTP Client/Server for Python and asyncio";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index a2a026e74d5bee817cd6484dcdfad485172c5d35..22bddb252c8e322a5bad0e6bdef2332baaeb56f0 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, setuptools_scm }:
+, pytest, setuptools_scm, isPy3k }:
 
 buildPythonPackage rec {
   pname = "apipkg";
@@ -19,8 +19,18 @@ buildPythonPackage rec {
       --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')"
   '';
 
-  checkPhase = ''
-    py.test
+  # Failing tests on Python 3
+  # https://github.com/pytest-dev/apipkg/issues/17
+  checkPhase = let
+    disabledTests = stdenv.lib.optionals isPy3k [
+      "test_error_loading_one_element"
+      "test_aliasmodule_proxy_methods"
+      "test_eagerload_on_bython"
+    ];
+    testExpression = stdenv.lib.optionalString (disabledTests != [])
+    "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'";
+  in ''
+    py.test ${testExpression}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
index de041c0f4c80d927cc618e48161666e7e3708e50..12a3529f86457af157e376af582916aa6eb8b55b 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
     pname = "augeas";
     version = "1.0.3";
-    name = pname + "-" + version;
 
     src = fetchFromGitHub {
       owner = "hercules-team";
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 0ccf3da7bec95a405f54f6931b03b6fb05f33366..7d1e365b243c1e638ebc998412e48af63871ae48 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,17 +1,17 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k,
   six, txaio, twisted, zope_interface, cffi, trollius, futures,
-  mock, pytest
+  mock, pytest, cryptography, pynacl
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "19.1.1";
+  version = "19.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff";
+    sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304";
   };
 
-  propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
+  propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++
     (lib.optionals (!isPy3k) [ trollius futures ]);
 
   checkInputs = [ mock pytest ];
@@ -21,6 +21,10 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  # Tests do no seem to be compatible yet with pytest 5.1
+  # https://github.com/crossbario/autobahn-python/issues/1235
+  doCheck = false;
+
   meta = with lib; {
     description = "WebSocket and WAMP in Python for Twisted and asyncio.";
     homepage    = "https://crossbar.io/autobahn";
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ec66124e3c78083bf05a6c14654e3073c7ce0d32
--- /dev/null
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  version = "1.2.4";
+  pname = "bids-validator";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  meta = with lib; {
+    description = "Validator for the Brain Imaging Data Structure";
+    homepage = "https://github.com/bids-standard/bids-validator";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 9bd7e586820d45cb50cc9da35e08ae87a59bdc6b..bd19b8eb33e2e5f7c41f98abdb3473a10b71ce47 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -16,7 +16,7 @@
 let visualizationSupport = (pyqtgraph != null);
 in
 buildPythonPackage rec {
-  name = "binwalk-${version}";
+  pname = "binwalk";
   version = "2.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index c2b0db61cbb3686e7afaf94269440715d0680bce..7de124267f0eca6606747e752ed8bfd46084283b 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -23,6 +23,12 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace ",<3dev" ""
   '';
 
+  # Disable a test
+  # https://github.com/mozilla/bleach/issues/467
+  checkPhase = ''
+    pytest -k "not test_only_text_is_cleaned"
+  '';
+
   meta = {
     description = "An easy, HTML5, whitelisting HTML sanitizer";
     longDescription = ''
diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index fde330d706f7bc753edb9112337794eec821bafc..7b67997fa08a14c44351fe5171b3241bf9f76548 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "blockdiag";
   version = "1.5.3";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 203ef9a4355d21cc1c0cbf1547307de923612b58..34178befebe42c8a9715085e67d33698dd4593d8 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.9.160"; # N.B: if you change this, change botocore too
+  version = "1.9.205"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f";
+    sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e3bbdf22ddf175dfdfd4df6dd5b80d113ad5f910..5c8b00fc6c15ac81c65a4b83ed4c2e8cf4af5b53 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp";
+    sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index c4db013ea34d3c95a6c1e8109163a14a7639a096..21492dc152cb4575a46850d7acaaae8f9961299a 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "Bottleneck";
   version = "1.2.1";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
index 6e2e703dd569aac3d6da002de214b72775224f29..069358a4d6d37677f9d6664c9a319392157e5dd9 100644
--- a/pkgs/development/python-modules/btchip/default.nix
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "btchip-python";
   version = "0.1.28";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 2c97cbd4a3349e757b8a6e6f50d9a754507e569a..7496e7e1fcceac3d31dc18bc7c5c0889ee8318e2 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "0.6";
   pname = "cgroup-utils";
-  name = pname + "-" + version;
 
   buildInputs = [ pep8 nose ];
   # Pep8 tests fail...
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 67120bf0f3d00f4f2441136d4c054f1b2ba6972f..234bb46f97bca1a1147bee640436127c00a811fb 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "cx_Freeze";
   version = "5.1.1";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index 6862d6447e5fcfb79c68d37f247dea58bcfc1dd9..b3d4a40bf66f5d760a064386e7603a0238816542 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "cymem";
   version = "2.0.2";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "explosion";
diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
index bb2e65125b7dd9241170a281fa398958dbd0244c..27665c689c415f9a4715a03cb448ca1060642f3d 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -38,6 +38,9 @@ in buildPythonPackage rec {
            --ignore datashape/tests/test_user.py
   '';
 
+  # https://github.com/blaze/datashape/issues/238
+  PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'";
+
   meta = {
     homepage = https://github.com/ContinuumIO/datashape;
     description = "A data description language";
diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3521e8ce129874258b80366d6a5f64bd0d059862
--- /dev/null
+++ b/pkgs/development/python-modules/delegator-py/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+, pexpect
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.1.1";
+  pname = "delegator.py";
+
+  src = fetchFromGitHub {
+    owner = "amitt001";
+    repo = "delegator.py";
+    rev = "v${version}";
+    sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb";
+  };
+
+  propagatedBuildInputs = [ pexpect ];
+
+  # no tests in github or pypi
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Subprocesses for Humans 2.0";
+    homepage = "https://github.com/amitt001/delegator.py";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
index a459e3c0e10b24340316690241375e8a70418926..9baafed4b75d53427c92365e009b327328c38397 100644
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -4,11 +4,11 @@
 }:
 
 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
   version = "1.8.19";
 
   src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
+    url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz";
     sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
   };
 
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index 5c0e57cddc022e3d1f8bedfcbed2c11e21cdf218..6e03a33f29b615a159b842becd7f93a459b8ec3b 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "dyn";
   version = "1.8.1";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index b09bef9fec4e65343c63e9ad1aec5eeecdad16af..1ad5ea1ab3b3b01c981991fba6fe9cba12175bbf 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "edward";
   version = "1.3.5";
-  name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 4e1b78f80be9a8babd98be8045d34b3be24b75ff..c7766802e4e425460aba1848d953e54d88cb1cfb 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "execnet";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
+    sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index 3b91fb717bc4d796281280184c56164e00bb2259..de7342d67ca07400f05b356815d3fbeb85a17caa 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "first";
   version = "2.0.2";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index a9ac85e6248b5cd522fcc9c1b9daed603f3c71c2..de313dc1c7d67393f234d16f9c02667020509eed 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "geopandas";
   version = "0.5.1";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "geopandas";
diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
index 95c64e7187b0f40d0ea9018e67691084310e903f..0f4bb4ce9c475aad7008df3314124aa9f512f778 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -8,7 +8,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "glances-${version}";
+  pname = "glances";
   version = "3.1.2";
   disabled = isPyPy;
 
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 8bbcaed377a89b73569767d1f283e5444062301c..2a65df18fa5485b1ed9fd32a90a762654e415c2a 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "GPy";
   version = "1.9.8";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 85c5c011dfd9872d2159aa954a2892f6307d8e0f..58d5c414cf0ab46de9d6796307b8bca432eb0c4e 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -17,6 +17,10 @@ buildPythonPackage rec {
       --replace "coverage>=4.0,<4.4" "coverage"
   '';
 
+  # Test failures but patch does not apply cleanly
+  # https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://pypi.python.org/pypi/gunicorn;
     description = "WSGI HTTP Server for UNIX";
diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix
index cfaaa56361134e49c587f2cd3e61058af9099e48..51d42e5c8b73690b699ebd173d81f4edb0934208 100644
--- a/pkgs/development/python-modules/hcs_utils/default.nix
+++ b/pkgs/development/python-modules/hcs_utils/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "hcs_utils";
   version = "2.0";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index 9938d4053879f85ee9a659c177ad52e46e0d1b0e..32c79b17136681ad28742ad7e949b194707559dd 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
   pname = "hmmlearn";
   version = "0.2.2";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+    url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
     sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4";
   };
 
diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix
index c4afe809cfb66d8f9b1ad65f287815e71d7cd677..59528723d80d6308fa1f476f4a3259520bbe1512 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -16,7 +16,7 @@ let components = {
 in
 stdenv.mkDerivation rec {
   version = "2.3.4";
-  name = "hoomd-blue-${version}";
+  pname = "hoomd-blue";
 
   src = fetchgit {
     url = "https://bitbucket.org/glotzer/hoomd-blue";
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 81301f337e6252cf04936524475e2b4af94b700b..e22ab22d5a76ce3cdf145b203e31bd717472f0cd 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -2,7 +2,7 @@
 , pbr, ldap, prettytable, fixtures, testresources, testtools }:
 
 buildPythonPackage rec {
-  name = "ldappool-${version}";
+  pname = "ldappool";
   version = "2.4.1";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 6babc6ae01457c5ade6b9d077e966399cab51674..40a4f6f7429f8e278ded7645f85277144b0b0905 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null
 buildPythonPackage rec {
   pname = "libgpuarray";
   version = "0.7.5";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "Theano";
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index 745f83fe5081f1422d790f25c8c4531189fb7552..c456d67ac4982bb90c2bb910be3161710b93fcef 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -8,7 +8,6 @@
 }:
 
 buildPythonPackage rec {
-  name    = "${pname}-${version}";
   pname   = "libsoundtouch";
   version = "0.4.0";
 
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 7f9aa3fa2e4840ffade431d55132a0814e50be39..6a49735840442f3de17e8f4e39d106ee3b3935ca 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
   pname = "llfuse";
   version = "1.3.6";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
+    url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2";
     sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
   };
 
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 04381d73834faa4256fb9e5dd9fa9d7392110a8e..876b57dd01fafaa29d43620259752ffa5915b6ef 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch
 , aws-xray-sdk
 , backports_tempfile
 , boto
@@ -26,13 +26,21 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "1.3.10";
+  version = "1.3.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj";
+    sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m";
   };
 
+  # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198.
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff";
+      sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "jsondiff==1.1.2" "jsondiff~=1.1"
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 76494c70b2eaa79f2908f16690caa30412850d7a..365f741c57fa261a5bde323010df6e4ea1cdeb2a 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -2,20 +2,20 @@
 , buildPythonPackage
 , fetchPypi
 , isPy3k
-, numpy
-, six
 , bz2file
-, nose
 , mock
+, nose
+, numpy
+, six
 }:
 
 buildPythonPackage rec {
   pname = "nibabel";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17";
+    sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw";
   };
 
   propagatedBuildInputs = [
@@ -25,16 +25,8 @@ buildPythonPackage rec {
 
   checkInputs = [ nose mock ];
 
-  checkPhase = let
-    excludeTests = lib.optionals isPy3k [
-      # https://github.com/nipy/nibabel/issues/691
-      "nibabel.gifti.tests.test_giftiio.test_read_deprecated"
-      "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays"
-      "nibabel.tests.test_minc1.test_old_namespace"
-    ];
-  # TODO: Add --with-doctest once all doctests pass
-  in ''
-    nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests}
+  checkPhase = ''
+    nosetests
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index e45a0033c82adbbdfec1ac30624079039eae83a3..2da580abd926156e02fb2dde0af3c89a27f25f75 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "nilearn";
   version = "0.5.2";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 42fb2de9dca61008838179572d3bf03a3ea382a6..5f33a5fe63ca249c8fa4a6b2cfa8209d6985ac40 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -16,6 +16,7 @@
 , packaging
 , prov
 , psutil
+, pybids
 , pydot
 , pytest
 , pytest_xdist
@@ -44,11 +45,11 @@ in
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.1.9";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016";
+    sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5";
   };
 
   postPatch = ''
@@ -79,6 +80,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    pybids
     codecov
     glibcLocales
     mock
@@ -89,13 +91,11 @@ buildPythonPackage rec {
     which
   ];
 
+  # ignore tests which incorrect fail to detect xvfb
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" pytest -v --doctest-modules nipype
+    LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display'
   '';
 
-  # See: https://github.com/nipy/nipype/issues/2839
-  doCheck = false;
-
   meta = with stdenv.lib; {
     homepage = https://nipy.org/nipype/;
     description = "Neuroimaging in Python: Pipelines and Interfaces";
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 5dd9538089103114cabe31ecaa5a2cf9f89c57c1..6aadd7f4533d7d7a912526dc7744b83c87801354 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "python-notify-${version}";
+  pname = "python-notify";
   version = "0.1.1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bce4c0426e40980010b9fe201d86d365a733d63b
--- /dev/null
+++ b/pkgs/development/python-modules/num2words/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, docopt
+, delegator-py
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.5.10";
+  pname = "num2words";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p";
+  };
+
+  propagatedBuildInputs = [ docopt ];
+
+  checkInputs = [ delegator-py pytest ];
+
+  checkPhase = ''
+    pytest -k 'not cli_with_lang'
+  '';
+
+  meta = with lib; {
+    description = "Modules to convert numbers to words. 42 --> forty-two";
+    homepage = "https://github.com/savoirfairelinux/num2words";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jonringer ];
+
+    longDescription =
+    "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second";
+  };
+}
diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
index 7fb1de53dbd943e7320c5919a1cb15f65e1987d6..7e34f3897bc58d9ee7d33dd63934997ab8160d38 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
   pname = "nwdiag";
   version = "1.0.4";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
+    url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
     sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa";
   };
 
diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index 73230b2e8fb393bbc05555e0bff42a02217b5375..4c0d4346ee796bd30d20b45ed58c0c36ffe48d54 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
   # This is not the "released" 3.0.0 just a commit
   version = "3.0.0";
-  name = "ovito-${version}";
+  pname = "ovito";
 
   src = fetchgit {
     url = "https://gitlab.com/stuko/ovito";
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 0183379ac00484a5425e7b2e4cced9def0cc9ed1..029ce4a1712de9f866309bfad1f426614268597e 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "paramz";
   version = "0.9.5";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 24539c7bbcef53f967662051f79184c7c3cac475..6f82c446a1ffef5e585d4b597b6b1a122e06c91a 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "passlib";
   version = "1.7.1";
-  name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix
new file mode 100644
index 0000000000000000000000000000000000000000..318642a393a3fabc6473372d5789619aa844b2e8
--- /dev/null
+++ b/pkgs/development/python-modules/path.py/2.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+, pytest-flake8
+, glibcLocales
+, packaging
+, isPy27
+, backports_os
+, importlib-metadata
+}:
+
+buildPythonPackage rec {
+  pname = "path.py";
+  version = "11.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
+  };
+
+  checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [
+    importlib-metadata
+  ] ++ lib.optional isPy27 backports_os
+  ;
+
+  LC_ALL = "en_US.UTF-8";
+
+  meta = {
+    description = "A module wrapper for os.path";
+    homepage = https://github.com/jaraco/path.py;
+    license = lib.licenses.mit;
+  };
+
+  checkPhase = ''
+    # ignore performance test which may fail when the system is under load
+    py.test -v -k 'not TestPerformance'
+  '';
+}
diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index 318642a393a3fabc6473372d5789619aa844b2e8..d3c3206fabafd087361254790fae3cbfe06af49c 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -9,15 +9,16 @@
 , isPy27
 , backports_os
 , importlib-metadata
+, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname = "path.py";
-  version = "11.5.2";
+  version = "12.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
+    sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f";
   };
 
   checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
@@ -39,4 +40,12 @@ buildPythonPackage rec {
     # ignore performance test which may fail when the system is under load
     py.test -v -k 'not TestPerformance'
   '';
+
+  patches = [
+    (fetchpatch {
+      url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch;
+      sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9";
+    })
+  ];
+
 }
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index 39a2789a360fd55f08652596b5f4a4e5ef44d4db..8fb6259c57495af59c21978bd058269d7d0e622d 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname   = "pathspec";
   version = "0.5.9";
-  name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index b35c9de19dcc42d75bf32ae325564eff9d60d583..f8db636520fbd3d475548db7115d9710fd43afe5 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -11,11 +11,10 @@
 buildPythonPackage rec {
   version  = "2.7";
   pname = "powerline";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url    = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
-    name   = "${name}.tar.gz";
+    name   = "${pname}-${version}.tar.gz";
     sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5";
   };
 
diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index 20d3eb31b0f7ac24cf70700363e34dd0a3bcebc4..e54fd1521b3ea2449e43b386b5b755cd98f0bc10 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -1,11 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
+
 buildPythonPackage rec {
   pname = "py";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694";
+    sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw";
   };
 
   # Circular dependency on pytest
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8779ad36ca2a4be616e1007f0186895bbc48928e
--- /dev/null
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -0,0 +1,49 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, isPy27
+, num2words
+, numpy
+, scipy
+, pandas
+, nibabel
+, patsy
+, bids-validator
+, sqlalchemy
+, pytest
+, pathlib
+}:
+
+buildPythonPackage rec {
+  version = "0.9.2";
+  pname = "pybids";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs";
+  };
+
+  propagatedBuildInputs = [
+    num2words
+    numpy
+    scipy
+    pandas
+    nibabel
+    patsy
+    bids-validator
+    sqlalchemy
+  ];
+
+  checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Python tools for querying and manipulating BIDS datasets";
+    homepage = https://github.com/bids-standard/pybids;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix
index eb6de23e0eaafc96af9a1871ac9ba77b8f8a8764..1cd95c83fa2e269d53c64939d591e672daeb2724 100644
--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/pkgs/development/python-modules/pyblock/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pyblock-${version}";
+  pname = "pyblock";
   version = "0.53";
   md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
 
   src = pkgs.fetchurl rec {
     url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
-        + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
     sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
   };
 
diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix
index 192d60cec46a37e3b16a8553191d147aa64a7d60..c441cea5f45d9b9d1711dfa4ca3b77721f55ff69 100644
--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -5,7 +5,6 @@
 mkDerivation rec {
   pname = "compyte";
   version = "git-20150817";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "inducer";
diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix
index e393265ae37fa970932763eaad0e61b38d340634..b5ca0c7ef6cf0acc5f74307af8006a43ab44691f 100644
--- a/pkgs/development/python-modules/pyev/default.nix
+++ b/pkgs/development/python-modules/pyev/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
   pname = "pyev";
   version = "0.9.0";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/p/pyev/${name}.tar.gz";
+    url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
     sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
   };
 
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index 2b20ba956009c6b688485173f16152ef68922889..bf92f7360ddbac3119bfd053e78864c31385cd7f 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -12,11 +12,10 @@ in
 buildPythonPackage rec {
   pname = "pyftgl";
   version = "0.4b";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "umlaeute";
-    repo = name;
+    repo = "${pname}-${version}";
     rev = version;
     sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
   };
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 4826db3a8c0204010d53cd8dd0159c0f9e657140..d685e3541f94e8c617e811f355f2227bd66e3919 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
   pname = "pygobject";
   version = "2.28.6";
   format = "other";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
@@ -31,7 +30,7 @@ buildPythonPackage rec {
   # used to select a specific version, in our setup it should have no
   # effect, but we leave it in case somebody expects and calls it.
   postInstall = ''
-    mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
+    mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}
 
     # Prevent wrapping of codegen files as these are meant to be
     # executed by the python program
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
index a03be0ac04dff5a4232f829e360d104312ce055f..947b5733a7e5217f91827ad6c2db13e5eaf35cd4 100644
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -4,7 +4,6 @@ buildPythonPackage rec {
   pname = "pygtksourceview";
   format = "other";
   version = "2.10.1";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index c02c0361cf283c431d4c729926966f8031acff5d..10bfb0d72b6fc35f50c82344f587405d824b281c 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -15,6 +15,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestrunner pytestcov pytest ];
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest"
+  '';
+
   meta = with lib; {
     description = "JSON Web Token implementation in Python";
     homepage = https://github.com/jpadilla/pyjwt;
diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
index 850e64000738a6aa1259a282f03d369e35c95119..4a5a5c5e1f9758d9c84ab90c212b7787f006b8c8 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -16,10 +16,10 @@ let
   });
 in stdenv.mkDerivation rec {
   version = "4.14.3";
-  name = "pykde4-${version}";
+  pname = "pykde4";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz";
+    url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
     sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
   };
 
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index 073a2e624a5fa657193d21fbe5eb496c31884946..9803e7800c37061e04affbfdf5efe80e5391a173 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -7,9 +7,9 @@
 
 stdenv.mkDerivation rec {
   version = "4.14.38";
-  name = "kdelibs-${version}";
+  pname = "kdelibs";
   src = fetchurl {
-    url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz";
+    url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
     sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
   };
 
diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix
index 97fbe28e50d77842618c15a4f081c74358c81f80..f366f6e57f606de594d8b6aa8fe1cd3c9223c457 100644
--- a/pkgs/development/python-modules/pylibacl/default.nix
+++ b/pkgs/development/python-modules/pylibacl/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "pylibacl";
   version = "0.5.3";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index fb2e9abe0651805a2a8c9844d5db3c302fed9c81..1561c3c4d6def34e40df2901422ed36bf0c84660 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -35,6 +35,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # https://github.com/pyca/pynacl/issues/550
+  PYTEST_ADDOPTS = "-k 'not test_wrong_types'";
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ va1entin ];
     description = "Python binding to the Networking and Cryptography (NaCl) library";
diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index 47a73c9c80af6d5b743f1dd66be25e99b2574c27..ca606767f4d57c886172fbf7b09b0acf6270e240 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "pyocr";
   version = "0.5.3";
-  name = pname + "-" + version;
   disabled = !isPy3k;
 
   # Don't fetch from PYPI because it doesn't contain tests.
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index 1a477ab23284628f4bc41a805aadff72a4b83992..3defe979d3783b550122480e2b34add73fff34aa 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -6,7 +6,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "pyparted-${version}";
+  pname = "pyparted";
   version = "3.10.7";
   disabled = isPyPy;
 
diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
index 76503122a1b12ee8d0c1584505deb5a212bd9926..0313632e6fd1fc5ded759274547a2cdc7e884664 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -2,7 +2,7 @@
 , isPy3k, isPyPy
 }:
 buildPythonPackage rec {
-  name = "pypillowfight-${version}";
+  pname = "pypillowfight";
   version = "0.2.4";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index 65ff765a5849e5a69eb8174889775d1f996205ba..8851b0464146bb632bf4a4dae5254290cf285d1b 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -13,8 +13,6 @@
 }:
 
 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "Pyro4";
   version = "4.75";
 
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index a2b614ba3b8c600551f9671202dcd90be1dbae4a..cabb96d22565511190bb506862e654b820ac9ea4 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.14.11";
+  version = "0.15.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2";
+    sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index b61bc8d5fa50671060b436f9e63b1fd26bfbcf77..a2796fba5d8ff88ae3ac6accef2996bca3971e42 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+, setuptools_scm, pytest-forked, filelock, six, isPy3k }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
@@ -13,6 +14,10 @@ buildPythonPackage rec {
   checkInputs = [ pytest filelock ];
   propagatedBuildInputs = [ execnet pytest-forked six ];
 
+  # Encountered a memory leak
+  # https://github.com/pytest-dev/pytest-xdist/issues/462
+  doCheck = !isPy3k;
+
   checkPhase = ''
     # Excluded tests access file system
     py.test testing -k "not test_distribution_rsyncdirs_example \
diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/2.nix
similarity index 76%
rename from pkgs/development/python-modules/pytest/3.10.nix
rename to pkgs/development/python-modules/pytest/2.nix
index 2b4dd41bc2ecb5bc58edd79c420033a0ccb7a26e..7a43a2e2517b1555ffe436c37b9ede68555b28b8 100644
--- a/pkgs/development/python-modules/pytest/3.10.nix
+++ b/pkgs/development/python-modules/pytest/2.nix
@@ -1,9 +1,9 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock, writeText, pathlib2
+, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
 }:
 buildPythonPackage rec {
-  version = "3.10.1";
+  version = "4.6.5";
   pname = "pytest";
 
   preCheck = ''
@@ -13,18 +13,19 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660";
+    sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
   };
 
   checkInputs = [ hypothesis mock ];
   buildInputs = [ setuptools_scm ];
-  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
+  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
     ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
     ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
+  doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
   checkPhase = ''
     runHook preCheck
-    $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py
+    $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 96001a2d952e814ab12f06021258f467ee9b27a8..7866454a62fa3668a6c63e7b9e05449e65493b10 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -3,7 +3,7 @@
 , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
 }:
 buildPythonPackage rec {
-  version = "4.6.3";
+  version = "5.1.0";
   pname = "pytest";
 
   preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45";
+    sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031";
   };
 
   checkInputs = [ hypothesis mock ];
@@ -23,9 +23,10 @@ buildPythonPackage rec {
     ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
+  # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929
   checkPhase = ''
     runHook preCheck
-    $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
+    $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 47e269c2ff506851db7e2e8c47f89621faf9268f..beb57ac491af8b355303c2cc7dc3e42d8a0958d1 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -3,11 +3,11 @@
 # Should be bumped along with EFL!
 
 buildPythonPackage rec {
-  name = "python-efl-${version}";
+  pname = "python-efl";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
     sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
   };
 
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 4eb2daaf26dc0f4fb37e21cc3004c88c453a74ce..a9377c4a1c21346f77c46a57593a0eef45560cd8 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -25,6 +25,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # https://github.com/mpdavis/python-jose/issues/149
+  PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'";
+
   propagatedBuildInputs = [ future six ecdsa rsa ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
index c7709c4886d9c0b7b1d80779ad7cd5edd447aaf7..e967ba9934d282c11b8f003c6fabb3f118f62b26 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "python-lz4";
-  version = "2.1.6";
+  version = "2.1.10";
 
   # get full repository inorder to run tests
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gx228946c2w645sh190m7ixfd0zfkdl3i8ybga77jz2sn1chzdi";
+    sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr";
   };
 
   buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix
index 1ff1f6512645ef806b88b5e64aecb7a9b8b70bde..24f56ae53b24c13ba64379086695312533fc9bb6 100644
--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "python-fedora";
   version = "0.10.0";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix
index f667e09892c1805ef9d04519acfb25591a2f800c..7a137f5204ce2322cf0b42307e28322c35146a5d 100644
--- a/pkgs/development/python-modules/pyxattr/default.nix
+++ b/pkgs/development/python-modules/pyxattr/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
     pname = "pyxattr";
     version = "0.6.1";
-    name = pname + "-" + version;
 
     src = fetchPypi {
       inherit pname version;
diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix
index 91c2009744f717e70a60649adac9365906c774ac..06010b40ed9673c63de49835cb0d0e6f8c8e776b 100644
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -11,7 +11,7 @@
 disabledIf (isPy3k || isPyPy)
   (buildPythonPackage rec {
     # TODO: Qt5 support
-    name = "qscintilla-${version}";
+    pname = "qscintilla";
     version = pkgs.qscintilla.version;
     format = "other";
 
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index aaa095c5398017f64d0394c720061950b7857dab..9644055b007183e67e474e4e084aead56211cc54 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "python-recursive-pth-loader";
   version = "1.0";
-  name = pname + "-" + version;
 
   dontUnpack = true;
 
diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix
index 8bac32ba9112303032c2a1fe94d16d6b3af3f482..4db1db04acce3fc96d474c199df9cabb34c45e1b 100644
--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
   version = "1.2.3";
   pname = "robotframework-ride";
   disabled = isPy3k;
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
+    url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz";
     sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
   };
 
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix
index 3164be5aa86dbb2b6dc19937dbe145ed8375674a..bbe20fd1e8258de83f0ea2396a7240ea6bfb9d39 100644
--- a/pkgs/development/python-modules/rpkg/default.nix
+++ b/pkgs/development/python-modules/rpkg/default.nix
@@ -4,12 +4,11 @@
 buildPythonPackage rec {
   pname = "rpkg";
   version = "1.50";
-  name  = "${pname}-${version}";
 
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://releases.pagure.org/rpkg/${name}.tar.gz";
+    url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz";
     sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv";
   };
 
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index a69ab0d27a3c65f32f48056d6be48bb551fda997..9348891701745f2768f90a5e4446ccfeacfafde7 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a";
+    sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5";
   };
 
   checkInputs = [ nose pytest ];
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix
index 079e88378c07a5d3ad57e9cc389b22b95348afde..7bb66be3096ece52fe0c1f6ff8c3e7f958adcdac 100644
--- a/pkgs/development/python-modules/selectors34/default.nix
+++ b/pkgs/development/python-modules/selectors34/default.nix
@@ -6,8 +6,6 @@
 }:
 
 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "selectors34";
   version = "1.2";
 
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 158d9a054df940ede3eb7c098dd874fa0559360e..1f6307f2cbbf5a7f4c95212d92fc3531e6e65968 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
   pname = "seqdiag";
   version = "0.9.6";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
+    url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
     sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf";
   };
 
diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
index 5ea59eb6a2a39d767489ebce90b91b8bf0ab5e10..887d0c544245dd997680fb2d1273c29bfde22bc3 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -9,8 +9,6 @@
 }:
 
 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "serpent";
   version = "1.27";
 
diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix
index ac625cf1fa04c5501e8f880c2f35a8db35381791..514a3005725e2b6108b3dea3a0edee5964149852 100644
--- a/pkgs/development/python-modules/smugline/default.nix
+++ b/pkgs/development/python-modules/smugline/default.nix
@@ -8,7 +8,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname   = "smugline";
   version = "20160106";
 
diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix
index 5eb8d77a244d63cadc9b18527a6e5d2a1a8887db..c2028228c31c470756e5b696be672aa1fa6c8d0b 100644
--- a/pkgs/development/python-modules/smugpy/default.nix
+++ b/pkgs/development/python-modules/smugpy/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
-  name    = pname + "-" + version;
   pname   = "smugpy";
   version = "20131218";
 
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
index 3309f1e9978f23af9310a1185afb81b319403682..f1455f945a9fef4ac619263f70cb8675baf1dca4 100644
--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
   pname = "sphfile";
   version = "1.0.1";
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+    url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz";
     sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8";
   };
 
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 9a414e31360b2adc85869af9afc1d5a160982b8c..70471aedbd7629bf8b6f2b7fffbf6eac192599b3 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "spotipy";
   version = "2.4.4";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index c7ff2e56f02bb3136bca6f3c397ff2ba69e0f1e1..beb19b64f5ffa0a6c2b8c8ba47bf36ef19301f2a 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,41 +1,29 @@
-{ lib
-, fetchPypi
-, fetchpatch
-, buildPythonPackage
-, pytest
+{ lib, fetchPypi, buildPythonPackage, isPy3k
 , mock
-, isPy3k
 , pysqlite
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.2.14";
+  version = "1.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04";
+    sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1";
   };
 
-  patches = [
-    # fix for failing doc tests
-    # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail
-    (fetchpatch {
-      name = "doc-test-fixes.patch";
-      url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw;
-      sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri";
-    })
-  ];
-
   checkInputs = [
     pytest
     mock
-#     Disable pytest_xdist tests for now, because our version seems to be too new.
-#     pytest_xdist
   ] ++ lib.optional (!isPy3k) pysqlite;
 
+  postInstall = ''
+    sed -e 's:--max-worker-restart=5::g' -i setup.cfg
+  '';
+
   checkPhase = ''
-    py.test -k "not test_round_trip_direct_type_affinity"
+    pytest test
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix
index 51c80e0fa910954f100cf6a31d250ae34e636559..7821c7b3d7437d35d71e6bae2cbecc9c56fa38f6 100644
--- a/pkgs/development/python-modules/sybase/default.nix
+++ b/pkgs/development/python-modules/sybase/default.nix
@@ -8,11 +8,10 @@
 buildPythonPackage rec {
   pname = "python-sybase";
   version = "0.40pre2";
-  name = pname + "-" + version;
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j";
   };
 
diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index ec5b3b325dd2f42cf6c7d3f4b02b8877b48508ad..cbe2a2131918b0b6bf5684d77a6c239b372cc184 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "systemd";
   version = "234";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "systemd";
diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix
index 318c47d21608fa7b49efe80e8e37212318b939d7..4eff644a1616c7aee039deff56eafa92e96657da 100644
--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   version = "0.5.3-2016-09-28";
-  name = "tempita-${version}";
+  pname = "tempita";
 
   src = fetchFromGitHub {
     owner = "gjhiggins";
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 0915bc300c54a3c7f5361e775325512899123093..0413fd33f6f02ad156be591026243719e0c683f8 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   version = "0.2.1";
   pname   = "torchvision";
-  name    = "${pname}-${version}";
 
   format = "wheel";
 
diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix
index 5c5ecd8949a27635cd658df5a5acde5e3cc328b5..51e634d2439ba91c3d4759d41cb2838df3d6c068 100644
--- a/pkgs/development/python-modules/typing/default.nix
+++ b/pkgs/development/python-modules/typing/default.nix
@@ -5,11 +5,11 @@ let
 
 in buildPythonPackage rec {
   pname = "typing";
-  version = "3.6.6";
+  version = "3.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d";
+    sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk";
   };
 
   # Error for Python3.6: ImportError: cannot import name 'ann_module'
diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix
index 416c857bdc68d8e4999f854d0750e87c8e8cf093..95c0d628697c9e330d3067c937c88a5f59ea38a0 100644
--- a/pkgs/development/python-modules/umemcache/default.nix
+++ b/pkgs/development/python-modules/umemcache/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
   pname = "umemcache";
   version = "1.6.3";
   disabled = isPy3k;
-  name = pname + "-" + version;
 
   src = fetchurl {
-    url = "mirror://pypi/u/umemcache/${name}.zip";
+    url = "mirror://pypi/u/umemcache/${pname}-${version}.zip";
     sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
   };
 
diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix
index 35afe10f8d246858f4701561a4f407c08648e8d4..dcb8eca187e8287627826400e51c90d12a55fb58 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/pkgs/development/python-modules/unicorn/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPackages, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name  = "${pname}-${version}";
   pname = "unicorn";
   version = "1.0.1";
 
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index 6835f8c48e0a715040315f6a0808d2ba9ca5a732..cf3d36c3e5db65ee4d6a79f5a0eca03fdf6f8743 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "uritools";
   version = "2.2.0";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index ffd99734f93284b166c8e87c3c87d0dc9abd0cdb..31e6e6a066a715a6dbc62316f94d95c83f8e40ff 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "urlgrabber";
   version = "4.0.0";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index bcbaa0b728c352a1c72ebb47d28f9f4984e60985..8b397d3c42c6f993665519e9bc71195736ddd6db 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "usbtmc";
   version = "0.8";
-  name = pname + "-" + version;
 
   src = fetchurl {
     url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index cbf82ca7ca3d530783f8a7d30a2ba0c4247cac92..b3d397b97b413b8e3fb9fb173c4159aab917a4d3 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "Werkzeug";
-  version = "0.15.4";
+  version = "0.15.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6";
+    sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6";
   };
 
   propagatedBuildInputs = [ itsdangerous ];
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index 584200ff2b09a40a2deceeb2e578d15ff07ad280..8b30cc6be87f0af43949abfd7b1ef23169a3e770 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -21,7 +21,6 @@ assert wxGTK.unicode;
 buildPythonPackage rec {
   pname = "wxPython";
   version = "3.0.2.0";
-  name = pname + "-" + version;
 
   disabled = isPy3k || isPyPy;
   doCheck = false;
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 4bd95a8d745a761da55f1f956c6dab1607d04784..8b44203a7d2e2f7bd7362895e5947a3c4e132b37 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "ammonite-${version}";
+  pname = "ammonite";
   version = "1.6.9";
   scalaVersion = "2.12";
 
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index a8b8a965256fbc9b8f688d3c3e3f04527a0a0b66..16b4be47d8b790891870763580152f125e5cae9c 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -4,7 +4,6 @@ with python3Packages;
 buildPythonApplication rec {
   pname = "autoflake";
   version = "1.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 95f5a418a617a2be751be083f5111aed75951d52..ac2c6795a42890b0cfb73a13943cb35b0b38802c 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "8.23";
-  name = "checkstyle-${version}";
+  pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 2e01e4d8f28e926c4b165984c29967f4215d7138..6b0c1b401f63020c8df8f8df7b1d9c8dc71e5da3 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name    = "clang-analyzer-${version}";
+  pname = "clang-analyzer";
   version = "3.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index 2b4a87ffcb8dce91eb4c97c04956887c9ee69253..951c46e2166fdb57448be01c4c2b0b5c870570fe 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.0.1";
-  name = "coan-${version}";
+  pname = "coan";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix
index bd0a4ee5e40a0739be6ae49484cc655b26ee83f5..bd8c5c37c864a7bf6c308429dc3b5aaa518c46a5 100644
--- a/pkgs/development/tools/analysis/cov-build/default.nix
+++ b/pkgs/development/tools/analysis/cov-build/default.nix
@@ -7,7 +7,7 @@ let
   '';
 in
 stdenv.mkDerivation rec {
-  name    = "cov-build-${version}";
+  pname = "cov-build";
   version = "7.0.2";
 
   src =
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 09901afdd20b1d05edf6eeecf55790c89d498e2a..8b6eb71f90ff261750d1308572ef7b2477886465 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "cppcheck";
   version = "1.88";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv";
   };
 
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix
index 00c020e3f404269e25a8663217f9e4b6a9c5e5b7..ed338a6e0d9bd32dd4fec5a51509c327c57f4cde 100644
--- a/pkgs/development/tools/analysis/eresi/default.nix
+++ b/pkgs/development/tools/analysis/eresi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, which, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "eresi-${version}";
+  pname = "eresi";
   version = "0.83-a3-phoenix";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index 77bfa548068c9e3ecedd20a2483f5a2f331ad3d4..36fa7bb1f1613b28eba926ccaf5dc9bd73abce9a 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "evmdis-unstable-${version}";
+  pname = "evmdis-unstable";
   version = "2018-03-23";
   goPackagePath = "github.com/Arachnid/evmdis";
 
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 5f6b894f9849814a01c9b44d798264634646b794..8f17099337070fb356729fa29f9af672080026b4 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -22,7 +22,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name    = "frama-c-${version}";
+  pname = "frama-c";
   version = "19.0";
   slang   = "Potassium";
 
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 019a449ebcd983abeb4d7fd4f9d846816240e85c..c05d47e396cf61e0f97555ae17f6e9ff425056f1 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, llvmPackages, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "include-what-you-use-${version}";
+  pname = "include-what-you-use";
   # Also bump llvmPackages in all-packages.nix to the supported version!
   version = "0.12";
 
   src = fetchurl {
     sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5";
-    url = "${meta.homepage}/downloads/${name}.src.tar.gz";
+    url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
   };
 
   buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 939ae10c089d8bc6f471510bc4b66f128ec08420..455ff7722fa97265db4464c7fb6ae1a5d5801b9a 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "jdepend-${version}";
+  pname = "jdepend";
   version = "2.9.1";
 
   src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin $out/share
-    install dist/${name}.jar $out/share
+    install dist/${pname}-${version}.jar $out/share
 
     cat > "$out/bin/jdepend" <<EOF
     #!${runtimeShell}
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index af20165d155f39a5373853c507bc4cf30717c9fa..b5bc31ad5e9f47592dc47e56af0eedada8ee0ad9 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
 
 stdenv.mkDerivation rec {
-  name = "kcov-${version}";
+  pname = "kcov";
   version = "36";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
index a9793e04883905de61c8ad73a5f94dc8a0fe9b00..c2f0236ed0b491d3263563db5da4f1a8d0a22be0 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -6,11 +6,11 @@
 }:
 
 mkDerivation rec {
-  name = "massif-visualizer-${version}";
+  pname = "massif-visualizer";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/massif-visualizer/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q";
   };
 
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 39cd6417542e9828d782dc017d83f44bde336ac2..2db6b821b4e1eeb42ec8d2ba93dbe9420c01c99a 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -32,7 +32,8 @@ let
     cs_sha256
   }:
     stdenv.mkDerivation rec {
-      name = "radare2-${version}";
+      pname = "radare2";
+      inherit version;
 
       src = fetchFromGitHub {
         owner = "radare";
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index 4fc85c3016650e961174edfeba4432ca9a173713..e8e3168e937caa90b61e6441ba181a66296c3748 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.5";
-  name = "randoop-${version}";
+  pname = "randoop";
 
   src = fetchurl {
-    url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip";
+    url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
     sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx";
   };
 
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index fec127178f9ea41ac66f88a119ddadcd13796787..475d1950bb2a7e533ee4fd2176cfabcd4f5596cf 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -124,7 +124,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "retdec-${version}";
+  pname = "retdec";
 
   # If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec
   # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions.
diff --git a/pkgs/development/tools/analysis/retdec/yaracpp.nix b/pkgs/development/tools/analysis/retdec/yaracpp.nix
index cc857b86145f35878904af3a9bdb804ecdb84996..c8bc4ed747b38887c9076b23561bdac7d24df941 100644
--- a/pkgs/development/tools/analysis/retdec/yaracpp.nix
+++ b/pkgs/development/tools/analysis/retdec/yaracpp.nix
@@ -13,7 +13,7 @@ let
 in stdenv.mkDerivation rec {
   # only fetches the yaracpp source patched to work with a local yara clone,
   # does not build anything
-  name = "yaracpp-src-${version}";
+  pname = "yaracpp-src";
   version = "2018-10-09";
   rev = "b92bde0e59e3b75bc445227e04b71105771dee8b"; # as specified in retdec/deps/yaracpp/CMakeLists.txt
 
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index cd2fb21209c483d172c648a40a8991d320880aef..844fd38d9be6e54e27118525ec05c508a0583523 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.2.0";
-  name = "rr-${version}";
+  pname = "rr";
 
   src = fetchFromGitHub {
     owner = "mozilla";
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index e965acc746ccd0d7ef49604ede48393ab0e12c30..f8f2f55c5aa704c45701315200ba6f9a941e43d6 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "snowman-${version}";
+  pname = "snowman";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index fbb7eca0ef51305bbfc89a2f311ca73328074aa1..26598bb36cd044a9b0295f1cc681d71a2b04833c 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -6,7 +6,7 @@ let
   ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ];
 
 in stdenv.mkDerivation rec {
-  name = "spin-${version}";
+  pname = "spin";
   version = "6.4.9";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index d9d70f64d73ec4c4c6c3128703024295d56c2423..56f9f98856cc0e08e3e2356258e1d932fccdc797 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre, build-tools }:
 
 stdenv.mkDerivation rec {
-  name = "apktool-${version}";
+  pname = "apktool";
   version = "2.4.0";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index d2cb7e807b584ea8f4233a7c636f84ea99dbea8c..04cb6f808df2f9c7b53a044d7bff872f4d3a49d2 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -5,7 +5,7 @@
 }:
 
 buildGoPackage rec {
-  name = "asmfmt-${version}";
+  pname = "asmfmt";
   version = "1.1";
 
   goPackagePath = "github.com/klauspost/asmfmt";
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 2089142a1debf631944c0c8eb6ff82e3c48ae679..403d0ab745a97747e23d0fe808663a8dd577e577 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "azure-storage-azcopy-${version}";
+  pname = "azure-storage-azcopy";
   version = "10.0.1-pre";
   revision = "10.0.1";
   goPackagePath = "github.com/Azure/azure-storage-azcopy";
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index f66c841426480b5f7db1a95a5b60779cba58ce5e..9a12a7afc625b79c900c47d5f18a233844af4744 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "bloaty-${version}";
+  pname = "bloaty";
 
   src = fetchFromGitHub {
     owner = "google";
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 7b5391725423d0caa611051fffd5ad78918f06bc..2623787993c665547fecb610eebf113adbddf9b5 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "boomerang-${version}";
+  pname = "boomerang";
   version = "0.4.0-alpha-2018-07-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 89c1b560eacaab3060433660e0c0808144fd2d77..f392475f61874e22d054e390ff6b3c9120fb2016 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "boost-build-${version}";
+  pname = "boost-build";
   version = "2016.03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 8816a005ca0fc5853c280e26029769f687f269c9..0a86aaeb6ca07cc0ab2ca5e2b9c8200fc212690b 100644
--- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -3,7 +3,8 @@
 let version = "1.9.6"; in
 
 stdenv.mkDerivation {
-  name = "ant-${version}";
+  pname = "ant";
+  inherit version;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b6c2702485b169cd30e9450e34fee8e6e8d29498..8d1e09eeb338d712b0a73008d419bfba7a4e8d44 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -3,7 +3,8 @@
 let version = "1.10.2"; in
 
 stdenv.mkDerivation {
-  name = "ant-${version}";
+  pname = "ant";
+  inherit version;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index cde6ea2f7a87916aa0560f9c5011dd1f33e6a3ee..ef339e658c1016dbc822e37589ae739ae3006f50 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -4,12 +4,13 @@ assert jdk != null;
 
 let version = "3.6.1"; in
 stdenv.mkDerivation rec {
-  name = "apache-maven-${version}";
+  pname = "apache-maven";
+  inherit version;
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
+    url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15";
   };
 
diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix
index 0aec7491e4ad8ff07e8eefaf866c0284005fd2d1..16eb5e3ec748e462900275713ae97d8558b1cb42 100644
--- a/pkgs/development/tools/build-managers/arpa2cm/default.nix
+++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "arpa2cm";
   version = "0.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4";
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index 6248216134654abf55237cbfaff25afddd5cf986..969cd98797468e78b729b4076d2805f654953526 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lua5_3, python }:
 
 stdenv.mkDerivation rec {
-  name = "bam-${version}";
+  pname = "bam";
   version = "0.5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix
index 1018abd6ee9c150214f9252e49bbbf17d0647194..334d09622530093bce434372a0daf7e2c630d94d 100644
--- a/pkgs/development/tools/build-managers/bazel/0.4.nix
+++ b/pkgs/development/tools/build-managers/bazel/0.4.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     broken = true; # 2018-08-07
   };
 
-  name = "bazel-${version}";
+  pname = "bazel";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index f7b0184f83671646b6c4a93ce646c02c002491a6..b606e5470361e8f4a672431a86741550a331da0d 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
-  name = "bazel-buildtools-${version}";
+  pname = "bazel-buildtools";
   version = "0.28.0";
   rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";
 
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 7e6b584f9668b6c2ece7468accc72cdeefc12c66..908fc35c688b27a54e52285b347793dd5ba3b3b4 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -121,7 +121,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "bazel-${version}";
+  pname = "bazel";
+  inherit version;
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index ea8ee1f84962b209791f81a5a9063a53b96bcca8..c095f8c695c419d168560670d8ad8f48a55390d5 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python }:
 
 stdenv.mkDerivation rec {
-  name = "bear-${version}";
+  pname = "bear";
   version = "2.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index f71b877c8c52824385761515f8dbe3af963633c6..d895261c4b5b0b415ba97ecc14e4c18d2987db2e 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "bmake-${version}";
+  pname = "bmake";
   version = "20181221";
 
   src = fetchurl {
-    url    = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
+    url    = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
     sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
   };
 
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 380ba4803bd56bd403981cd79b19d0990cf1032b..3f086c912c18da5aa1d6b2b095ce4605e2aa392c 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.7.2";
-  name = "boot-${version}";
+  pname = "boot";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 4761d8dc5b1124eb912a1f48d6d5ecc12992a111..5bad0100a032bc7145002ceaba4e444903035089 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
           + lib.optionalString useNcurses "-cursesUI"
           + lib.optionalString withQt5 "-qt5UI"
           + lib.optionalString useQt4 "-qt4UI";
-  version = "3.14.5";
+  version = "3.15.1";
 
   src = fetchurl {
     url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
     # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
-    sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06";
+    sha256 = "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq";
   };
 
   patches = [
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 9f4cb366e239fc5e1b220a38e3a84aaf8142f83a..60a011a49d07b70e40cf30bd123996adeed46612 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, perl}:
 
 stdenv.mkDerivation rec {
-  name = "colormake-${version}";
+  pname = "colormake";
   version = "2.1.0";
 
   buildInputs = [perl];
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 7b882926e1f531981966645fa8aed40bfe543e98..ef2b155482f11db41f86b75a26f920921379a41e 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
 stdenv.mkDerivation rec {
-  name = "dub-${version}";
+  pname = "dub";
   version = "1.14.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 34d19b616942d8540c93a6488efd2a606cd747a7..24df6fa6ff3bc44f663a5a36332139047823b296 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -17,7 +17,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "gn-${version}";
+  pname = "gn";
   version = "20190403";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 47f800c67be599f34dd389fcbf0003c6a3ad11a4..b543565758c1f47ae5417d0d91cf450a0d39cec9 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -6,7 +6,8 @@ let
   version = "4.2.1";
 in
 stdenv.mkDerivation {
-  name = "gnumake-${version}";
+  pname = "gnumake";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/make/make-${version}.tar.bz2";
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index baa658b522a330e852f0af5df8831f3e308317e5..30c4d4ec4de04e021534c5d9bfb8e7bce664e1c8 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     rev = "version-0.7.0";
     sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
   };
-  name = "gup-${version}";
+  pname = "gup";
   buildInputs = lib.remove null [ python which pychecker ];
   SKIP_PYCHECKER = pychecker == null;
   buildPhase = "make python";
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index c5ab3fafc5e676efa8a57aa982991974174a8f31..1d1bee9c04f6725d5ae9dd6ed662c3a66f8f13ca 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "icmake-${version}";
+  pname = "icmake";
   version = "9.02.08";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
index 8a72847be772128b13007de6eb8594adcf49ed53..03cc0518ab517487837a56193e6d6c226b615fb1 100644
--- a/pkgs/development/tools/build-managers/kati/default.nix
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "kati-unstable-${version}";
+  pname = "kati-unstable";
   version = "2017-05-23";
   rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f";
 
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index d73683287a1e9378e9ed0b16a4e45b8948059ac8..9538171474d67ec7bc106ab4faf51f84fef7843d 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   pname = "leiningen";
   version = "2.9.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
@@ -13,11 +12,11 @@ stdenv.mkDerivation rec {
 
   jarsrc = fetchurl {
     # NOTE: This is actually a .jar, Github has issues
-    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
+    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip";
     sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a";
   };
 
-  JARNAME = "${name}-standalone.jar";
+  JARNAME = "${pname}-${version}-standalone.jar";
 
   dontUnpack = true;
 
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index f929d31058565b760c4cec11f2a941dca0133283..b7e6e08cb04aea2959de6a14d7f3d127c95a6dcc 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "mill-${version}";
+  pname = "mill";
   version = "0.5.0";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 796747bf6e9cbb103e785979f6f33ce42c906925..1c90bcc3a9f8e5f20ecca7e24b9ba91e164dba78 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "ninja-${version}";
+  pname = "ninja";
   version = "1.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 266dff8cf6ce3b23da323892610c67c2fb6af588..3d2759f025ccff07ccb7172c3a7fab644a7dae30 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "qbs-${version}";
+  pname = "qbs";
 
   version = "1.13.1";
 
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 98cd7e136d2254c710bf2c670807708c3d369a0b..0b858f6f20d2cb4a26b352800db1f9fb93495c28 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.5.1";
 in
 stdenv.mkDerivation {
-  name = "rebar-${version}";
+  pname = "rebar";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index 767cd70abcda12d009129e53e9b164656ab4b3e5..28697f4c69cd34678072634ff7bee8349bf0c3b4 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, python2, which}:
 stdenv.mkDerivation rec {
-  name = "redo-apenwarr-${version}";
+  pname = "redo-apenwarr";
 
   version = "unstable-2019-06-21";
 
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index 3036ef235845d3227367b9374116b029bbba6619..612dd5c7810da8693eb782408f31c2cc708c23b4 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.3";
-  name = "redo-sh-${version}";
+  pname = "redo-sh";
 
   src = fetchurl {
     url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix
index 3eca6f02e45d01d40bef49aaf33a06acae94f3fd..4d43812ebe651245fbbf2256cd8bbe2b9d074ac0 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/pkgs/development/tools/build-managers/remake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "remake-${version}";
+  pname = "remake";
   remakeVersion = "4.1";
   dbgVersion = "1.1";
   version = "${remakeVersion}+dbg-${dbgVersion}";
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index ba00a7078fc60f605d9337a57e7fb02efe6304a5..d32eba51ce177eda0d5d0fb386bdd260d150c9fa 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "sbt-${version}";
+  pname = "sbt";
   version = "1.2.8";
 
   src = fetchurl {
     urls = [
-      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
+      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz"
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 08644def517dc53d1acabf3fcaa025266cb03069..1655c154d4e58f13da2aec13051971cbfb5ace70 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -8,7 +8,7 @@ in {
     sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
   };
   scons_latest = mkScons {
-    version = "3.1.0";
-    sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk";
+    version = "3.1.1";
+    sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc";
   };
 }
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 00345179131a2f9b872c0ef3b03eed5cc6525154..7f0cc8100ac04cc42de2ef63424cf408fa92026c 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
 
 stdenv.mkDerivation rec {
-  name = "shards-${version}";
+  pname = "shards";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index 19256e39c33ccadf6b94c1e99531916c05b45480..9b44b30d7775fd5cb8998526fd497e871d257785 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "tup-${version}";
+  pname = "tup";
   version = "0.7.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index c3346ad7e99302bab8eceb7df3f9e41491159ca1..6f50907665febec8abc0b3cd7bfae68903c3e679 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -7,13 +7,13 @@ let
     optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
 in
 stdenv.mkDerivation rec {
-  name = "waf-${version}";
+  pname = "waf";
   version = "2.0.15";
 
   src = fetchFromGitLab {
     owner = "ita1024";
     repo = "waf";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz";
   };
 
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 3ef3c75ca4ef26e66a61521d5c9e37ba4f17393f..317186ea3e0ea06d350b80e8932e954052a884a3 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -15,7 +15,8 @@ let
   goPackagePath = "github.com/containers/buildah";
 
 in buildGoPackage rec {
-  name = "buildah-${version}";
+  pname = "buildah";
+  inherit version;
   inherit src;
 
   outputs = [ "bin" "man" "out" ];
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 0b6742fbf43ee6ceb5053a55ec666ab132d64caf..8ec2552aeffb8e5f376e97a37d02559bcabf2dee 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, emacsPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cask-${version}";
+  pname = "cask";
   version = "0.8.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index e07b3cd9db7459d2a0b7aac757398db72c2518db..001f87b3b279df63ead5b3a2a55a1c7d0a36b294 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -4,7 +4,8 @@ let version = "1.1.1";
 
 in stdenv.mkDerivation rec {
 
-  name = "casperjs-${version}";
+  pname = "casperjs";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "casperjs";
diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix
index dfa164e6755ca05f57cc41e45f35066f6a236282..9ae1026c8583fe0c66cf43aff1e8f33560c7abb4 100644
--- a/pkgs/development/tools/check/default.nix
+++ b/pkgs/development/tools/check/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "check-unstable-${version}";
+  pname = "check-unstable";
   version = "2018-09-12";
   rev = "88db195993f8e991ad402754accd0635490769f9";
 
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 93809551f1d7d829ef75f369600ce98c668574cd..be39f6e36677e0171b7098af573db1ee8be5988b 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "cloudfoundry-cli-${version}";
+  pname = "cloudfoundry-cli";
   version = "6.46.1";
 
   goPackagePath = "code.cloudfoundry.org/cli";
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
index db7df2af7009af3a980ad3ed8bda35489f99004c..24aca0dada7bdce096e61d3c269f3594ca3a905a 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "compile-daemon-unstable-${version}";
+  pname = "compile-daemon-unstable";
   version = "2017-03-08";
   rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
 
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
index b2b903b095c69bc49e2bb62ab13fabadea4aab96..9aaf886ef0672a68c5cc6b06cf8d6d3cba348090 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "ct-${version}";
+  pname = "ct";
   version = "0.7.0";
 
   goPackagePath = "github.com/coreos/container-linux-config-transpiler";
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index ba0be89abf3d2ee262c528b0fed6b2a647c325ed..d9f7237d2897501837a488de7a2f75b89d724501 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -5,7 +5,8 @@ let
   goPackagePath = "github.com/buildkite/agent";
 in
 buildGoPackage {
-  name = "buildkite-agent-${version}";
+  pname = "buildkite-agent";
+  inherit version;
 
   inherit goPackagePath src postPatch;
 
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
index fe83a9aa170437302cb447a1ae28a8d4c4338285..75f175aae9cc174cb22c086cdd8003a47cd40896 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }:
 
 stdenv.mkDerivation rec {
-  name = "cide-${version}";
+  pname = "cide";
   version = "0.9.0";
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
 
     gemdir = ./.;
   };
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 4a4708df32ddb8dbfbfdbff9cd3c42a2422609c8..b20d5cfbeee1950fcf5419ef92c801edc4f89560 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -2,7 +2,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "drone-cli-${version}";
+  pname = "drone-cli";
   version = "0.8.6";
   revision = "v${version}";
   goPackagePath = "github.com/drone/drone-cli";
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 81dbc54cece047837c9162bb105b10f781ccac33..53ad6f4c2f610531360b22e7e7b790393698b379 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }:
 
 buildGoPackage rec {
-  name = "drone.io-${version}";
+  pname = "drone.io";
   version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}";
   revision = "c48150767c2700d35dcc29b110a81c8b5969175e";
   goPackagePath = "github.com/drone/drone";
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 62c682a1608f151748b98c7fe31d4375aa95b246..d8b18fcd121e7b3edc2484da9009109ab09a5436 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -15,7 +15,7 @@ let
 in
 buildGoPackage rec {
   inherit version;
-  name = "gitlab-runner-${version}";
+  pname = "gitlab-runner";
   goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
   commonPackagePath = "${goPackagePath}/common";
   buildFlagsArray = ''
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index a381d65b357c522e831c2abc85b2773938a5e253..26647370821a048d50c26a677ad0c51e62c4deef 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jenkins-${version}";
+  pname = "jenkins";
   version = "2.176.3";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 5554455b8894ca98ef475b3f10c6c1323a0622bd..09e6513d2b16530ad7020c42abd5746f36dfdab4 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -7,7 +7,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "coursier-${version}";
+  pname = "coursier";
   version = "2.0.0-RC3-3";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix
index 553d622a83c65f6cd736afd5d01778cdb6ed3960..47f625736750929a3ba27f945f348a5afa674b3a 100644
--- a/pkgs/development/tools/database/cdb/default.nix
+++ b/pkgs/development/tools/database/cdb/default.nix
@@ -16,7 +16,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "cdb-${version}";
+  pname = "cdb";
+  inherit version;
 
   src = fetchurl {
     url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz";
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 7eb34aa29ba485e443bf12d59229e26e847b61bd..11b84648632d8f894e719d375e501a928a39f334 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dbmate-${version}";
+  pname = "dbmate";
   version = "1.4.1";
 
   goPackagePath = "github.com/amacneil/dbmate";
diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix
index e136b180d78c89782e89b3e01dfeb2d606d16add..8feca8c62ca8eabfb12e433a6dfab91fff8b98da 100644
--- a/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, postgresql, getopt, makeWrapper }:
 stdenv.mkDerivation rec {
-  name = "ephemeralpg-${version}";
+  pname = "ephemeralpg";
   version = "2.5";
   src = fetchurl {
-    url = "http://ephemeralpg.org/code/${name}.tar.gz";
+    url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz";
     sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk";
   };
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 4589e6ff4e5bca24cc49c8032dc98404e96e8f39..637519bcf3fb7ecfb00a23cf7a70a4dbddae4230 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -21,12 +21,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "liquibase";
   version = "3.6.2";
 
   src = fetchurl {
-    url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
+    url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz";
     sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx";
   };
 
@@ -48,10 +47,10 @@ stdenv.mkDerivation rec {
       cp ${logback-core} ${logback-classic} ${slf4j} $out/lib
 
       # Clean up documentation.
-      mkdir -p $out/share/doc/${name}
+      mkdir -p $out/share/doc/${pname}-${version}
       mv $out/LICENSE.txt \
          $out/README.txt \
-         $out/share/doc/${name}
+         $out/share/doc/${pname}-${version}
 
       # Remove silly files.
       rm $out/liquibase.bat $out/liquibase.spec
diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix
index 128921a67d7a3f3e704e03dd020e8bd56e556b41..d4e57adc140c4f12026677f32f07e5db03054531 100644
--- a/pkgs/development/tools/database/schemaspy/default.nix
+++ b/pkgs/development/tools/database/schemaspy/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.0.0-rc2";
-  name = "schemaspy-${version}";
+  pname = "schemaspy";
 
   src = fetchurl {
-    url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar";
+    url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn";
   };
 
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
-    install -D ${src} "$out/share/java/${name}.jar"
+    install -D ${src} "$out/share/java/${pname}-${version}.jar"
 
     makeWrapper ${jre}/bin/java $out/bin/schemaspy \
-      --add-flags "-jar $out/share/java/${name}.jar" \
+      --add-flags "-jar $out/share/java/${pname}-${version}.jar" \
       --prefix PATH : "$wrappedPath"
   '';
 
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
index f65347889382250fc162ee92ace408dc66189220..2ba38905af9c5f6f3a693270792ab2ffd6ef9c3d 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "shmig-${version}";
+  pname = "shmig";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix
index 867aa0b98eca62cdbbc8614fc871adb9bc61584e..33b2abce277b91ab47e30fceebb3c0c4396a7bcd 100644
--- a/pkgs/development/tools/database/sqlcheck/default.nix
+++ b/pkgs/development/tools/database/sqlcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "sqlcheck-${version}";
+  pname = "sqlcheck";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix
index adb22f45c8e1b39b5a8ba5af15b57d47beadfa8f..ca87395b9179c70c0bf0b913f6b75cc8269eb341 100644
--- a/pkgs/development/tools/database/sqldeveloper/18.2.nix
+++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix
@@ -16,7 +16,7 @@ in
   stdenv.mkDerivation rec {
 
   inherit version;
-  name = "sqldeveloper-${version}";
+  pname = "sqldeveloper";
 
   src = requireFile rec {
     name = "sqldeveloper-${version}-no-jre.zip";
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 45e8ba4f7c024e93ebf5772123c3a3a38f3a767a..461acacf4e99336eb7abc468de523155926afea2 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -16,7 +16,7 @@ in
   stdenv.mkDerivation rec {
 
   inherit version;
-  name = "sqldeveloper-${version}";
+  pname = "sqldeveloper";
 
   src = requireFile rec {
     name = "sqldeveloper-${version}-no-jre.zip";
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 5eb7651f199b9ffbd7f35cf974ddc96511c84200..ca04d209fabb10a9fb911fbba3a2976209eec561 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -7,7 +7,8 @@
 let
   version = "3.9.1";
 in stdenv.mkDerivation rec {
-  name = "squirrel-sql-${version}";
+  pname = "squirrel-sql";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index f9ca826cd620655dca5eeb7dd4cb087240ebc5a5..685b9d2f13d5aa1cc25270fa9f1dd3769188af0b 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "dcadec";
   version = "0.2.0";
 
diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix
index fbed4e905cfc58f43349061e1e4b7be0df180e7b..7d106e5a2516fd35ffd03ee6937a3a75ca47ba8d 100644
--- a/pkgs/development/tools/deadcode/default.nix
+++ b/pkgs/development/tools/deadcode/default.nix
@@ -6,7 +6,7 @@
 # TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of
 # the standalone extract of deadcode from it?
 buildGoPackage rec {
-  name = "deadcode-unstable-${version}";
+  pname = "deadcode-unstable";
   version = "2016-07-24";
   rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab";
 
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 172e81e1369e22d12bea3bbd69e9cd33caa6ab4d..db232561add08f655aa7587f2539dfaf805b6242 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "deis-${version}";
+  pname = "deis";
   version = "1.13.4";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
index 4285a674559105ad7e79846102c9fbd3450118b5..a344bcf91d8334884fb9ef49536eb2406b1de01c 100644
--- a/pkgs/development/tools/deisctl/default.nix
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "deis-${version}";
+  pname = "deis";
   version = "1.13.3";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index a0bd4e12063eefb21fb35724bea8c06f87b7704d..fc38f3edb47acd4d72eb775a25b4ba49c5fc84c3 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "delve-${version}";
+  pname = "delve";
   version = "1.2.0";
 
   goPackagePath = "github.com/go-delve/delve";
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index a486d786c374cf426f668651b377210ee4343cc2..456948a979553c6d620455628719ddeab27a43ff 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dep-${version}";
+  pname = "dep";
   version = "0.5.1";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index b23745a7b493af38b36eadc87420dd53c7aeafcd..3108ffdcbba9ceb95d8dc0aa36301ad64c761d15 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -7,7 +7,6 @@
 } :
 
 pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "devpi-client";
   version = "4.1.0";
 
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix
index dcaa43156699dc7cfa0111000af5a8a4b806f8ee..b3134b0d0ad05b59cc0384cc9cb7dd653f175913 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/pkgs/development/tools/devtodo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "devtodo-${version}";
+  pname = "devtodo";
   version = "0.1.20";
 
   src = fetchurl {
-    url = "https://swapoff.org/files/devtodo/${name}.tar.gz";
+    url = "https://swapoff.org/files/devtodo/${pname}-${version}.tar.gz";
     sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p";
   };
 
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index d7604f4de9d7ec3caf36bc705c038a40ce5ee27a..86954ea9d7ec84c10fc776738a50057e6698697d 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "doctl-${version}";
+  pname = "doctl";
   version = "${major}.${minor}.${patch}";
   major = "1";
   minor = "18";
diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
index 17aa94ebf366dc1517246ed533c664c7480cd460..1b559df8ef6cdc68ed183ea242d8a23156818103 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/pkgs/development/tools/drip/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, jdk, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "drip";
   version = "0.2.4";
 
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index c223a8dc54a10428173dc061e72c124f7ac109ed..5f359757eac4b9c868afcbbd4f407f0d294fc3d7 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -1,7 +1,7 @@
 {stdenv, lib, fetchFromGitHub, dmd, curl}:
 
 stdenv.mkDerivation rec {
-  name = "dtools-${version}";
+  pname = "dtools";
   version = "2.085.1";
 
   srcs = [
diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix
index 19ee4c6391bfa20b12cbdb58b90a8b59aed0222b..bc46f0776a6dfc91b9ba4027d92f107ecf004f58 100644
--- a/pkgs/development/tools/ejson/default.nix
+++ b/pkgs/development/tools/ejson/default.nix
@@ -7,7 +7,7 @@ let
     inherit ruby;
   };
 in buildGoPackage rec {
-  name = "ejson-${version}";
+  pname = "ejson";
   version = "1.2.1";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index e67b417226f40540d10b6291acd5d6de113d79c6..736640eba8ea13c443b38ba47c2adc6d776cac17 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -2,7 +2,7 @@
 , z3, python }:
 
 stdenv.mkDerivation rec {
-  name = "cuter-${version}";
+  pname = "cuter";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix
index 1ce49a4cbb9d67cb570b2753f474cba28f5761b7..f65dfe6565bcff77b15219208c4d096a2a91362f 100644
--- a/pkgs/development/tools/errcheck/default.nix
+++ b/pkgs/development/tools/errcheck/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "errcheck-${version}";
+  pname = "errcheck";
   version = "1.1.0";
 
   goPackagePath = "github.com/kisielk/errcheck";
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 18367d14f6e593f3eb7736124a069c6b035c4471..331c86ad88c56b3f4e41f5470c51c53650a3e544 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
-  name = "fac-${version}";
+  pname = "fac";
   version = "2.0.0";
 
   goPackagePath = "github.com/mkchoi212/fac";
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 7eb0576542834674cd5333fb338b461a7fe21fa1..d190ee32fca4860e5ccd481e80991716aca5b379 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -45,12 +45,13 @@ let
   installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
   version = "1.0.8";
 in stdenv.mkDerivation rec {
-  name = "flatpak-builder-${version}";
+  pname = "flatpak-builder";
+  inherit version;
 
   outputs = [ "out" "doc" "man" "installedTests" ];
 
   src = fetchurl {
-    url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";
   };
 
diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix
index ac145fae7efe0ce0d9875324fe86063c27a5ace0..a6ba410ec7107b60ea744b9fc1f11f270c9aaccd 100644
--- a/pkgs/development/tools/flock/default.nix
+++ b/pkgs/development/tools/flock/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "flock";
-  name = "${pname}-${version}";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 4ad04ae0e43bdf7bb92cec19b4af7dda9e6d77b0..b57c9841978f0e07d68568fc5ddb00b1492f8b5a 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -3,7 +3,8 @@
     version = "5.2.4";
   in
     stdenv.mkDerivation {
-      name = "flyway-${version}";
+      pname = "flyway";
+      inherit version;
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
         sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc";
diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
index 11880213bada44daa31a4703208fce11fdc4ea78..3100daae389b77df9aa4c59caa338d0524527d3f 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -5,7 +5,7 @@
 }:
 stdenv.mkDerivation rec {
   version = "0.39";
-  name = "fMBT-${version}";
+  pname = "fMBT";
 
   src = fetchFromGitHub {
     owner = "intel";
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix
index 292c0dc3a4e80e502a955e8240c9db47334db28d..eb6f937800aac0bffde5a155c835131bfdc3bc4f 100644
--- a/pkgs/development/tools/fusee-launcher/default.nix
+++ b/pkgs/development/tools/fusee-launcher/default.nix
@@ -7,7 +7,7 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "fusee-launcher-${version}";
+  pname = "fusee-launcher";
   version = "unstable-2018-07-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index fac1a3958d3725b81a1cc97239e9a224db1e9f16..15129bbebffc6201e43253a33911fd9d83eb20f0 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "galen";
   version = "2.4.4";
-  name = "${pname}-${version}";
 
   inherit jre8;
 
diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix
index 0857a3d4a7c64416bf7ea4269481bdd4d24ac533..872c8fae527dfc2f74c78b5836f587984c90f9a2 100644
--- a/pkgs/development/tools/gamecube-tools/default.nix
+++ b/pkgs/development/tools/gamecube-tools/default.nix
@@ -2,7 +2,7 @@
   libtool, freeimage, mesa }:
 stdenv.mkDerivation rec {
   version = "v1.0.2";
-  name = "gamecube-tools-${version}";
+  pname = "gamecube-tools";
 
   nativeBuildInputs = [ which autoconf automake libtool ];
   buildInputs = [ freeimage mesa ];
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index c750b55379133e291922effc83c2949f41ef3242..b284b7e7a040c3dd71655e663a4bf146d4f00d26 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gauge-${version}";
+  pname = "gauge";
   version = "1.0.4";
 
   goPackagePath = "github.com/getgauge/gauge";
diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
index 35328fdf66cfe17d2554dfaef07ee18a4cbb6d9f..9cfa2f02c6e6e45e3f9479fd49ccd3ed4c38be3b 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/pkgs/development/tools/gdm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gdm-${version}";
+  pname = "gdm";
   version = "1.4";
 
   goPackagePath = "github.com/sparrc/gdm";
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index 2d61b27e2c2ccf7cea1a0aebc3b137b0c240b015..b0a59e632f16f90a9e93371a712faa1921f80e87 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
-  name = "git-ftp-${version}";
+  pname = "git-ftp";
   version = "1.5.2";
   src = fetchFromGitHub {
     owner = "git-ftp";
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 3408b960889dee022d26eb96e451849d56f36d8c..d13c75be9b7002f355ff10157d758dc26b3cead7 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "git-quick-stats-${version}";
+  pname = "git-quick-stats";
   version = "2.0.8";
   src = fetchFromGitHub {
     repo = "git-quick-stats";
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 6a336b7015a083a3cf328b275b10014780b43226..1bad76b246acdda1cd83c430a6d2e9203d4e88e4 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
 
 buildPythonApplication rec {
-  name = "cligh-${version}";
+  pname = "cligh";
   version = "0.3";
 
   doCheck = false; # no tests
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index bd83a63e5d66b2009ab5c5127f02ceaff7679c7b..930043489813e20a8d5ebb0f8d8a06bffe23b799 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "glide-${version}";
+  pname = "glide";
   version = "0.12.3";
 
   goPackagePath = "github.com/Masterminds/glide";
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index b581e71129caa951efae45260add9a3c5716a416..dfc5ed843e752b44b25b3ac5d61ca3cfdabea1e2 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gllvm-${version}";
+  pname = "gllvm";
   version = "1.2.3";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix
index 361740def118347dcba4efbcc40b943c07d57ccb..7341dfc90c43c587360a108cb910c5f215fd29aa 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@@ -5,7 +5,6 @@ stdenv.mkDerivation rec {
   pname = "global-platform-pro";
   version = "18.09.14";
   GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "martinpaljak";
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   deps = stdenv.mkDerivation {
-    name = "${name}-deps";
+    name = "${pname}-${version}-deps";
     inherit src;
     nativeBuildInputs = [ jdk maven ];
     installPhase = ''
diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix
index 35f7a2bfdea1aaae3d02642d83b8cfb4945471ff..d0e9cc9e2d3591c0d318a289aafd18a4177030e3 100644
--- a/pkgs/development/tools/glock/default.nix
+++ b/pkgs/development/tools/glock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "glock-${version}";
+  pname = "glock";
   version = "20160816-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276";
 
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index d85060add5eb354b819b085bb76ff1ae98c518e3..20d1f7c0f1e3e8885292f9ccf4c58a39fd970d57 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "glslviewer-${version}";
+  pname = "glslviewer";
   version = "2019-04-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index 70b426dc59424a7bbffa343eff7510e526e2ae8c..8f9b9ddf0b5547790a2965575ea254ce12d7c2f2 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018.1";
-  name = "gnome-desktop-testing-${version}";
+  pname = "gnome-desktop-testing";
 
   src = fetchgit {
     url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix
index 249fc21cdfe4d0a8f972a6f2b6e65546b492f02e..ffdb2a092a05c42af65164418d225c28f5c344ff 100644
--- a/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-bindata-assetfs-${version}";
+  pname = "go-bindata-assetfs";
   version = "20160814-${rev}";
   rev = "e1a2a7e";
   goPackagePath = "github.com/elazarl/go-bindata-assetfs";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 9a783deecee6d5b79c65bc957676f5ea5672ac89..4d07939bd7c02c36eca1263a4651c4fb867efbaa 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-bindata-${version}";
+  pname = "go-bindata";
   version = "20151023-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "a0ff2567cfb70903282db057e799fd826784d41d";
   
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix
index 5e1a69a1692993d6e535d868333368deb91e51e1..3c6cf7e3d83ba3d33dfdbd526f52e16a03519dad 100644
--- a/pkgs/development/tools/go-junit-report/default.nix
+++ b/pkgs/development/tools/go-junit-report/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-junit-report-unstable-${version}";
+  pname = "go-junit-report-unstable";
   version = "2018-06-14";
   rev = "385fac0ced9acaae6dc5b39144194008ded00697";
 
diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix
index 62e276f2f4231c48c97a8b2db61495fa2f3fa73d..52b2962a23d89ccbaa2736bfd0ca645fad3c678e 100644
--- a/pkgs/development/tools/go-motion/default.nix
+++ b/pkgs/development/tools/go-motion/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "motion-unstable-${version}";
+  pname = "motion-unstable";
   version = "2018-04-09";
   rev = "218875ebe23806e7af82f3b5b14bb3355534f679";
 
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index 4df506f908fc3b60e9c48bcb7ad1c923952fa5fb..5f6088363f1fbadf25e6f3c0316b021149873e3c 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-outline-${version}";
+  pname = "go-outline";
   version = "unstable-2018-11-22";
   rev = "7182a932836a71948db4a81991a494751eccfe77";
 
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index f818569dd0040bc91fca1b2c1afe156c86f88111..febf71657eb4ca6546541081938b2ef91b1a0fc2 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "go-protobuf-${version}";
+  pname = "go-protobuf";
   version = "1.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 52cd37f98850140f556f2ca8e3757e21b198b166..7fcec1937c7a4d354148d776f5e3ac2b31c6fa2d 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-repo-root-${version}";
+  pname = "go-repo-root";
   version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
   
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index dfeb6d52e727f9337f4bb8bf77a41ada74e2bad5..e774ed7166474565529e75cbbfde59b8e0399671 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-symbols-${version}";
+  pname = "go-symbols";
   version = "0.1.1";
 
   goPackagePath = "github.com/acroca/go-symbols";
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 36634423fdbc6f69f40237e44d1a30939c219f30..26458a3ca2ef5e2f83a37900e8090a719f7688aa 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -2,7 +2,7 @@
   fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go2nix-${version}";
+  pname = "go2nix";
   version = "1.3.0";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 53d4bfaa483eb8009e8ac49300725e6d4104da7e..24a21c8279cfe6060b960c4679424be53bc28322 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "goa-${version}";
+  pname = "goa";
   version = "1.4.1";
 
   goPackagePath = "github.com/goadesign/goa";
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index f93bd9d28c814febfecfeafd6209083add779fc0..1524984756fcc384be37af292baeef97a574064f 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gocode-gomod-unstable-${version}";
+  pname = "gocode-gomod-unstable";
   version = "2019-03-27";
   rev = "81059208699789f992bb4a4a3fedd734e335468d";
 
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 3351c0e986b35d2d79865d32fff82091c174c2a9..b67f8929e48dfc00b74b3515870ca0d95690782f 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gocode-unstable-${version}";
+  pname = "gocode-unstable";
   version = "2018-11-05";
   rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898";
 
diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
index 9ef94ffdc7fa3584a886bcec218b4d05ac3a3d98..0ee889d02654fd110ac42c82a69564b1fa579e2e 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/pkgs/development/tools/goconst/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "goconst-${version}";
+  pname = "goconst";
   version = "1.1.0";
 
   goPackagePath = "github.com/jgautheron/goconst";
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index fcdb56460e19c92d5ab8d8a79583e04edefb3d49..1c4dd00b95e0d9d59131550f531bff84c8c92ac6 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "goconvey-${version}";
+  pname = "goconvey";
   version = "1.6.3";
 
   goPackagePath = "github.com/smartystreets/goconvey";
diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix
index 91ebaff803ebbfef8ec7da4ac3ee9621f64c3a9a..f446b7289085ba15de80ceffda65f356e502852f 100644
--- a/pkgs/development/tools/gocyclo/default.nix
+++ b/pkgs/development/tools/gocyclo/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gocyclo-unstable-${version}";
+  pname = "gocyclo-unstable";
   version = "2015-02-08";
   rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7";
 
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 993305bd98fa30410f2ee24d6eb48cccef636896..ce6c77b2cc3fafd57bf9c3a057afc30ab4ddf0f0 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "godef-${version}";
+  pname = "godef";
   version = "1.1.1";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 7fd6fe623748e9e1d46d845035ef6f1a38e24c12..20c031ead4ab833936c7fe62441376243806d8b2 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -9,7 +9,7 @@ let
     pulseaudio = false;
   };
 in stdenv.mkDerivation rec {
-  name    = "godot-${version}";
+  pname = "godot";
   version = "3.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix
index 7724ee49465ce21a2a31f36324ca600c4595770e..61d0e7a73dbac3aae38fb400516aa1917f6f3db1 100644
--- a/pkgs/development/tools/gogetdoc/default.nix
+++ b/pkgs/development/tools/gogetdoc/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gogetdoc-unstable-${version}";
+  pname = "gogetdoc-unstable";
   version = "2018-10-25";
   rev = "9098cf5fc236a5e25060730544af2ba6d65cd968";
 
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index ae7f24a62a51026f7064df66419ccd371af9a99c..7a3d7882715ff32a586457b88ed05ebb70d55c42 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "golangci-lint-${version}";
+  pname = "golangci-lint";
   version = "1.17.1";
   goPackagePath = "github.com/golangci/golangci-lint";
 
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 9d404546d008c7af575bced4d2a17b50cc4706e2..bd66f35e47109023c96ecddd739eb161ebb6d91e 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "lint-${version}";
+  pname = "lint";
   version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
   
diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix
index f63d33138fc2cf2fbfa7db8314fe037ec1da4d46..c2f2a8a597a1095a2ff1239cfd3be5576b938c5f 100644
--- a/pkgs/development/tools/gometalinter/default.nix
+++ b/pkgs/development/tools/gometalinter/default.nix
@@ -39,7 +39,7 @@ let
   ];
 
 in buildGoPackage rec {
-  name = "gometalinter-${version}";
+  pname = "gometalinter";
   version = "3.0.0";
 
   goPackagePath = "github.com/alecthomas/gometalinter";
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 112e1769f2129e5cd08c65852dac8ce52106cb48..4d97415bc565e3e1d4665e8ef6c93aac21415a83 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gomodifytags-unstable-${version}";
+  pname = "gomodifytags-unstable";
   version = "2018-09-14";
   rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d";
 
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index ba4f4bb3f519aca9e5f63d6c5615fe027a60d045..df3310893a4dfbbde46a87ae224fcc76a04220b1 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -3,7 +3,7 @@
 with python27Packages;
 
 stdenv.mkDerivation rec {
-  name = "google-app-engine-go-sdk-${version}";
+  pname = "google-app-engine-go-sdk";
   version = "1.9.61";
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index 89a1da77270159e46baa58502f5c61a26d2d8fe1..778ed562637edba388619306aabc3649ec57a825 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gopkgs-${version}";
+  pname = "gopkgs";
   version = "2.0.1";
 
   goPackagePath = "github.com/uudashr/gopkgs";
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 7ee87b8f84838407a366202cc4938171e8292e2f..cc2106cdc0821c92738b4ffc6f1ac3632bdece3f 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gosec-${version}";
+  pname = "gosec";
   version = "1.2.0";
 
   goPackagePath = "github.com/securego/gosec";
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index b8230561fb42d308a506c93b32078036748054ea..881ae7e24d4a19651a07b71e896f25e0837ba492 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gotags-${version}";
+  pname = "gotags";
   version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "be986a34e20634775ac73e11a5b55916085c48e7";
   
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 8eb65281b3fe99a2147332de4d1903b9e993b326..e74b6c27b2b2568d2e3a8e1e3349e44ed96128f2 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gotests-${version}";
+  pname = "gotests";
   version = "1.5.3";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index d83f0ec40149323dc2fdd8008cd1a8f7ca393611..be7db5e8b8a6fd052ce87fc5010df0f3341ac800 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, go, buildGoModule, fetchgit }:
 
 buildGoModule rec {
-  name = "gotools-unstable-${version}";
+  pname = "gotools-unstable";
   version = "2019-07-06";
   rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e";
 
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
index 2030c8ba444a54a14e92834bdccf9df4c1d58d88..804a9bf043ed0101e1d2931da11d7133928489a6 100644
--- a/pkgs/development/tools/govendor/default.nix
+++ b/pkgs/development/tools/govendor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "govendor-${version}";
+  pname = "govendor";
   version = "1.0.9";
 
   goPackagePath = "github.com/kardianos/govendor";
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index 152b619966c9f57be77fbf92225f79ff25022f5a..ebce368ea9f810e64203c139d1db8b0d9158b72b 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "govers-${version}";
+  pname = "govers";
   version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
 
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index b28bf24892c20eb7aab7e568096d8fb58bdd9527..25b80d9cf6977536d041394e327daf7c5d2f3826 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gox-${version}";
+  pname = "gox";
   version = "20181025";
 
   goPackagePath = "github.com/mitchellh/gox";
diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix
index 461110b63d71b2c0f96c268dbffa2d36371c8ac2..009f475bb7dd7e7eef096d7be075e4e5284575fa 100644
--- a/pkgs/development/tools/gpp/default.nix
+++ b/pkgs/development/tools/gpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpp-${version}";
+  pname = "gpp";
   version = "2.25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index ebe76197ef4ea9ec0dd331bd39564a183af4f271..e0d2d3d1498ff5cea4cce9e3f19f80453a614c6f 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gron-${version}";
+  pname = "gron";
   version = "0.6.0";
 
   owner = "tomnomnom";
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
index 833b41ae985b748aedbae798bb9c6c45d6dafad6..27ca714b73ab39c47970e85a4f1d29196edbfa88 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gtk-mac-bundler-${version}";
+  pname = "gtk-mac-bundler";
   version = "0.7.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index 78f2e967123bd304af383430293b82851a0ce262..15233979e158e3bf645f6456654874948698ada5 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,12 +1,11 @@
 { fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "g-wrap";
   version = "1.9.15";
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${name}.tar.gz";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
   };
 
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index fd9347a4007fae06ebda6be970b4be11ce325ef2..b8efb30f5f17a8035faf2bd3bc0e63678c74d561 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, guile }:
 
 stdenv.mkDerivation rec {
-  name = "guile-lint-${version}";
+  pname = "guile-lint";
   version = "14";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/user42/${name}.tar.bz2";
+    url = "https://download.tuxfamily.org/user42/${pname}-${version}.tar.bz2";
     sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v";
   };
 
   buildInputs = [ guile ];
 
-  unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"'';
+  unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${pname}-${version}"'';
 
   prePatch = ''
     substituteInPlace guile-lint.in --replace \
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 3b52c262c0c638ab716d55525c22ab3c3d175658..7d99a5e9a573f35d2bff2af6e1f653836b023da7 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -5,7 +5,7 @@ let
   binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
 
 in stdenv.mkDerivation rec {
-  name = "hyper-haskell-${version}";
+  pname = "hyper-haskell";
   version = "0.1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 905580482d45f94f2c02823648dfd99e15c0e1c3..c97e35583b63913b16fef0cd163ce91b770cee4b 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "hexio";
-  name = "${pname}-${version}";
   version = "1.0-RC1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix
index e2aebe9b2dc20190e36a73d81f5ebd3592b07d9d..5874d1eeed383ededff8470a383ccfb5064726b7 100644
--- a/pkgs/development/tools/iferr/default.nix
+++ b/pkgs/development/tools/iferr/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "iferr-unstable-${version}";
+  pname = "iferr-unstable";
   version = "2018-06-15";
   rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88";
 
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index 62f33a2d2517277e9038a0320dc349546a7f8850..b394e9e71fbf4963d0ae00d0a32ef8debd7b52d7 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pcre } :
 
 stdenv.mkDerivation rec {
-  name = "imatix_gsl-${version}";
+  pname = "imatix_gsl";
   version = "4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix
index 69bbf8afe5ac13bd3e8f7d715d636b77f509bbfc..8d368ba528a912d7ee24e572a65e271a58eeacb5 100644
--- a/pkgs/development/tools/impl/default.nix
+++ b/pkgs/development/tools/impl/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "impl-unstable-${version}";
+  pname = "impl-unstable";
   version = "2018-02-27";
   rev = "3d0f908298c49598b6aa84f101c69670e15d1d03";
 
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
index 10e5c61025ab753a35b9e865adb0ba2322d0e05c..06831e3a43c2cf0dae224856814a8c4320ff1148 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "ineffassign-unstable-${version}";
+  pname = "ineffassign-unstable";
   version = "2018-09-09";
 	rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix
index 274ced0b37cd5a4312af40009e89d2967e805f25..2f505ef1c6789b97ff67a2ae1f4af8aa517bf716 100644
--- a/pkgs/development/tools/interfacer/default.nix
+++ b/pkgs/development/tools/interfacer/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "interfacer-unstable-${version}";
+  pname = "interfacer-unstable";
   version = "2018-08-31";
   rev = "c20040233aedb03da82d460eca6130fcd91c629a";
 
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index b6a78071bc87d4572fb76a781f8ba89c30a697ea..035964dafc01bb464b5841aeea9b0abf8cd9bef1 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, llvmPackages, irony }:
 
 stdenv.mkDerivation rec {
-  name = "irony-server-${version}";
+  pname = "irony-server";
   inherit (irony) version;
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 1f0d8f286094f26b731cc16609e41705ac785b16..382ef28c014740c7e3e76177ae57ebb8e40bc69f 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "cfr-${version}";
+  pname = "cfr";
   version = "0.146";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index 403bfeabfd0508a9a59416f075922775f1a1ece4..9791cd56ea1ae053f86ba6e9101de3a39ef373f0 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.98"; in
   stdenv.mkDerivation {
-    name = "fastjar-${version}";
+    pname = "fastjar";
+    inherit version;
 
     src = fetchurl {
       url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 4577de0cde4c8209ff1982bcfe2435c4882e6a81..dae39453495928781dab90212c817e2dc743b885 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "jhiccup-${version}";
+  pname = "jhiccup";
   version = "2.0.10";
 
   src = fetchzip {
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 9682ceb93c75da56730f1ce3bb0e25a95ed8c14f..04d5a0b2e7682b5b89cf16af2edf535ce4e14488 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.3";
-  name = "visualvm-${version}";
+  pname = "visualvm";
 
   src = fetchzip {
     url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""]  version}.zip";
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index dbda476171ab497139bbf97f1c8c34166fd30b62..79054c7f667ba3ae22812f2ba9d8ea9dc3893a74 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.4";
-  name = "jbake-${version}";
+  pname = "jbake";
 
   src = fetchzip {
-    url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
+    url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip";
     sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw";
   };
 
diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
index 3fe55de2ec8c70b293fb71674eef32e1ce415f33..b03fd7a0028a54b00230f26103203c7b8a41055d 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/pkgs/development/tools/jd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "jd-${version}";
+  pname = "jd";
   version = "0.3.1";
   rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
 
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
index 4833755b3ee3e66afb67dd8080447e69c876344c..cd0e125564f9af5aca8f7cdb9ff4386d48df9f12 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/pkgs/development/tools/jid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "jid-${version}";
+  pname = "jid";
   version = "0.7.2";
 
   goPackagePath = "github.com/simeji/jid";
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index c53d6608efd337d223de0c76019a802db4848064..300c52961f3aee3b95a304b1496e81d4c3ba7fa7 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "jmespath-${version}";
+  pname = "jmespath";
   version = "0.2.2";
   rev = "${version}";
 
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index e8e8acd6a9a416ecee0ed3216f4cc27a39d0cec1..e9ba5a7ddd79fcbb908d20a76af5ea118092e109 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "jp-${version}";
+  pname = "jp";
   version = "0.1.2";
   rev = "${version}";
 
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index e7c5955ef4174d91236d349c6d81dcd76746c0d7..8605ef398a1c4644297ece11e60bc967a81faaa2 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, oniguruma }:
 
 stdenv.mkDerivation rec {
-  name = "jq-${version}";
+  pname = "jq";
   version="1.6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix
index dc8e618910c4b7b0b93490bb6fe60f7a2da229e0..11a96bc22fe8fe6696092826f0e935968f5487b9 100644
--- a/pkgs/development/tools/jsduck/default.nix
+++ b/pkgs/development/tools/jsduck/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "jsduck";
-  name = "${pname}-${version}";
   version = (import ./gemset.nix).jsduck.version;
 
   env = bundlerEnv {
diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index 694428f55a6baab815d180216a678c797d51f81a..4fe4e4c7eab37d81366de326b32b91fda5fb5834 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -2,7 +2,6 @@
 
 buildGoPackage rec {
   pname = "json2hcl";
-  name = "${pname}-${version}";
   version = "0.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 4a837bcef652f4f2e7debe83a54c120e64531a18..d1da88f60bd8158f38b0c60df704eaf41db65b8c 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }:
 
 stdenv.mkDerivation rec {
-  name = "kafkacat-${version}";
+  pname = "kafkacat";
 
   version = "1.4.0";
 
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 3a2040e712a9aba72f9bc9b0eb35fe42b0491249..5246a51aabb3371ec8766bbba78689d56d48b598 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "kind-${version}";
+  pname = "kind";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 202c57f9106d2f4d930f9ffeaec51ce3c425d96c..c98d397953ec0b053e2f83a3b91eeaea0c4c687d 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ktlint-${version}";
+  pname = "ktlint";
   version = "0.34.2";
 
   src = fetchurl {
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ jre ];
 
   unpackCmd = ''
-    mkdir -p ${name}
-    cp $curSrc ${name}/ktlint
+    mkdir -p ${pname}-${version}
+    cp $curSrc ${pname}-${version}/ktlint
   '';
 
   installPhase = ''
diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
index af5c0e9c2f9fea393aad7679eafa70eee5107c02..6083c03ebc9f767ace09f42da1deaa7460e36f99 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "kube-aws-${version}";
+  pname = "kube-aws";
   version = "0.9.4";
 
   goPackagePath = "github.com/coreos/kube-aws";
diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix
index 20a26824e5e72bd4b37b7e9528963e34617e805f..8e6ca8e221e21cd35db7448d7ec7ab1609b667c2 100644
--- a/pkgs/development/tools/kube-prompt/default.nix
+++ b/pkgs/development/tools/kube-prompt/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kube-prompt-${version}";
+  pname = "kube-prompt";
   version = "1.0.5";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix
index a63de55074795ad7c95e81ca4cd2391435f84281..104b11c1ce1dbf92f903334ce162f3ce5418a625 100644
--- a/pkgs/development/tools/kubicorn/default.nix
+++ b/pkgs/development/tools/kubicorn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "kubicorn-${version}";
+  pname = "kubicorn";
   version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4c7f3623e9188fba43778271afe161a4facfb657";
 
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index be964cf4d308823bd85de1ad4bc5b9c465e4c636..a2a35c7fd1d709eea38b107f0e59ee7205596c2d 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "leaps-${version}";
+  pname = "leaps";
   version = "0.9.0";
 
   goPackagePath = "github.com/Jeffail/leaps";
diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix
index 58f50dd2f7e30f5bc52e6201e1f147403cb98439..7f40824c4724f6cd6eb70af959c2f231fb3afb84 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "librarian-puppet-go-${version}";
+  pname = "librarian-puppet-go";
   version = "0.3.9";
 
   goPackagePath = "github.com/tmtk75/librarian-puppet-go";
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 00397978054ba8b99b3c703a3b0575cb45d3e084..41c4b25c8b1b2aa45f3a1d8b23b2e5be3e2a68d5 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
 
-  name = "nuweb-${version}";
+  pname = "nuweb";
   version = "1.58";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/nuweb/${name}.tar.gz";
+    url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz";
     sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
   };
 
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec{
     make nuweb.pdf nuwebdoc.pdf all
   '';
   installPhase = ''
-    install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp
+    install -d $out/bin $out/share/man/man1 $out/share/doc/${pname}-${version} $out/share/emacs/site-lisp
     cp nuweb $out/bin
     cp nuweb.el $out/share/emacs/site-lisp
     gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz
-    cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name}
+    cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix
index 404f3758ced4eebad23641a47fdad6a323099173..573e2aefb80ddaa4f8cc94b9669adac6d5fdfa71 100644
--- a/pkgs/development/tools/makerpm/default.nix
+++ b/pkgs/development/tools/makerpm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec { 
   version = "1.0";
-  name = "makerpm-${version}";
+  pname = "makerpm";
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix
index 7e5cbaddd8b365cd0e66abf066c43072d4ed7aa4..3029ee385188e2ce995df82b134df7950d14ec51 100644
--- a/pkgs/development/tools/maligned/default.nix
+++ b/pkgs/development/tools/maligned/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "maligned-unstable-${version}";
+  pname = "maligned-unstable";
   version = "2018-07-07";
   rev = "6e39bd26a8c8b58c5a22129593044655a9e25959";
 
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 14f42ed9d40a1c40d37bee5dcf4a9537e429546e..53e2920c68d64f43b51e5861b3c3de329269972c 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -3,7 +3,8 @@ let
   version = "2.2.3";
 in
 stdenv.mkDerivation {
-  name = "minizinc-${version}";
+  pname = "minizinc";
+  inherit version;
 
   buildInputs = [ cmake flex bison ];
 
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 799623d34cc9cca3655146b33dd1fd4cdb4dca52..284ad4a5a670c18679ec791bd4772fc3065e3678 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -3,7 +3,8 @@ let
   version = "2.3.1";
 in
 stdenv.mkDerivation {
-  name = "minizinc-ide-${version}";
+  pname = "minizinc-ide";
+  inherit version;
 
   nativeBuildInputs = [ qmake makeWrapper ];
   buildInputs = [ qtbase qtwebengine qtwebkit ];
diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
index db0e41d27ab396a7a50e3c0362da767af24bc4e1..37d49b1f35bfdd14b4f0fb043a5806729aece8ed 100644
--- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix
+++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
 
 stdenv.mkDerivation rec {
-  name = "abi-compliance-checker-${version}";
+  pname = "abi-compliance-checker";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix
index 047cd466baacc77cac276683fd19cdef67e8e394..ca59bf28b1ec37d3a31b78165bcf01348a78e3ee 100644
--- a/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
 
 stdenv.mkDerivation rec {
-  name = "abi-dumper-${version}";
+  pname = "abi-dumper";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 7810ba6349ce157d9e0fb83736f28ceda9ce33b4..664e7d28d7916ea78b135e17869192b35dc1153d 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -15,7 +15,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name    = "arcanist-${version}";
+  pname = "arcanist";
   version = "20180916";
 
   src = [ arcanist libphutil ];
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index d7cea5c3d4ed1605668942d0fdbe227185ece53d..9901e46d57872b6fe740de3d936ef479c78592c6 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
-  name = "autoconf-archive-${version}";
+  pname = "autoconf-archive";
   version = "2019.01.06";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index ff5ce659d2e1385fef48a253e38c0b5bed5b91a7..dc7197897192e258c93ae3f9301c8e2318655cee 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "autogen-${version}";
+  pname = "autogen";
   version = "5.18.12";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix
index 38d2194dab824e844a4b75fa6d811bfa81083cc4..8892142ad779d48a5757b2d2feeeb1d7dce6583c 100644
--- a/pkgs/development/tools/misc/awf/default.nix
+++ b/pkgs/development/tools/misc/awf/default.nix
@@ -2,7 +2,7 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "awf-${version}";
+  pname = "awf";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix
index 16182d26db3ffe5783829a871ac3aacf3b259c8a..72848d049303cdba49184a972beaba051aa60ec5 100644
--- a/pkgs/development/tools/misc/bashdb/default.nix
+++ b/pkgs/development/tools/misc/bashdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bashdb-${version}";
+  pname = "bashdb";
   version = "4.4-1.0.0";
 
   src = fetchurl {
-    url =  "mirror://sourceforge/bashdb/${name}.tar.bz2";
+    url =  "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2";
     sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml";
   };
 
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index ac7eb557f2ed27b1075728b97910e978a136a96a..ea9b340fb0b745fc94877348b87a474f966a7eaf 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libelf, txt2man }:
 
 stdenv.mkDerivation rec {
-  name = "bin_replace_string-${version}";
+  pname = "bin_replace_string";
   version = "0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix
index 359ab125be99e40fa0dd4c8dc20d26e5483b45f4..dd84e3830c411b9848f698e06f89ade4144c0dea 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
 
 stdenv.mkDerivation rec {
-  name = "bsdbuild-${version}";
+  pname = "bsdbuild";
   version = "3.1";
 
   src = fetchurl {
-    url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz";
+    url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz";
     sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl";
   };
 
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index ae7ecad7ea1c1f2cc567a7df18b8b3dce7b8a619..0577165bcff4583f014a2f9188090acc9bb6306d 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, zlib, makeWrapper }:
 
 let ccache = stdenv.mkDerivation rec {
-  name = "ccache-${version}";
+  pname = "ccache";
   version = "3.4.1";
 
   src = fetchurl {
     sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc";
-    url = "mirror://samba/ccache/${name}.tar.xz";
+    url = "mirror://samba/ccache/${pname}-${version}.tar.xz";
   };
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index f643ecab69d6118b9330b52dfc9a3ddb1b90d2b2..008701615e72d02b86a81c961626a88d047f5725 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -2,7 +2,7 @@
 , cmake, llvmPackages, rapidjson, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name    = "ccls-${version}";
+  pname = "ccls";
   version = "0.20190314.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index 6de69a34b290e85d1a6acc11bdb10e8fe778c607..f823519fb34a32d7c457d709f3fe9f7dcd773fe2 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, readline, flex, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "cgdb-${version}";
+  pname = "cgdb";
   version = "0.7.1";
 
   src = fetchurl {
-    url = "https://cgdb.me/files/${name}.tar.gz";
+    url = "https://cgdb.me/files/${pname}-${version}.tar.gz";
     sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv";
   };
 
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 5f98df54c0a028d9fc2e7d659d584eb0f931e59e..887a0f16ec1a6f899b999423ae1cc7699ca68396 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
   version = "2.0.0.2";
-  name = "checkbashisms-${version}";
+  pname = "checkbashisms";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index ed96befca5e7ab4c0dfd60b1c314421218285594..1aac0bd651c7f878e73c60113a60cd3dfb3060e0 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -8,7 +8,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "chruby-${version}";
+  pname = "chruby";
 
   version = "0.3.9";
 
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 4040eda141fd625021f1b9f334386c7cc623410e..861a6eff1640b65b7aff114508f5c173da8f6455 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name    = "coccinelle-${version}";
+  pname = "coccinelle";
   version = "1.0.6";
 
   src = fetchurl {
-    url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
+    url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz";
     sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4";
   };
 
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index d95c67fea6d991a165153251672510c6cbdbcb62..a2a39b810553a4065169fd03d04142e87a1d04ea 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, autogen }:
 
 stdenv.mkDerivation rec {
-  name = "complexity-${version}";
+  pname = "complexity";
   version = "1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/complexity/${name}.tar.gz";
+    url = "mirror://gnu/complexity/${pname}-${version}.tar.gz";
     sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522";
   };
 
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index 8a0cb095d4456dad773a8a82b1873c04d04c5288..973caee64e85b8a335f423987a43827456cba1b5 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "cproto-${version}";
+  pname = "cproto";
   version = "4.7o";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index 54ad7ca7071c6717f5fde3af215ef59b8d361bfa..02d480cf2cd503aa6b052f026237222d222de14e 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -15,7 +15,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name    = "cquery-${version}";
+  pname = "cquery";
   version = "2018-10-14";
 
   inherit src;
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index eff1af8cdb47afe33234ff2e961bc5a254da5c78..34cbadb38afbd4ffcc91d8df812a8bcddba0c7e2 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "csmith-${version}";
+  pname = "csmith";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz";
+    url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz";
     sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj";
   };
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/bin/compiler_test.pl \
-      --replace '$CSMITH_HOME/runtime' $out/include/${name} \
-      --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \
+      --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \
+      --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \
       --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith
 
     substituteInPlace $out/bin/launchn.pl \
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index d8deb75d2d418f90ca7dcff3ec810525c18be949..3a54a17a93afbab97486e2ed3988c29fe72d4f89 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, tie }:
 
 stdenv.mkDerivation rec {
-  name = "cwebbin-${version}";
+  pname = "cwebbin";
   version = "22p";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix
index ba95889b5a800443a2a1abce596d361496562f93..1dd53f62cec676efd4abc9f9a5063d8aaf57b99a 100644
--- a/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -3,12 +3,13 @@ let
   version = "0.7.2";
 in
 stdenv.mkDerivation rec {
-  name="dfu-programmer-${version}";
+  pname = "dfu-programmer";
+  inherit version;
 
   buildInputs = [ libusb ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
+    url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
     sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
   };
 
diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
index 2657e570106e068128c2ce6177a775eef03289ca..bf1effbe71a22f365402b993a78f0bcadc8a4035 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name="dfu-util-${version}";
+  pname = "dfu-util";
   version = "0.9";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb1 ];
 
   src = fetchurl {
-    url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+    url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
     sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin";
   };
 
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index efb850d5adefcf0562698b6406dc8f5b81ae663a..378cc4683b410e2a1e86dd0e3222c39f62e2bce4 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -8,13 +8,13 @@ assert withLibrary -> libtool != null;
 assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
-  name = "dialog-${version}";
+  pname = "dialog";
   version = "1.3-20190211";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
-      "https://invisible-mirror.net/archives/dialog/${name}.tgz"
+      "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"
+      "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz"
     ];
     sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29";
   };
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 51a5f52d3759b638741ad32d0318e7ceb1903aa6..23c01338f601225b46ae862f374a916368952e08 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "elfinfo-${version}";
+  pname = "elfinfo";
   version = "0.7.5";
 
   goPackagePath = "github.com/xyproto/elfinfo";
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index 905fa0d40935c462d26f206c1ccb392045b91225..c7eaafd9c7a84f5fa14c9c6e9d1dded08a0040f4 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "elfkickers-${version}";
+  pname = "elfkickers";
   version = "3.1";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 424032e21af4d04e3434c4e67c02e8cf98a0cc56..7a3579f0635de912eb0b1f9c06b99878d0c2fb6c 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -2,11 +2,11 @@
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
-  name = "elfutils-${version}";
+  pname = "elfutils";
   version = "0.176";
 
   src = fetchurl {
-    url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
+    url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
     sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb";
   };
 
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index f58d06599650c3425befef9af156f675710f4dee..b449c0a2d0106eb52ac4d57c38bde3401143c5b0 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, rpm}:
 
 stdenv.mkDerivation rec {
-  name = "epm-${version}";
+  pname = "epm";
   version = "4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix
index e84aa0ef555a241abd14a2930a1a3b8e1a5f9ec1..152792dcee2508b7bdee0e2563318844686fef96 100644
--- a/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/pkgs/development/tools/misc/fsatrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fsatrace-${version}";
+  pname = "fsatrace";
   version = "0.0.1-160";
 
   src = fetchFromGitHub {
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    mkdir -p $out/libexec/${name}
-    export makeFlags=INSTALLDIR=$out/libexec/${name}
+    mkdir -p $out/libexec/${pname}-${version}
+    export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version}
   '';
 
   postInstall = ''
     mkdir -p $out/bin
-    ln -s $out/libexec/${name}/fsatrace $out/bin/
+    ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 73de8eb8cb618b2f7d64c6f9cc37b89b5a3161c1..a5c32bd3dc1ba5156d5e27ec6775cb9a9635a734 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,7 +10,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fswatch-${version}";
+  pname = "fswatch";
   version = "1.14.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 70a157bc0840802dde0b81775df55a483d799b7a..1484e54289e6992769031dc6cb27b88c0c563396 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
 
 stdenv.mkDerivation rec {
-  name = "gede-${version}";
+  pname = "gede";
   version = "2.14.1";
 
   src = fetchurl {
-    url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
+    url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz";
     sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9";
   };
 
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index b2c71388fc520a9dede0a07b9de203f9ad3abf0b..2d756a655a437affae0fa91f5a6f1859bfb0c6ce 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "global-${version}";
+  pname = "global";
   version = "6.6.3";
 
   src = fetchurl {
-    url = "mirror://gnu/global/${name}.tar.gz";
+    url = "mirror://gnu/global/${pname}-${version}.tar.gz";
     sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb";
   };
 
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
index 25043f89463df5736c7c535e4febf121a010c95c..108d6190cb7da923f7b25ff4aa9d77df40ad793c 100644
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ b/pkgs/development/tools/misc/gpshell/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gpshell-${version}";
+  pname = "gpshell";
   version = "1.4.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
index aaaee20b81a8f25bb72bbc1fd029c8b0810f5f99..37a7a8c931c3cd339321b2fae6386cfcfb57c0e4 100644
--- a/pkgs/development/tools/misc/gputils/default.nix
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gputils-${version}";
+  pname = "gputils";
   version = "1.5.0-1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gputils/${name}.tar.bz2";
+    url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2";
     sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
   };
 
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index 0f9219f10a01513e082a114ac11885ca940eed4e..d3afbbc1bc7613e67a5f17931eeaa863075cd89c 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildGoPackage rec {
-  name = "hound-unstable-${version}";
+  pname = "hound-unstable";
   version = "2018-11-02";
   rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
 
diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix
index 294d1fa10dde60573a349f2c466e147ac0dd6786..996dda4ca9416c5e9f2000e16a315547048d62be 100644
--- a/pkgs/development/tools/misc/igprof/default.nix
+++ b/pkgs/development/tools/misc/igprof/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.9.16";
-  name = "igprof-${version}";
+  pname = "igprof";
 
   src = fetchFromGitHub {
     owner = "igprof";
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index 8bc35ba01a6131239d2789d54cd1fc26f19be939..b04de1832abb7ce77e263c30a04cbe5becf1314c 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "inotify-tools-${version}";
+  pname = "inotify-tools";
   version = "3.20.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 281b09393b5d0820800cc41c7558c7260769dd5e..12197c2de40c036168da4581b1aacfcddf6c4b19 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -3,7 +3,7 @@
 , procps, utilmacros, gtk-doc, openssl, peg }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-${version}";
+  pname = "intel-gpu-tools";
   version = "1.23";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index a9f451d31e7d319ab038eeca07afbe86b53c968d..c837728f72ddddc78c50c48846e4283203fe129f 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, gettext, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "intltool-${version}";
+  pname = "intltool";
   version = "0.51.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
   };
 
diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix
index b431e804d8dcc45ccab9015dfd01456ee5ad212f..8da3cd57703cb040a1fe035445aabcb45467726b 100644
--- a/pkgs/development/tools/misc/kdbg/default.nix
+++ b/pkgs/development/tools/misc/kdbg/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kdbg-${version}";
+  pname = "kdbg";
   version = "3.0.0";
   src = fetchurl {
-    url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz";
     sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in";
   };
 
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
index f4c3237ee7a50939227888a315f439b1857e19be..7d824fd81fbe39ab205d28f72ebff4360029e773 100644
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ b/pkgs/development/tools/misc/kibana/5.x.nix
@@ -16,11 +16,11 @@ let
     "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
   };
 in stdenv.mkDerivation rec {
-  name = "kibana-${version}";
+  pname = "kibana";
   version = elk5Version;
 
   src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz";
+    url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz";
     sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
   };
 
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index 240d52ca7d0e55f06ba3c9e44aa3def3cd416b58..ace34f350599635bec726576b9083db763f70675 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
-  name = "loccount-${version}";
+  pname = "loccount";
   version = "1.2";
 
   goPackagePath = "gitlab.com/esr/loccount";
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 42ca1a1b7d545c50963509ae1a5995785e8d5ab6..17837a548772a334fb1beb11f1f22820d0ac8728 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "lttng-tools-${version}";
+  pname = "lttng-tools";
   version = "2.10.7";
 
   src = fetchurl {
-    url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
+    url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
     sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd";
   };
 
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index adc4bbd5c39a0acd37db7fbe36f774e7d555c713..ad5276e5e1a9cc28d42260366d17e88bcfd0ef4b 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -12,11 +12,11 @@
 # Debian builds with std.h (systemtap).
 
 stdenv.mkDerivation rec {
-  name = "lttng-ust-${version}";
+  pname = "lttng-ust";
   version = "2.10.4";
 
   src = fetchurl {
-    url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
+    url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
     sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm";
   };
 
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix
index ebe62452440ec1a0a4f543ef65039d36944ad635..ce62634e7d7a8d8245e028ec81ad91379a7b5448 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "macdylibbundler-${version}";
+  pname = "macdylibbundler";
   version = "20180825";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix
index 23b7119e7d744cd590d5f2d1874e9b65aab0a8f9..7cbd9246081768b0c49ec5c576c0c01a2c65603b 100644
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/pkgs/development/tools/misc/md2man/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "go-md2man-${version}";
+  pname = "go-md2man";
   version = "1.0.6";
 
   goPackagePath = "github.com/cpuguy83/go-md2man";
diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix
index c45e7841d450e227710444012c0ce0f4408b988a..a5e4572d18dd75eb9d71d1fe57c4c2142cec55c9 100644
--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "moby-${version}";
+  pname = "moby";
   version = "2017-07-06";
   rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
 
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index ade9954021a1cb8d8897f6df583e0b54604651f1..164e0e80b60cf8c0f45058e3bf8c698842594575 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.1.2"; in
 pythonPackages.buildPythonApplication {
-  name = "nixbang-${version}";
+  pname = "nixbang";
+  inherit version;
   namePrefix = "";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
index a449c28ea2891d1fa6f44c4538c5bc2296e8e096..dea6256824df29acfb579b978ad7bf674d7dbd17 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "objconv-${version}";
+  pname = "objconv";
   version = "2.51";
 
   src = fetchurl {
     # Versioned archive of objconv sources maintained by orivej.
-    url = "https://archive.org/download/objconv/${name}.zip";
+    url = "https://archive.org/download/objconv/${pname}-${version}.zip";
     sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs";
   };
 
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index 874aa04157dc95e8688c397118c5d8f0546dc9f8..21e825ac0bf0578c35a4d92397c938c1e060b36e 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "opengrok-${version}";
+  pname = "opengrok";
   version = "1.0";
 
   # binary distribution
   src = fetchurl {
-    url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i";
   };
 
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 7141fdcee7e7929891ffe33419efb849586c0618..d85a05ca2456d6a23920c82930bc25b201367728 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "openocd-${version}";
+  pname = "openocd";
   version = "0.10.0";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 29d713a9af442fdb09e36da88adce3bf48587056..c673bd261098aad253757f8f7379dfea66915393 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
+  pname = "patchelf";
   version = "0.10-pre-20190328";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index fbb21a8b7c65e60f0fc8b65a95f05ec20ad2dc22..0b91953a7c7f9781c93396ae184adcdb2c6d343f 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pmccabe-${version}";
+  pname = "pmccabe";
   version = "2.6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index f99c904ed01c174ef993a059a64a93ce0db5de0a..c0e7a3653a869d2f766c1265b216d5c2fdc9f20e 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -4,7 +4,8 @@ let
   version = "20130503";
 in
 stdenv.mkDerivation rec {
-  name = "prelink-${version}";
+  pname = "prelink";
+  inherit version;
 
   buildInputs = [
     libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc)
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 8ceb3d4a436774ed4f4ea8b0ee9e09b59ade4404..d9d28580210bced291618015cc6b42d135497fc8 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "premake5-${version}";
+  pname = "premake5";
   version = "5.0.0-alpha12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 8f27609ababe7286b82e7491b4966eb614c8ffdf..7182144fd2007d6fa42e3f6de9e29000fe2e6dd3 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -15,7 +15,7 @@
 , }:
 
 stdenv.mkDerivation rec {
-  name = "pwndbg-${version}";
+  pname = "pwndbg";
   version = "2019.01.25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 19e4423f7d866b0d97534887562c8cb2a385d222..0519e4d05e043099c6830f7a2ed73155f9241827 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -27,7 +27,6 @@ assert stdenv.hostPlatform.system == "x86_64-linux";
 stdenv.mkDerivation rec {
   pname = "saleae-logic";
   version = "1.2.18";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     name = "saleae-logic-${version}-64bit.zip";
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index a506831cd8ea7e65c8b8273f79c7f5a9914e93e0..004975f10d8a30774eb3068b78ee23f24c6cbb07 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "3.5.1";
 
-  name = "sipp-${version}";
+  pname = "sipp";
 
   src = fetchFromGitHub {
     owner = "SIPp";
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index fdacdaef20fc6679ed7d0a0ffaa9a9ac5c028c28..98c400d52851e8b7eadab27d29ce87a832f7f9cd 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -7,7 +7,8 @@ let
   version = "1.5.1";
 in
 stdenv.mkDerivation {
-  name = "stlink-${version}";
+  pname = "stlink";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "texane";
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index acdc712786f5bee93e63842d80108761a32c9627..c809437f6fb977ea9ca954725490a61005ce9673 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libunwind, buildPackages }:
 
 stdenv.mkDerivation rec {
-  name = "strace-${version}";
+  pname = "strace";
   version = "5.2";
 
   src = fetchurl {
-    url = "https://strace.io/files/${version}/${name}.tar.xz";
+    url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
     sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym";
   };
 
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix
index b50aa088ac577b16541227cc7439e13a2b1d0441..9872c91ac4ba2b5028f4029e360ef174217d3098 100644
--- a/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/pkgs/development/tools/misc/tcptrack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "tcptrack-${version}";
+  pname = "tcptrack";
   version = "1.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 82d0ec6119ea93ff765ccdd61ea4f968c318d299..2975d64113e8bedbfaaf8561272533542e5920e8 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -3,7 +3,8 @@ let
   version = "2.1";
 in
 stdenv.mkDerivation {
-  name = "teensy-loader-cli-${version}";
+  pname = "teensy-loader-cli";
+  inherit version;
   src = fetchgit {
     url = "git://github.com/PaulStoffregen/teensy_loader_cli.git";
     rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2";
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
index 77b362c712c2e94a7f81c28e9dbf59895531d534..29d809b5f05e567e12055064990a3df4a783c162 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
   version = "3.8";
-  name = "tet-${version}";
+  pname = "tet";
 
   src = fetchurl {
     url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ;
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index 63e5bea19d74a7ec47f235748e0e15c1481fb3a0..5f4478bd4fbb903f8dd86d841832a2d4841c3a98 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo, ncurses, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "texinfo-${version}";
+  pname = "texinfo";
   version = "4.13a";
 
   src = fetchurl {
-    url = "mirror://gnu/texinfo/${name}.tar.lzma";
+    url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma";
     sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
   };
 
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix
index c380243a898b9763a787039ce2a70fdb26646ca4..5e40152df8dfe07a3087ceacae92d22536f00016 100644
--- a/pkgs/development/tools/misc/tie/default.nix
+++ b/pkgs/development/tools/misc/tie/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tie-${version}";
+  pname = "tie";
   version = "2.4";
 
   src = fetchurl {
-    url = "http://mirrors.ctan.org/web/tie/${name}.tar.gz";
+    url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz";
     sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj";
   };
 
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index 11caf8e7b20e8bfad0d32c3ba21a452e97382a20..65a17fd1242eb891f9f1e89ff4b38f2f9fad5219 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -6,7 +6,7 @@
 assert stdenv.lib.versionOlder "4.02" ocaml.version;
 
 stdenv.mkDerivation rec {
-  name = "trv-${version}";
+  pname = "trv";
   version = "0.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index ebc85c19b395d1e230e53fe4cadc324200560040..68409a59f37164a3f320670d1bbf158b63692403 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "universal-ctags-${version}";
+  pname = "universal-ctags";
   version = "unstable-2019-07-30";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 0fa854f9b2a159db5620a9c6c29f9c8ddc6468af..fb43ff61a81c596bd8a7873740960c8d04546dee 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, tcl, usb-modeswitch }:
 
 stdenv.mkDerivation rec {
-  name = "usb-modeswitch-data-${version}";
+  pname = "usb-modeswitch-data";
   version = "20170806";
 
   src = fetchurl {
-    url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+    url    = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
     sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff";
   };
 
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index d34a94e0467001d0ef3e6aac1791edca04c59a9d..7c119c92943121b5974df1cdd0195b2a8ac4de0e 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "usb-modeswitch-${version}";
+  pname = "usb-modeswitch";
   version = "2.5.2";
 
   src = fetchurl {
-    url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+    url    = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
     sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb";
   };
 
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix
index e806a77963863de84e2d75582e41ac255e48e55e..2b6e349b9fdeb32fcb0583c6174ed47268cc3dc7 100644
--- a/pkgs/development/tools/misc/vtable-dumper/default.nix
+++ b/pkgs/development/tools/misc/vtable-dumper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libelf }:
 
 stdenv.mkDerivation rec {
-  name = "vtable-dumper-${version}";
+  pname = "vtable-dumper";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index d6b8eb5b95ff36b9ea469a408164300c76b0b582..e2ea96cd590bf381f9179c22841d1bbf1dbf7c8f 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "watson-ruby-${version}";
+  pname = "watson-ruby";
   version = (import ./gemset.nix).watson-ruby.version;
 
   env = bundlerEnv rec {
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix
index 8f3f6c1b22a74ce2f6096f4c91bfed187092d4b8..6edf6551b068cad15c08cb79a593e67fce0ec9d3 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "787";
-  name = "xc3sprog-${version}";
+  pname = "xc3sprog";
 
   src = fetchsvn rec {
     url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 2e67da18ae9a83118bf0702e8297f81c7ff0e7e5..b409009b524e428fb49d95c1383b7710ec232b65 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ycmd-${version}";
+  pname = "ycmd";
   version = "2018-09-20";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 76130f255fde182da88824d68dd8cc31c56841ff..5520a4a30be00d007f4462a04bf2bd28e4fce0fe 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, perl, icmake, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "yodl-${version}";
+  pname = "yodl";
   version = "4.02.01";
 
   nativeBuildInputs = [ icmake ];
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 6390c1d7fd2487a2990ad2f0bdf33349c23668d7..60e948d593fa2b5ceae2ecba27fed931afd65f18 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "mod-${version}";
+  pname = "mod";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix
index 2b5f42b2cbe540c6b82153a1f5aac4af1afd9f4b..1d7784ae1cc7864c1dad7d3e0bbaf63a505c8697 100644
--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, unzip }:
 stdenv.mkDerivation rec {
-  name = "msgpack-tools-${version}";
+  pname = "msgpack-tools";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix
index 0b060624de3d6520917b8e62723faa1f9912e38a..41e74bc120f133271f240f30b135f64877d86e32 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/pkgs/development/tools/mustache-go/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mustache-go-${version}";
+  pname = "mustache-go";
   version = "1.0.1";
 
   goPackagePath = "github.com/cbroglie/mustache";
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index 07005131fb5e807d6eda69fe2ff1c101f6208d6d..689b7da8802117587df23c15f4b3940b06ce6875 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -10,7 +10,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "nailgun-${version}";
+  pname = "nailgun";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "facebook";
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 57beec8f171af2c1d26279ffe0de452cb2f224a7..e052b7244392eeb4c8c6bbdabeda4f0c0689ae18 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -20,7 +20,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "nwjs-${version}";
+  pname = "nwjs";
   version = "0.12.3";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
index 234f5a5bfae7296e4f6e38de3b2580bf5d9909fe..081e86c44dde7b193cedee2a9e1001c8f8c4e768 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }:
 
 stdenv.mkDerivation rec {
-  name = "nrpl-${version}";
+  pname = "nrpl";
   version = "20150522";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix
index 7117d7dd628f0c88b02b331d1aa9dbd56bf5d947..0539e8de92beffdc01a126dbd390f7d21f418426 100644
--- a/pkgs/development/tools/nsis/default.nix
+++ b/pkgs/development/tools/nsis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchzip, scons, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "nsis-${version}";
+  pname = "nsis";
   version = "3.04";
 
   src =
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 96516bfda48b6eff9a004159bbcf5254b57eb7ec..30f531d7db20f6f962f303ec7d4fff2a52805a03 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -32,7 +32,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "nwjs-${version}";
+  pname = "nwjs";
   version = "0.33.4";
 
   src = if sdk then fetchurl {
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index a83959fba39518fc0241224e894f324e419d399d..4a4203a2f59d19c9a7d2c6e26720daf23960b8de 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -26,7 +26,7 @@ let param = {
 in
 
 stdenv.mkDerivation rec {
-  name = "camlp4-${version}";
+  pname = "camlp4";
   inherit (param) version;
 
   src = fetchzip {
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 91870a570b095b03777ea269954a3fd2a3050912..fb1eb4276d62fe9457d37498663552ba6cd3b114 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-findlib-${version}";
+  pname = "ocaml-findlib";
   version = "1.8.1";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index 1307635abb9918e15ff1e11a45242092d7837c28..90e88979de409d702740f58104fbdab8841a629c 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-${version}"; 
+	pname = "js_of_ocaml"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index ff59fa7cf8a3ca500e2ffaad501818e5a49b275f..e9e7f9d279ea13fd1a6a83f92c66c825ff72cc49 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
 	version = "3.2.1";
-	name = "js_of_ocaml-camlp4-${version}"; 
+	pname = "js_of_ocaml-camlp4"; 
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index c5a345f505b7de6a346509c604bb288655fc06f7..c152689231239efdc548b728e47f22f6b001a26b 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -7,7 +7,7 @@ then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-compiler-${version}";
+	pname = "js_of_ocaml-compiler";
 	version = "3.3.0";
 
 	src = fetchFromGitHub {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index f88811855a2ea45a465309d65ff0aac1b8b311e9..e6fb1b353d2ac39f7f265f297cca28d292b2abc7 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -7,7 +7,8 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
 in
 
 stdenv.mkDerivation {
-  name = "js_of_ocaml-${version}";
+  pname = "js_of_ocaml";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
     sha256 = {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index e7a31c1ce2e5a9c72424e5d3b7eb1780556c40a3..65afee16afbdd738be8f56091724c19c6df73e53 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-lwt-${version}"; 
+	pname = "js_of_ocaml-lwt"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index bf33b4e59e524f8b83b93b15fb13ec27319ea0c5..4b2b14d317b498f2b3919b5f1e4205aa9579a738 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-ocamlbuild-${version}"; 
+	pname = "js_of_ocaml-ocamlbuild"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 0649aee162a5af2b430c7b6f31aab6b0ac1f4315..277973afba8a2517f264a2f173b5ebe18a78e121 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-ppx-${version}"; 
+	pname = "js_of_ocaml-ppx"; 
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index ddea73b3c766d2b5faa77cb09a3d7143b115c616..5b5f7d18f797b5b415d80b9b49ea67ed05693324 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-ppx_deriving_json-${version}";
+	pname = "js_of_ocaml-ppx_deriving_json";
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index 1ba9ddd0ab7f4e5fedccf061fe7a601d638dfd38..c24162cccf75fd613d114da3847fd781426b258b 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "js_of_ocaml-tyxml-${version}";
+	pname = "js_of_ocaml-tyxml";
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 2364058729e8994055321c9e428d455ad006c93a..90b092f0e4b6c8a8079f297df1efb4ca2a6cc184 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.10";
-  name = "ocaml-oasis-${version}";
+  pname = "ocaml-oasis";
 
   # You must manually update the url, not just the version. OCamlforge keys off
   # the number after download.php, not the filename.
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 87d592bd112636751208d9265b3adf6f41347cd1..e7528d4f772844064844afd1db983012af535bec 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-	name = "obelisk-${version}";
+	pname = "obelisk";
 	version = "0.4.0";
 	src = fetchFromGitHub {
 		owner = "lelio-brun";
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 41cde6f8ab735b670abc01cb768d242436a6e73f..61e8e77f384b5212aad11807b3e8d7c7d58eba0a 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -3,7 +3,8 @@
 let version = "0.1.10"; in
 
 stdenv.mkDerivation {
-  name = "obuild-${version}";
+  pname = "obuild";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 74dee630d2953285f16a372af22c57e7b7a90819..dbf33424439d3138c217c94409af72ad3b86364d 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation rec {
-  name = "ocamlmod-${version}";
+  pname = "ocamlmod";
   version = "0.0.9";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index f91ae7132005dbee9e58a78d2e55904affccfd4a..09ab9587ddba396135508d9937be395a7c743abf 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec
 {
   pname = "ocsigen-i18n";
-  name = "${pname}-${version}";
   version = "3.4.0";
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 0f536c489eb6eb3016a1114209da08f6ea2fb6f3..da7a5b439ab162bfce8f88bce2f20430ed2cc9b5 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "omake-${version}";
+  pname = "omake";
   version = "0.10.3";
 
   src = fetchurl {
-    url = "http://download.camlcity.org/download/${name}.tar.gz";
+    url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz";
     sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz";
   };
 
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix
index fa5393c1871c1deba4929c4069003f4beef00545..a49749ad716f54df26a797d31d6feb2001a1c1c5 100644
--- a/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/pkgs/development/tools/ocaml/opaline/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
-  name = "opaline-${version}";
+  pname = "opaline";
 
   src = fetchFromGitHub {
     owner = "jaapb";
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index ddd8d4b9920be76c97304e204adc93bb29259f5d..87490bcb617fef9a4d26073cf096cf898690617c 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -44,7 +44,7 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "opam-${version}";
+  pname = "opam";
   version = "1.2.2";
 
   buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 452f162b235630cda116373692fa402baf55ed8b..763642e5da1bb54b2e37d020c5badc58ca6b3cfd 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -60,7 +60,7 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "opam-${version}";
+  pname = "opam";
   version = "2.0.5";
 
   buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 161c08a7f82beb3625aedbbd0ed9a0fd6e4d72a9..8b7354ae48abf7bcbcdc5e33109c2739e4bf4412 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -7,8 +7,8 @@ then throw "utop is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
+  pname = "utop";
   version = "2.4.1";
-  name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
      # derivation of just runtime deps so env vars created by
      # setup-hooks can be saved for use at runtime
      runtime = stdenv.mkDerivation rec {
-       name = "utop-runtime-env-${version}";
+       pname = "utop-runtime-env";
+       inherit version;
 
        buildInputs = [ findlib ] ++ propagatedBuildInputs;
 
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 725219c3d7c7045a29f596ec3693e7a90ca2c27b..f29153334273c05d82a76052c023097323692f6c 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python2 }:
 stdenv.mkDerivation rec {
 
-  name = "omniorb-${version}";
+  pname = "omniorb";
 
   version = "4.2.3";
 
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 85f8955185fb0ffd1dc3be0024945a436cd45ce0..784895845e523da6053b5303b46bb5e2ad03cca2 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "omnisharp-roslyn-${version}";
+  pname = "omnisharp-roslyn";
   version = "1.32.19";
   
   src = fetchurl {
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 24a6404dc039ecd8ded4c59696f3d1fe2dfd300d..9e0da00dd52949f10ada8f85150e3cdcd14a18bf 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "packer-${version}";
+  pname = "packer";
   version = "1.4.1";
 
   goPackagePath = "github.com/hashicorp/packer";
diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix
index 82849be40b2c969912d77b3e5ae2a2598c5e240e..54100dfdee9e92c25432fcc0090955f301a2a912 100644
--- a/pkgs/development/tools/packet/default.nix
+++ b/pkgs/development/tools/packet/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "packet-${version}";
+  pname = "packet";
   version = "v2.2.2";
 
   goPackagePath = "github.com/ebsarr/packet";
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix
index 616a2049c778b35cbf4824f4e4c2e060fadabc7e..0f8ead579d0aecc882b69e63edcdd132c8e465a1 100644
--- a/pkgs/development/tools/parse-cli-bin/default.nix
+++ b/pkgs/development/tools/parse-cli-bin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "parse-cli-bin-${version}";
+  pname = "parse-cli-bin";
   version = "3.0.5";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix
index b53116b888e1ff24d160c57ebe4daca6e245c348..9e86a29cf9343f9519c77dbca4d616e7ea70345e 100644
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation rec {
-  name = "antlr-${version}";
+  pname = "antlr";
   version = "3.4";
   src = fetchurl {
     url ="https://www.antlr3.org/download/antlr-${version}-complete.jar";
diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
index e6e54f8dab92016b8e95ecc33658dfee887881b4..fcd7e445b8a2c719aee0b27e74747de626fd74de 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -12,7 +12,8 @@ let
 
   runtime = {
     cpp = stdenv.mkDerivation {
-      name = "antlr-runtime-cpp-${version}";
+      pname = "antlr-runtime-cpp";
+      inherit version;
       src = source;
 
       outputs = [ "out" "dev" "doc" ];
@@ -35,7 +36,8 @@ let
   };
 
   antlr = stdenv.mkDerivation {
-    name = "antlr-${version}";
+    pname = "antlr";
+    inherit version;
     src = fetchurl {
       url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
       sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 9b3fd86b555226c4c47bb64b0e010eecb06949b9..23ea39c6fa9fcd3a3dc58b187a8d698644d6a0a2 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "byacc-${version}";
+  pname = "byacc";
   version = "20190617";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
-      "https://invisible-mirror.net/archives/byacc/${name}.tgz"
+      "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
+      "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
     ];
     sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q";
   };
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index d7d27ac9a1cda3c451d02d45e3c0dbfee50804e6..e46a494de76c2c41068af42b5b71d4d309f36a37 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flex-${version}";
+  pname = "flex";
   version = "2.6.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 681f90bbe5a677ed1c5dcb3f37a6b8b920b20d83..93f1d1ee649fa2018b9743ae32a36530e8200e89 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
 
 stdenv.mkDerivation rec {
-  name = "flexc++-${version}";
+  pname = "flexc++";
   version = "2.05.00";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index bf5a2374fdefae9c08994609e42090fe2476a04d..d41c113821adb2e049348b48ef03fb3ad7db33be 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, glib, pkgconfig, python, scons }:
 
 stdenv.mkDerivation rec {
-  name = "hammer-${version}";
+  pname = "hammer";
   version = "e7aa734";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix
index 108576d0b11ccc6573181f80052a84e02613d687..aa7b63dafea981b3aaf51debe8d3de4029b33d95 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/pkgs/development/tools/parsing/lemon/default.nix
@@ -16,7 +16,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "lemon-${version}";
+  pname = "lemon";
   version = "1.69";
 
   phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index d08df8265b0a4ce9d5da6521caea3c40090256ed..2f4db7982b717c1e51a8699ce59fc6cba679df44 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -5,10 +5,11 @@
 let
   generic = { version, sha256, license }:
     stdenv.mkDerivation rec {
-      name = "ragel-${version}";
+      pname = "ragel";
+      inherit version;
 
       src = fetchurl {
-        url = "https://www.colm.net/files/ragel/${name}.tar.gz";
+        url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz";
         inherit sha256;
       };
 
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 1d0545f6889e586bb47d16cbc3bf129a10ba3797..f6e35f086396a72c44e6034a81afead30a59c4e5 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "re2c-${version}";
+  pname = "re2c";
   version = "1.0.3";
 
   sourceRoot = "${src.name}/re2c";
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index ce562bbf5ac5edd099b7618567ad88202dc46d2c..7953a55c7d97838a6dbef2ed0e852fa8bd134572 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "pet-${version}";
+  pname = "pet";
   version = "0.3.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix
index 6f26a48b9c43c2a41e92a35e51d554b3a72421dc..e4b50f31776310a6326b6db258fc8f4310f57754 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@@ -1,6 +1,5 @@
 { stdenv, python3Packages }:
 with python3Packages; buildPythonApplication rec {
-    name = "${pname}-${version}";
     pname = "pew";
     version = "1.1.2";
 
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix
index 47b426604da0dc965971e3e49868a5b8aa0ad3bd..8aaae2b1c433b5b958333f75bd4e1cd1228208f6 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/pkgs/development/tools/pgloader/default.nix
@@ -2,7 +2,6 @@
 stdenv.mkDerivation rec {
   pname = "pgloader";
   version = "3.6.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz";
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index a37de2a3f6285d562ba3d566def7f106fe254e63..29b8d4d5ae1ed1edbee8fc55c8be6eaa6a60b4dc 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -15,7 +15,7 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  name = "phantomjs-${version}";
+  pname = "phantomjs";
   version = "2.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 8155f3016c3fe8a0797482d4b52ee1efbbba6f94..b02ae3c544fab7a986c54ed724a0ed756bb3559c 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1-7";
-  name = "EZTrace-${version}";
+  pname = "EZTrace";
 
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz";
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 5ff0d2ca2b1e042cfe67c20c0bd180ca467ab2ca..5aaf3d436dedf11ed26bbabd6d775204ae1c4a29 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "heaptrack-${version}";
+  pname = "heaptrack";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix
index 9130f31f21d36edc180f21425cddcddd6a4d0af7..120fd89377b39270361ea481617aeaeac5122d4b 100644
--- a/pkgs/development/tools/profiling/pprof/default.nix
+++ b/pkgs/development/tools/profiling/pprof/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "pprof-unstable-${version}";
+  pname = "pprof-unstable";
   version = "2018-08-15";
   rev = "781f11b1fcf71fae9d185e7189b5e686f575075a";
 
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index 8f711e14654dd9f97cd8bbf16422152cc55dfa65..3f0b37a7175e0a9f202c22acd91844c083f1ef25 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -14,7 +14,8 @@ let
 
   ## stap binaries
   stapBuild = stdenv.mkDerivation {
-    name = "systemtap-${version}";
+    pname = "systemtap";
+    inherit version;
     src = fetchgit { inherit url rev sha256; };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
index 559383f45fe7b639e3f21198ba91ca6181cef2e0..6d6a02ab49f4e9fc4b8ff08e97d9235ace23333f 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "protoc-gen-doc-unstable-${version}";
+  pname = "protoc-gen-doc-unstable";
   version = "2019-04-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 10a10fa21efb578d8f80c53a1bcba0ddfd52bf56..13e8c233ec39f50ddd14777609eed7ead02219c2 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "pup-${version}";
+  pname = "pup";
   version = "0.4.0";
   rev = "v${version}";
 
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 0f1482d7953d059bec583deca9f6eb503da49116..6a709cf8f9b1b258a8ecc7fdbbce14a52ab5376c 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -24,7 +24,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "pypi2nix-${version}";
+  pname = "pypi2nix";
+  inherit version;
   srcs = [
     src
     click
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix
index a5683e7a953d4b92d7318b0ba3881db5a6a5d014..a2ab9a47a79a2f702a7be178309044aaf7f3b658 100644
--- a/pkgs/development/tools/rdocker/default.nix
+++ b/pkgs/development/tools/rdocker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, openssh }:
 
 stdenv.mkDerivation rec {
-  name = "rdocker-${version}";
+  pname = "rdocker";
   version = "unstable-2018-07-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 939febae693aba95c5d58b87184ae6a9be7a1838..dfa31b30a7e4654cb15822d77d11cda2fe97ceba 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -37,7 +37,7 @@ let
     xorg.libXScrnSaver
   ];
 in stdenv.mkDerivation rec {
-  name = "react-native-debugger-${version}";
+  pname = "react-native-debugger";
   version = "0.9.10";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix
index 3e69b4ffa073ff50895d1f28e7f2509186e8e9a4..b82c0694fec813f593f94034f526c2952c350e7f 100644
--- a/pkgs/development/tools/reflex/default.nix
+++ b/pkgs/development/tools/reflex/default.nix
@@ -2,7 +2,7 @@
 
 
 buildGoPackage rec {
-  name = "reflex-${version}";
+  pname = "reflex";
   version = "0.2.0";
 
   goPackagePath = "github.com/cespare/reflex";
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
index 6ef724022e8cd91dabf0ef71d72e6070dc2f0306..2d5346f2112a4a77ae14694b286dea58ffdc6ca9 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/pkgs/development/tools/reftools/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "reftools-unstable-${version}";
+  pname = "reftools-unstable";
   version = "2018-09-14";
   rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399";
 
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
index 35aab138292d0e8966877889ea0261f2bee2d708..80c64a65083f0c51a1f36d73420f797f0b5455e3 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 with pythonPackages; buildPythonApplication rec {
-  name = "reno-${version}";
+  pname = "reno";
   version = "2.3.2";
 
   src = fetchurl {
-    url = "mirror://pypi/r/reno/${name}.tar.gz";
+    url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz";
     sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4";
   };
 
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index ffd9774ee447c74ee519de725686e68420165b8f..44654e052d1b3c67d4655d08a6b9b0349b1f29a0 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre_headless, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "nexus-${version}";
+  pname = "nexus";
   version = "3.16.1-02";
 
   src = fetchurl {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln";
   };
 
-  sourceRoot = name;
+  sourceRoot = "${pname}-${version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix
index aa537df15084c52fede3f30e5274fe35abcfd944..507402deed6604f64b720a478a12618255c277e3 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/pkgs/development/tools/richgo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "richgo-${version}";
+  pname = "richgo";
   version = "0.2.8";
   goPackagePath = "github.com/kyoh86/richgo";
 
diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix
index 499cec2e6a7f36ad183d5bb1fa2c8f92a0ec5ef3..51801864796e9a76005109460e9bbc3792e2b40a 100644
--- a/pkgs/development/tools/ronn/default.nix
+++ b/pkgs/development/tools/ronn/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }:
 
 stdenv.mkDerivation rec {
-  name = "ronn-${version}";
+  pname = "ronn";
   version = env.gems.ronn.version;
 
   env = bundlerEnv rec {
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index da3b27ebacc585380fc7e0ab42c9798d860ca0cf..3a9ecb7697ab85e39ae8ecfcdfdf7b0b0ce8d469 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "rtags-${version}";
+  pname = "rtags";
   version = "2.16";
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix
index 09008c9d63d8a3bbc5aaebf229e1bca53a930dde..12b00ce93f38af58692b3a971c44717f9b5b1805 100644
--- a/pkgs/development/tools/rucksack/default.nix
+++ b/pkgs/development/tools/rucksack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.1.0";
-  name = "rucksack-${version}";
+  pname = "rucksack";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index df782d935157f48f9c987e0c7ca049fd20ea7214..ca1c2fa45e9d4c1f2edae1d797c9b076485240b4 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -5,6 +5,8 @@ rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
   version = "0.51.0";
 
+  RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
+
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = pname;
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index c6b3d0b4cd083d485e206430c52c7ac087f6cb01..4cd8b328353b39f107c510b46f3824d4217024f4 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "sauce-connect-${version}";
+  pname = "sauce-connect";
   version = "4.5.4";
 
   src = fetchurl (
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f91285820923cfccaa14a78a69c85a1ee851127f..5937b00f459430b0e3f6f2f1529380569ab42b8c 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -27,7 +27,7 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "chromedriver-${version}";
+  pname = "chromedriver";
   version = "76.0.3809.68";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index a8085399b3db383a4ec828fb36157bf66a85c90a..3f4b8a22d648a2059b719849f3c20476a857fc54 100644
--- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "htmlunit-driver-standalone-${version}";
+  pname = "htmlunit-driver-standalone";
   version = "2.27";
 
   src = fetchurl {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   dontUnpack = true;
 
-  installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";
+  installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar";
 
   meta = {
     homepage = https://github.com/SeleniumHQ/htmlunit-driver;
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 61b74ce108d682eb3fe59c546a076fee6fbff17e..d3a8efaadb6a8fa4964be443fbc07dd8ad6fb058 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -8,7 +8,7 @@ let
   patchVersion = "0";
 
 in stdenv.mkDerivation rec {
-  name = "selenium-server-standalone-${version}";
+  pname = "selenium-server-standalone";
   version = "${minorVersion}.${patchVersion}";
 
   src = fetchurl {
@@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
   buildInputs = [ jre makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/share/lib/${name}
-    cp $src $out/share/lib/${name}/${name}.jar
+    mkdir -p $out/share/lib/${pname}-${version}
+    cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar
     makeWrapper ${jre}/bin/java $out/bin/selenium-server \
-      --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
+      --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
       --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \
       --add-flags "org.openqa.grid.selenium.GridLauncherV3"
   '';
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 04076a8f0cf686983c4d850125aa27355e4cd610..71f488c760a4a0a30392ec445120cb8f7bf435d4 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -4,7 +4,7 @@
 , GLUT }:
 
 stdenv.mkDerivation rec {
-  name = "simavr-${version}";
+  pname = "simavr";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index d8899de205fd4446b69aeacb198b9663888b48b2..786cac68425a6bf2d894b6593a9d5c64d7c540cb 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -20,7 +20,8 @@ let
 
 in
 buildGoPackage rec {
-  name = "skopeo-${version}";
+  pname = "skopeo";
+  inherit version;
   inherit src goPackagePath;
 
   outputs = [ "bin" "man" "out" ];
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index f2f50c18e0b99411eb25646174ad270fda2d8bd3..d84322bb5474caf3d2d66b79f3021bf297e36c7a 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -2,7 +2,7 @@
 , zlib, expat, dbus, openssl, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "sourcetrail-${version}";
+  pname = "sourcetrail";
   version = "2019.2.39";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 85b82318439bc270d46e3238ec01fe4ececf0e72..550cd9dce27858ac2673a4a38726da1425f93433 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -5,7 +5,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "spirv-tools-${version}";
+  pname = "spirv-tools";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 4acfa4a2b0edaebe4b1a304ec5d797b3108eac33..52c33f3e444c0f55582c0b5d0165d4aa92f9d090 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -4,11 +4,11 @@ let
   mainVersion = "2.5";
 
 in stdenv.mkDerivation rec {
-  name = "sqsh-${version}";
+  pname = "sqsh";
   version = "${mainVersion}.16.1";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz";
+    url    = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz";
     sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n";
   };
 
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
index 21068a8b05f64ea317ab72f861ccb46a59732928..f1a1ceb9bb19be8090ae8b7414fb79b764c2d9df 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/pkgs/development/tools/stagit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, libgit2, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "stagit-${version}";
+  pname = "stagit";
   version = "0.9.1";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index a3499258a99958eff34a699013b881fa0df0e30d..cc865e2bd52883113ed32dc8f15cc6af4b7ad097 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
 
 buildGoPackage rec {
-  name = "textql-${version}";
+  pname = "textql";
   version = "2.0.3";
 
   goPackagePath = "github.com/dinedal/textql";
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index f07451ae840489b8e398ca69df746db7006e890f..50c34dc39edfe0312dd65af4ae7d10169379cf45 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -14,7 +14,7 @@ let
     ];
   };
 in stdenv.mkDerivation rec {
-  name = "thrust-${version}";
+  pname = "thrust";
   version = "0.7.6";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index 90d36c71caa9487294c96b40930d977278222eb4..df6279b5a4ca4f6308b375cef100cc793afe4689 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.93";
-  name = "toluapp-${version}";
+  pname = "toluapp";
 
   src = fetchFromGitHub {
     owner = "LuaDist";
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 2bbe2cfe16df318413cc06a7e38c991d01d4782a..7f35d3c438d1ac09fe95d7656d481ce35ddb27e8 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -5,7 +5,7 @@ let
   qscintillaLib = (qscintilla.override { withQt5 = true; });
 
 in mkDerivation rec {
-  name = "tora-${version}";
+  pname = "tora";
   version = "3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix
index 565ec7904f186d91c8229d40306fd0a37afea228..a5c13e2266e91711974713ad4da0c3ab0dea6736 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/pkgs/development/tools/toxiproxy/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "toxiproxy-${version}";
+  pname = "toxiproxy";
   version = "2.1.3";
   src = fetchFromGitHub {
     owner = "Shopify";
diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix
index 775e26eb6a8c588ba98ccd6ad10d8b6a99d081a7..01531d23c781115adfd23eefb801a2eef5184d32 100644
--- a/pkgs/development/tools/tychus/default.nix
+++ b/pkgs/development/tools/tychus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
 
 buildGoPackage rec {
-  name = "tychus-${version}";
+  pname = "tychus";
   version = "0.6.3";
 
   goPackagePath = "github.com/devlocker/tychus";
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index f62cd1aabb1b5b2dc520d587186f33b80d996095..796d3509c1c4f84cf373310becd5ac6a9b6bd2dc 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "uftrace-${version}";
+  pname = "uftrace";
   version = "0.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix
index 1e81c5b9f86e75948e18d6aed7976ae272a6f974..a6c087d7be722ec03287ab7954026bd3ac6d5796 100644
--- a/pkgs/development/tools/unconvert/default.nix
+++ b/pkgs/development/tools/unconvert/default.nix
@@ -5,7 +5,7 @@
 }:
 
 buildGoPackage rec {
-  name = "unconvert-unstable-${version}";
+  pname = "unconvert-unstable";
   version = "2018-07-03";
   rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b";
 
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 54ace72c5fbd0c91daa44be8c067ee437b097882..0ca7e37ef70647312741530414ab776da9435990 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -23,7 +23,7 @@ let
   build = "f2";
 
 in stdenv.mkDerivation rec {
-  name = "unity-editor-${version}";
+  pname = "unity-editor";
   version = "${ver}x${build}";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index ebeb81c90ec52894cb100ac781c341443829be94..71c47a7394b77654ba2fc2678151e8fddd435e58 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
 stdenv.mkDerivation rec {
   version = "0.36.2";
-  name = "valadoc-${version}";
+  pname = "valadoc";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h";
   };
 
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index f6c160de65c34dcf7c18566a513d1c765c3a2aa8..8f3bc560905274d6746b3e8c66a0cc78e1f93353 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -4,7 +4,6 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "vcstool";
   version = "0.1.36";
 
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index 9601771f75f0d37d23bec083c7b3be201103d58c..e8173a6b5b0d4a593b1c92121ec72b89b8ba8515 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -8,7 +8,7 @@
 }:
 
 buildGoPackage rec {
-  name = "vgo2nix-${version}";
+  pname = "vgo2nix";
   version = "unstable-2019-02-06";
   goPackagePath = "github.com/adisbladis/vgo2nix";
 
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 3e8a228bacf18c4325495af0e4ff043e749d5a15..27296edfac0bb9453b4b958967223479656e7a61 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -3,7 +3,7 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "vim-vint-${version}";
+  pname = "vim-vint";
   version = "0.3.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 42cf6f07f4d0ca646f32dd229f9534f74d7b3938..197f48dbbfb5ed246d1518dddd4defd9d8e0ddcb 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "vndr-unstable-${version}";
+  pname = "vndr-unstable";
   version = "2018-06-23";
   rev = "81cb8916aad3c8d06193f008dba3e16f82851f52";
 
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index e87ba2b52c1432c31dea7a442e9855df325f9def..b0768ca4b7e541afdfd850705ede9606985c5ed4 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -8,7 +8,7 @@
 }:
 
 mkDerivation rec {
-  name = "vogl-${version}";
+  pname = "vogl";
   version = "2016-05-13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index 8e17c531547d019839be9d85355daf458daa9022..7cc8ce6fe13415ce27eab1b2549b557c09865f8b 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "vultr-${version}";
+  pname = "vultr";
   version = "1.15.0";
   goPackagePath = "github.com/JamesClonk/vultr";
 
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index e9ced0e753a04be3913a138e77fff94f80da3de3..f8936e27516a0f475473a2dbeaa1be93fa649c27 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "wabt-${version}";
+  pname = "wabt";
   version = "1.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 4a056db6c0c24a319f7f38b34df1cf8f39dc757b..3a58e1088ea2c33969b2c2c122a8dd2901992c4c 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "watchman-${version}";
+  pname = "watchman";
   version = "4.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix
index aaf1b20ea6f7648ae66bcc5c2756beda14fa7c3c..8db830b3284edc6a79b27d345eb682e12ccc69c7 100644
--- a/pkgs/development/tools/wiiload/default.nix
+++ b/pkgs/development/tools/wiiload/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, zlib }:
 stdenv.mkDerivation rec {
   version = "v0.5.1";
-  name = "wiiload-${version}";
+  pname = "wiiload";
 
   nativeBuildInputs = [ autoconf automake ];
   buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index 17c64f0548b3eefb63eef36942979dc40bd94d68..da1b493b0d2a2e23c1356d5d41227f42210b41d5 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/pkgs/development/tools/ws/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "ws-${version}";
+  pname = "ws";
   version = "0.2.1";
   rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
 
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 29717d75394ae69408347e0ffa9fe29fca636d49..0874c9e5515576d6c97b870508b5e6235b6dc7b4 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -16,7 +16,7 @@ let
     sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
   };
 in stdenv.mkDerivation rec {
-  name    = "xcbuild-${version}";
+  pname = "xcbuild";
 
   # Once a version is released that includes
   # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix
index c163c4cbcf6908d638dd83d887899d4f80801d60..44a7254a3d7fa65066755f1a70907fb7a3a75664 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/pkgs/development/tools/xqilla/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xercesc }:
 
 stdenv.mkDerivation rec {
-  name    = "xqilla-${version}";
+  pname = "xqilla";
   version = "2.3.4";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix
index 1a8d7f13aff5d6820997dc0f980dbe8911fca8c6..ece440c692f770991814ea8bd609cc39f3ac1626 100644
--- a/pkgs/development/tools/yaml2json/default.nix
+++ b/pkgs/development/tools/yaml2json/default.nix
@@ -2,7 +2,7 @@
 
 
 buildGoPackage rec {
-  name = "yaml2json-${version}";
+  pname = "yaml2json";
   version = "unstable-2017-05-03";
   goPackagePath = "github.com/bronze1man/yaml2json";
 
diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix
index 3520bcfc1b12c3bda38b387be5107a05e6235745..a2076668f604330d12769c4b4fbc253abb53620d 100644
--- a/pkgs/development/tools/yj/default.nix
+++ b/pkgs/development/tools/yj/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
-  name = "yj-${version}";
+  pname = "yj";
   version = "4.0.0";
   rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558";
 
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index c157ddd65a879c4388a7d8f7a26dda09b190f354..82fac9f6be794581905f49f4ad0f97e91e505596 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yuicompressor-${version}";
+  pname = "yuicompressor";
   version = "2.4.8";
   
   src = fetchurl {
-    url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
+    url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 4159e3690490d30a2605063477a4b223cea6a278..4db0da4f418b732b720c4ebac8218090ab6642b9 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
-  name = "csslint-${version}";
+  pname = "csslint";
 
   src = fetchurl {
-    url = "https://registry.npmjs.org/csslint/-/${name}.tgz";
+    url = "https://registry.npmjs.org/csslint/-/${pname}-${version}.tgz";
     sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid";
   };
 
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 24f5678919832f6961f6585ab7fe61fd9fa42e5f..5427f66478f30286c7856c0a2a834d32e68e60a7 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -10,7 +10,7 @@ let
     ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
 in
 stdenv.mkDerivation rec {
-  name = "grails-${version}";
+  pname = "grails";
   version = "4.0.0";
 
   src = fetchurl {
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 26cec8f3730659ac8eb0873bcce7eda62c8a6d46..81417f6287b1713bab69875518e8d072b9734e3e 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -17,7 +17,7 @@ let
     stdenv.cc.cc
   ];
 in stdenv.mkDerivation rec {
-  name = "insomnia-${version}";
+  pname = "insomnia";
   version = "6.5.3";
 
   src = fetchurl {
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index 485c4026afaefda8e1d189b75330d05ce67745dd..ec1ec527c5ef3e38fc97c70fa33009a3f395adf6 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
   pname = "kcgi";
   version = "0.10.8";
   underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "kristapsdz";
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 91b4fe15e5a0579e6543dbcae5be3b2fdffbed4d..eb3254dcd3abb558e24998d7813866f15ec8b794 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "now-cli-${version}";
+  pname = "now-cli";
   version = "15.8.7";
 
   # TODO: switch to building from source, if possible
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 58b0f0e876f8e7809982db7f75bf08bc276e5d1d..1767eaab8bceeaccb6a1893900c49a97f65338db 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "postman-${version}";
+  pname = "postman";
   version = "7.0.7";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
     sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index 24e04842dc9ee5494e7ee3f6309781de81fb11ee..d56819be0195c529d95a900a3eec9920975b893e 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -17,7 +17,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "remarkjs-${version}";
+  pname = "remarkjs";
 
   version = "0.7.0";
 
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 266217d94e24c45a656c410d86f79109de2cd1bf..a625a815603d2aac9edc1c81d151aa1dc159e152 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -2,7 +2,7 @@
 , libgee, libsoup, fcgi }:
 
 stdenv.mkDerivation rec {
-  name = "valum-${version}";
+  pname = "valum";
   version = "0.3.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index bda6dab14d8a5ed0b2368246c418a46ada54ddbe..b77184e565254f73ac2ecbb46446039e182deee2 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -1,7 +1,7 @@
 { brotli, cmake, fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "woff2-${version}";
+  pname = "woff2";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix
index f0966357d93df8c211201082cbc25f253e15cfd2..b9b0ccf7272c2b9df1771137b24e1627ce367fdd 100644
--- a/pkgs/development/web/xmlindent/default.nix
+++ b/pkgs/development/web/xmlindent/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
-  name = "xmlindent-${version}";
+  pname = "xmlindent";
   version = "0.2.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz";
     sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs";
   };
 
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2cfddd1066ba3db036b19866e127a5868de3e1e6..eeedae924405de32e1ecdf3e939aaf8275ea1a39 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zeroad-unwrapped }:
 
 stdenv.mkDerivation rec {
-  name = "0ad-data-${version}";
+  pname = "0ad-data";
   inherit (zeroad-unwrapped) version;
 
   src = fetchurl {
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 74bc52875d22c0ab3f284386dba6e463a96ef112..ef285f8cb935d774ac8681f257d8f80373dc88f5 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -9,7 +9,7 @@
 assert withEditor -> wxGTK != null;
 
 stdenv.mkDerivation rec {
-  name = "0ad-${version}";
+  pname = "0ad";
   version = "0.0.23b";
 
   src = fetchurl {
diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix
index 5d91bc04114bd6c3e38fd0a16d68428f8ed4136c..446252062fac58a91e04bf059ceaaa18f9a6397d 100644
--- a/pkgs/games/2048-in-terminal/default.nix
+++ b/pkgs/games/2048-in-terminal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "2048-in-terminal-${version}";
+  pname = "2048-in-terminal";
   version = "2017-11-29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix
index 02ea6f68806920f1402caadf9e7b17e709cc4211..19d2a01b4729fab559b73b587fb56e24b48a51e2 100644
--- a/pkgs/games/airstrike/default.nix
+++ b/pkgs/games/airstrike/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, SDL, SDL_image }:
 
 stdenv.mkDerivation rec {
-  name = "airstrike-pre-${version}";
+  pname = "airstrike-pre";
   version = "6a";
 
   src = fetchurl {
diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix
index b5c7f4b730b842b910ea048819f5d1c7f26475b8..fcde2d591f13a61dcd43328c7df28f0c43540be6 100644
--- a/pkgs/games/amoeba/data.nix
+++ b/pkgs/games/amoeba/data.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "amoeba-data-${version}";
+  pname = "amoeba-data";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
index 435329bdc4ab4b790c823412eb814bbdd74394d7..46eb054bc8efd69888d58f222eeac1ccadc02df3 100644
--- a/pkgs/games/angband/default.nix
+++ b/pkgs/games/angband/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }:
 
 stdenv.mkDerivation rec {
+  pname = "angband";
   version = "4.2.0";
-  name = "angband-${version}";
 
   src = fetchFromGitHub {
     owner = "angband";
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index cd7f941ccd185f64238856efeb432f09a708776c..ebfdc0e13738a668de9f0f5b513f955a384a4046 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -38,7 +38,8 @@ let
     sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
 
     manual = stdenv.mkDerivation {
-      name = "anki-manual-${version}";
+      pname = "anki-manual";
+      inherit version;
       src = fetchFromGitHub {
         owner = "dae";
         repo = "ankidocs";
@@ -69,11 +70,12 @@ let
 
 in
 buildPythonApplication rec {
-    name = "anki-${version}";
+    pname = "anki";
+    inherit version;
 
     src = fetchurl {
       urls = [
-        "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
+        "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
         # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index 5318108c49136080a2153bcaa87a9a4d02e0f809..70c23664dc049a0aa0818249e9323db86b72551e 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -7,7 +7,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "armagetron-${version}";
+  pname = "armagetron";
+  inherit version;
   src = fetchurl {
     url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
     sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3";
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index a8e9063a35f4f90e931279444fa73870e68593de..5b1f240e7b5f7868cc02a45a849e1ed0b12630da 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -10,7 +10,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "arx-libertatis-${version}";
+  pname = "arx-libertatis";
   version = "2019-02-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
index b2c86222f2b04264e9ee0a7ad23b8ef18350d5cf..37593d3bd7262f5ce676b1b91c75acfa7e9761e0 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/pkgs/games/astromenace/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.2";
-  name = "astromenace-${version}";
+  pname = "astromenace";
 
   src = fetchurl {
     url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2";
diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index de9eb9bbb58030b2f96c207d7d06b6e0d3c9c361..b11a177e04554f0efa398409dc29ac076b9d287b 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, allegro }:
 
 stdenv.mkDerivation rec {
-  name = "atanks-${version}";
+  pname = "atanks";
   version = "6.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j";
   };
 
diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
index 27ddec616bc85014ccc667a77b5ba784c7f20266..85b6fcefdd28c32b355b0b618d713b50f1b44f4f 100644
--- a/pkgs/games/bastet/default.nix
+++ b/pkgs/games/bastet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }:
 
 stdenv.mkDerivation rec {
-  name = "bastet-${version}";
+  pname = "bastet";
   version = "0.43.2";
   buildInputs = [ ncurses boost ];
 
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index af1228108d8f64521bdae0ce70fdd56c692ba56e..d3eb2348a0d5a06c4c28dc86910e31156e9c16aa 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, unzip}:
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "blobby-volley-${version}";
+  pname = "blobby-volley";
 
   src = fetchurl {
     url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix
index 808d7e37807483068cb78f8ef1bf4eecf13b24ca..deb542e3a86f9adcae0df8773651bb1130395426 100644
--- a/pkgs/games/braincurses/default.nix
+++ b/pkgs/games/braincurses/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "braincurses-${version}";
+  pname = "braincurses";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
index 5040886eaa00c1e256b4baac4700f418823fc69a..e34dfc383a1a4fda7842b8be157e153a6c260594 100644
--- a/pkgs/games/brogue/default.nix
+++ b/pkgs/games/brogue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "brogue-${version}";
+  pname = "brogue";
   version = "1.7.5";
 
   src = fetchurl {
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 6c7e9ac76a999c1ab7fd68a2ac4a3d882b2aae0c..56d2866a23553f5fb8be4c22e15880bb7d2e4f08 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -3,12 +3,11 @@
 , Carbon, CoreServices }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "bzflag";
   version = "2.4.18";
 
   src = fetchurl {
-    url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
+    url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
     sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx";
   };
 
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 47432bca16339e08df62b462076bcf9c8714d113..3b460daefd1a4fd735cfa8913f4d06d2bb4952f2 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "chessx-${version}";
+  pname = "chessx";
   version = "1.5.0";
 
   src = fetchurl {
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 47ab73ca269e4785cf4e2a0a19c222e5d81dd0da..81f1ee0cd153a373a5ebd48811311d0c353ebb7d 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }:
 
 stdenv.mkDerivation rec {
-  name = "ckan-${version}";
+  pname = "ckan";
   version = "1.16.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index a38678882c86010ffde5fda284e2993f0af9e593..56164cfc017f0699a0802f085d78a58ca3cff2e2 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "commandergenius-${version}";
+  pname = "commandergenius";
   version = "2.3.3";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index c6ccac69b8cb461179bffbb5536b55022deaca7a..9528c6d06cb4a591044e9736ed9e4ccc5132ffde 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }:
 
 stdenv.mkDerivation rec {
-  name = "construo-${version}";
+  pname = "construo";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "https://github.com/Construo/construo/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/Construo/construo/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa";
   };
 
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
index 9526512f15ccb0ac8715f490f5e156e1c797deb2..c9dcd2d9d400a212dfeba4d1e95cdc3de796d58f 100644
--- a/pkgs/games/crafty/default.nix
+++ b/pkgs/games/crafty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "crafty-${version}";
+  pname = "crafty";
   version = "25.0.1";
 
   src = fetchurl {
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index 98baafbb2fd273182439c69f469b7e5819155ee4..b9d3a69d87b3a5051f290bf66443570087d8803a 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -3,10 +3,11 @@ let
   version = "0.9.13";
 in
 stdenv.mkDerivation rec {
-  name = "crrcsim-${version}";
+  pname = "crrcsim";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/crrcsim/${name}.tar.gz";
+    url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz";
     sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698";
   };
 
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index e0f35fe6d6dc3953cb25626004065905f9ce5861..24077697218dbf992fdc3214df453bf82ec6c730 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }:
 
 mkDerivation rec {
-  name = "cutemaze-${version}";
+  pname = "cutemaze";
   version = "1.2.5";
 
   src = fetchurl {
-    url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2";
+    url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";
     sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj";
   };
 
diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix
index 19d857a8e78cd315805e4ce056e3ccc64f432e19..f4e5290df27b8af7dc0efbc4e340dbcc1a495d0e 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/pkgs/games/cuyo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_mixer, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "cuyo-${version}";
+  pname = "cuyo";
   version = "2.1.0";
   
   src = fetchurl {
diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index 8b92c2e9d6fb5fbe7426a5bab14a75cc182cde3c..441e9f66981c7da8efb25714bfc9d02e0cfafdf9 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -2,7 +2,7 @@
 , openal, curl }:
 
 stdenv.mkDerivation rec {
-  name = "dhewm3-${version}";
+  pname = "dhewm3";
   version = "1.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a77250543107416348af1477a92bf95944be3861..0b25af645cfa602672fb1162ea0a8be93e3664ec 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -84,7 +84,8 @@ let
   '';
 
   dfhack = stdenv.mkDerivation rec {
-    name = "dfhack-base-${version}";
+    pname = "dfhack-base";
+    inherit version;
 
     # Beware of submodules
     src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 652e4c184753b78330fcff7b3ea06f1bf92b2f55..bcef336f342a6636bc71ca2c861aa986eb89f9b0 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -2,7 +2,7 @@
 , qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "dwarf-therapist-${version}";
+  pname = "dwarf-therapist";
   version = "41.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
index caa9adeefd065b25cb338f4f68f082f5d5872271..a59c873069039a9d6cd9315d0dee95fd93a0614f 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "2016-1_196";
   dfVersion = "0.44.12";
   inherit soundPack;
-  name = "soundsense-${version}";
+  pname = "soundsense";
   src = fetchzip {
     url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip";
     sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk";
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 86d233b037855ed8d19eef768acfbffed9e16af4..518b63ed483c7f3f08a2344e27fe752d159140e5 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -9,7 +9,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "dxx-rebirth-${version}";
+  pname = "dxx-rebirth";
   version = "0.59.100";
 
   src = fetchurl {
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index 68dbe12bb733ad41185addf5bdacf247943ad634..dfa57a728649f5f7b90449c1bf5fc5ca6fb78f06 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -4,7 +4,7 @@
 , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "easyrpg-player-${version}";
+  pname = "easyrpg-player";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 3407659d977bb281821b494b071ad5b6fcae7011..2999da8fcaaf3126cd18274f9529d55fa13b591a 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -18,7 +18,8 @@ let
   wrapper = "eduke32-wrapper";
 
 in stdenv.mkDerivation {
-  name = "eduke32-${version}";
+  pname = "eduke32";
+  inherit version;
 
   src = fetchurl {
     url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz";
diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 6815041c96b4ba864a5c81b5014c9d2c7fbfe688..18c83b8c5a4cb997814019e81067681f97d2e14d 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -9,7 +9,7 @@ let
   version = "${major}.${minor}.${patch}";
 
   serious-proton = stdenv.mkDerivation rec {
-    name = "serious-proton-${version}";
+    pname = "serious-proton";
     inherit version;
 
     src = fetchFromGitHub {
@@ -35,7 +35,7 @@ in
 
 
 stdenv.mkDerivation rec {
-  name = "empty-epsilon-${version}";
+  pname = "empty-epsilon";
   inherit version;
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 447724a2043f0db3f7738546dad1f1a1c60f6372..a138b46f81bd11c2a45c589a73071a79e201ef65 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -7,7 +7,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "endless-sky-${version}";
+  pname = "endless-sky";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "endless-sky";
diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix
index 742ca9591357285d2beb909da5fb3f6f1bc86f4e..af002a690e4dd1d254e8b468d743c0371ee2b126 100644
--- a/pkgs/games/enyo-doom/default.nix
+++ b/pkgs/games/enyo-doom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "enyo-doom-${version}";
+  pname = "enyo-doom";
   version = "1.06.9";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix
index 911308a078a565d748039c4f4756a15891adf16a..86a83d68f021d3f5f1f1813841fb6698a39ab1e4 100644
--- a/pkgs/games/eternity-engine/default.nix
+++ b/pkgs/games/eternity-engine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "eternity-engine-${version}";
+  pname = "eternity-engine";
   version = "3.42.02";
   src = fetchFromGitHub {
     owner = "team-eternity";
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index fba1ce01c45a594d2243e66335f6bb3b9c851f4b..30788c7ec5c84680d94a99f967f930900cd2cd87 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
-  name = "extremetuxracer-${version}";
+  pname = "extremetuxracer";
 
   src = fetchurl {
     url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 85433e116fbcbd3775bd1c2330ccaa594f0fa962..e06975e8db4189be5de4a163ad81113b31162506 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -3,7 +3,6 @@
 , pkgconfig, SDL2, vim }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "ezquake";
   version = "3.0.1";
 
diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix
index 1aab0933b1bfa67670fadacef9a1c3bb6fb4e31d..44ed91da16851c4dc8b8af6d74be7368bf39b83c 100644
--- a/pkgs/games/fairymax/default.nix
+++ b/pkgs/games/fairymax/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  name = "fairymax-${version}";
+  pname = "fairymax";
   version = "4.8";
   src = fetchurl {
     url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c";
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix
index 2ab6e04e2d82bb14dca38a9c0da2572364cbbe4a..47f72c52c1f030c5e2a56f339588714f68771bf9 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/pkgs/games/fish-fillets-ng/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}:
 stdenv.mkDerivation rec {
-  name = "fish-fillets-ng-${version}";
+  pname = "fish-fillets-ng";
   version = "1.0.1";
   src = fetchurl {
     url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz";
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 5a04e75030f64dad96178f51ef49840184f80c2f..19851341da0c776c97a6fbe18d05eafad913f25a 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -9,7 +9,8 @@ let
   version = "2019.1.1";
   shortVersion = builtins.substring 0 6 version;
   data = stdenv.mkDerivation rec {
-    name = "flightgear-base-${version}";
+    pname = "flightgear-base";
+    inherit version;
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix
index ef46ea840b79dcee476adde72a032ac92c51ef34..957452aa1629e250ddebf23e6cfc8b49f806d0ec 100644
--- a/pkgs/games/fltrator/default.nix
+++ b/pkgs/games/fltrator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, fltk, which, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "fltrator-${version}";
+  pname = "fltrator";
   version = "2.3";
 
   src = fetchurl {
diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
index 35bc22e878970b77bc6fe4657ae71b53c773c78f..3ba383c74273e66b1bee4728d2423664b0020ea4 100644
--- a/pkgs/games/freecell-solver/default.nix
+++ b/pkgs/games/freecell-solver/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "freecell-solver-${version}";
+  pname = "freecell-solver";
   version = "4.18.0";
 
   src = fetchurl {
-    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz";
+    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
     sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn";
   };
 
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index d5efe2b3ebd96301ddfc8a7770bc5596c37d0300..3b8bc1288efceec6bab97ab7676d87d606f379cd 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -5,10 +5,11 @@ let
   version = "1.08.20121209";
 
   freedink_data = stdenv.mkDerivation rec {
-    name = "freedink-data-${version}";
+    pname = "freedink-data";
+    inherit version;
 
     src = fetchurl {
-      url = "mirror://gnu/freedink/${name}.tar.gz";
+      url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
       sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j";
     };
 
@@ -16,10 +17,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "freedink-${version}";
+  pname = "freedink";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnu/freedink/${name}.tar.gz";
+    url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
     sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr";
   };
 
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 2ebb60f3d5dbf65a441ca611aaf569a2dd2ca76a..b269a5d12d6d67c2c82413c678af78f468d9302f 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.16.1";
 in stdenv.mkDerivation rec {
-  name = "freedroidrpg-${version}";
+  pname = "freedroidrpg";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz";
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 125f02005a33a4eba2757f9ffb70b3d4fb8ee55a..d0f514f239d55829f428a8115be87cf4a405c895 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.8";
-  name = "freeorion-${version}";
+  pname = "freeorion";
 
   src = fetchFromGitHub {
     owner  = "freeorion";
diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix
index dd0707fe5c395af726e78f921eb32f75fe9815bb..94efe1b650a7ff6f173a7289481a09d2e1fdd0c0 100644
--- a/pkgs/games/freesweep/default.nix
+++ b/pkgs/games/freesweep/default.nix
@@ -2,7 +2,7 @@
   updateAutotoolsGnuConfigScriptsHook }:
 
 stdenv.mkDerivation rec {
-  name = "freesweep-${version}";
+  pname = "freesweep";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix
index 3b4fb6842dbb8af802ee289b8eea6085a785de28..3dbd7bd928b670040046377127432086c28da360 100644
--- a/pkgs/games/frotz/default.nix
+++ b/pkgs/games/frotz/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.44";
-  name = "frotz-${version}";
+  pname = "frotz";
 
   src = fetchFromGitHub {
     owner = "DavidGriffith";
diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix
index dd27f96f7d408b7129c6540c8127a4b2a71bc712..f5089b6395f47c3fcdee44c8358fbac2b6682c97 100644
--- a/pkgs/games/galaxis/default.nix
+++ b/pkgs/games/galaxis/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "galaxis-${version}";
+  pname = "galaxis";
   version = "1.10";
 
   src = fetchurl{
-    url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz";
     sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r";
   };
 
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix
index dabcfb19db043bd9093956806a275b2e54cd9507..de4a89eac07fb2b885105a18662c855625363881 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/pkgs/games/gambatte/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, scons, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "gambatte-${version}";
+  pname = "gambatte";
   version = "2016-05-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
index 066cadb13b17d67af2bbd30106595f29653465b1..4c57538e234e3eec6853a8aa8907781eae6d85e1 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, automake, allegro }:
 
 stdenv.mkDerivation rec {
-  name = "garden-of-coloured-lights-${version}";
+  pname = "garden-of-coloured-lights";
   version = "1.0.9";
 
   buildInputs = [ allegro autoconf automake ];
diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
index b718a92143cb89d814b9176061fb634f4092aa5f..3665467407a96ac826c3543580b0f31ac7ea1a58 100644
--- a/pkgs/games/gcs/default.nix
+++ b/pkgs/games/gcs/default.nix
@@ -29,10 +29,10 @@ let
     sha256 = "085jpp9mpv5kw00zds9sywmfq31mrlbrgahnwcjkx0z9i22amz4g";
   };
 in stdenv.mkDerivation rec {
-  name = "gcs-${version}";
+  pname = "gcs";
   version = "4.8.0";
 
-  src = runCommand "${name}-src" { preferLocalBuild = true; } ''
+  src = runCommand "${pname}-${version}-src" { preferLocalBuild = true; } ''
     mkdir -p $out
     cd $out
 
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index fc7bf7168ddfafa1fd2003a473e84d47abbfaf5a..72afca4cd2cfc5b38aae76cf983feb85fc4b0cfc 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -3,7 +3,7 @@
 , libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "gemrb-${version}";
+  pname = "gemrb";
   version = "0.8.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix
index b9694811fa518b8974c22291daa52b457309f448..fb60808bab70046d2bcd72d8d37977cb56339da2 100644
--- a/pkgs/games/gl-117/default.nix
+++ b/pkgs/games/gl-117/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gl-117-${version}";
+  pname = "gl-117";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${pname}-${version}.tar.bz2";
     sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4";
   };
 
diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix
index 2952edaa78d9ae31ee0ad7eb9e09dc7354b56e68..fa8d59c05030a0af1f2bf6451164eada69de5d8f 100644
--- a/pkgs/games/gnugo/default.nix
+++ b/pkgs/games/gnugo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gnugo-${version}";
+  pname = "gnugo";
   version = "3.8";
 
   src = fetchurl {
diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix
index 64c3954ba4855e5d76d41de9fec6734ce63c1c17..4bf460836d983a8fd77b6b9be53573ecf65584a4 100644
--- a/pkgs/games/gnujump/default.nix
+++ b/pkgs/games/gnujump/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, SDL, SDL_image, SDL_mixer }:
 
 stdenv.mkDerivation rec {
-  name = "gnujump-${version}";
+  pname = "gnujump";
   version = "1.0.8";
   src = fetchurl {
-    url = "mirror://gnu/gnujump/${name}.tar.gz";
+    url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz";
     sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk";
   };
   buildInputs = [ SDL SDL_image SDL_mixer ];
diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix
index e85674550308eba53c49fc284f6ddf0c3c76a126..381b4fd59593a2db8479d04a091e25dcb857350a 100644
--- a/pkgs/games/gnushogi/default.nix
+++ b/pkgs/games/gnushogi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "gnushogi-${version}";
+  pname = "gnushogi";
   version = "1.4.2";
   buildInputs = [ zlib ];
 
   src = fetchurl {
-    url = "mirror://gnu/gnushogi/${name}.tar.gz";
+    url = "mirror://gnu/gnushogi/${pname}-${version}.tar.gz";
     sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y";
   };
 
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
index e89d16b788a684adc9ceaa4a600dff7ac7280a50..f9ae137bb626dff64e4a3bf305402c491e7cae9a 100644
--- a/pkgs/games/gogui/default.nix
+++ b/pkgs/games/gogui/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.4.9";
 in stdenv.mkDerivation {
-  name = "gogui-${version}";
+  pname = "gogui";
+  inherit version;
   buildInputs = [ unzip makeWrapper ];
   src = fetchurl {
     url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index b29b045a4217e80759377c575ef93272d52c9693..6031762d1d6b393a6256d42925f3e04a3134b370 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}:
 
 stdenv.mkDerivation rec {
-  name = "gtypist-${version}";
+  pname = "gtypist";
   version = "2.9.5";
 
   src = fetchurl {
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 043be5e23d9bafee807f49075e6a3afde7d4cd56..3ccbdf525ce018ff843f781187335742031208fc 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -3,7 +3,7 @@
 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
 
 stdenv.mkDerivation rec {
-  name = "gzdoom-${version}";
+  pname = "gzdoom";
   version = "4.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 470e1d090fcdf8c9c7d6b615b535706cf04f9e58..97aee425fd1622c471d1845a0e358d8b702c3463 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.12.1";
-  name = "hawkthorne-${version}";
+  pname = "hawkthorne";
 
   src = fetchgit {
     url = "https://github.com/hawkthorne/hawkthorne-journey.git";
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index ea229db6a7471b1a1b62213660bcd38c6be726ad..7ef5c6a49b3ee2f16bfa464cae68420074c9d2f9 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "1.0.0-beta1";
-  name = "hedgewars-${version}";
+  pname = "hedgewars";
   src = fetchhg {
     url = "https://hg.hedgewars.org/hedgewars/";
     rev = "7ab5cf405686";
diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix
index e6d6febeac6fe2bd4fb5f4a332f7f25868ed2718..c20cce723c26aab998742bdc9169c89a95586a6b 100644
--- a/pkgs/games/holdingnuts/default.nix
+++ b/pkgs/games/holdingnuts/default.nix
@@ -2,12 +2,11 @@
 
 let mirror = "http://download.holdingnuts.net";
 in stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "holdingnuts";
   version = "0.0.5";
 
   src = fetchurl {
-    url    = "${mirror}/release/${version}/${name}.tar.bz2";
+    url    = "${mirror}/release/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0iw25jmnqzscg34v66d4zz70lvgjp4l7gi16nna6491xnqha5a8g";
   };
 
diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
index 760d82c026d238fdbb0621ce353e2c75f8d14cd5..b4f5e4f7f630bf1e3cf1519d365df92449480099 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/pkgs/games/hyperrogue/default.nix
@@ -2,7 +2,7 @@
   libpng, glew, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "hyperrogue-${version}";
+  pname = "hyperrogue";
   version = "10.5e";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix
index 39324843e5e518bf61c139d8a4bdd2a25c2c3055..10d29657d7cf3957ce786fa0913175eafc68414e 100644
--- a/pkgs/games/instead-launcher/default.nix
+++ b/pkgs/games/instead-launcher/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "instead-launcher-${version}";
+  pname = "instead-launcher";
 
   version = "0.7.0";
 
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index f84b83a3010debe6a48d88134d942a1022c5a25c..86f3f7214466883458fff722ccc1d044e8a9f60a 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "ivan-${version}";
+  pname = "ivan";
   version = "056";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 37c45e7aa6032a59b7bbb00e2d47cf9936160626..94c614598bfe500b0d00b19bfd3373e9ee32ca29 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -27,7 +27,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "ja2-stracciatella-${version}";
+  pname = "ja2-stracciatella";
   inherit src;
   inherit version;
 
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 4cea30c79e6dad8039e651d14900a3ebdb0bd10f..e2a4cff291bafcbe352e0be1fae1f66a4248f67a 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "klavaro-${version}";
+  pname = "klavaro";
   version = "3.08";
 
   src = fetchurl {
-    url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
+    url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
     sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc";
   };
 
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index b5f858b99ad798fa007ceb83668892a9e03a4e94..0e6941a8acd5a888035d3daa933fc4f970ab919d 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "lbreakout2-${version}";
+  pname = "lbreakout2";
   version = "2.6.5";
   buildInputs = [ SDL SDL_mixer zlib libpng libintl ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/lgames/${name}.tar.gz";
+    url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
     sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
   };
 
diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
index d00072d2455156e80582498ac3cd7f2122e82edf..d4621682cc679488c57f4a674270a8a1dafb1a88 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/pkgs/games/leela-zero/default.nix
@@ -2,7 +2,7 @@
 , opencl-headers, ocl-icd, qtbase , zlib }:
 
 stdenv.mkDerivation rec {
-  name = "leela-zero-${version}";
+  pname = "leela-zero";
   version = "0.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index daf7dd7f61f4041ba7142825a985e3aa0b87314c..505d98c92dbefec54e86122e54d750063e634cd2 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -2,7 +2,7 @@
 , htmlcxx, rhash, tinyxml-2, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "lgogdownloader-${version}";
+  pname = "lgogdownloader";
   version = "3.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix
index fef6e11d9be9db1199878f1b98b2ed09b6fc7a58..0e819278dc394d6b4f2ee090e38d63e03f1c0a3e 100644
--- a/pkgs/games/liberal-crime-squad/default.nix
+++ b/pkgs/games/liberal-crime-squad/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-07-06";
-  name = "liberal-crime-squad-${version}";
+  pname = "liberal-crime-squad";
 
   src = fetchFromGitHub {
     owner = "Kamal-Sadek";
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 0abbfda33c7b38db821d2b96f305e945634ff59a..fb98b1a3811b78bcf2aee1f2960f3367a4b0ae35 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lincity-${version}";
+  pname = "lincity";
   version = "1.13.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lincity/${name}.tar.gz";
+    url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz";
     sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v";
   };
 
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index b860d2ee58b118c01c0ac2185bf46c6f3b1a9c87..cfc06e11e1919a9c7bac08d7acfd170d0644327f 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lincity-ng-${version}";
+  pname = "lincity-ng";
   version = "2.9beta.20170715";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix
index 1fcf9c9527bd82dc7372eeedb9e7359888ffe95b..f57571b2a2c4a87b506bf98d3c770bbadb3a2826 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/pkgs/games/linux-steam-integration/default.nix
@@ -5,7 +5,8 @@ let
   version = "0.7.3";
 
 in stdenv.mkDerivation rec {
-  name = "linux-steam-integration-${version}";
+  pname = "linux-steam-integration";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "clearlinux";
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index d748c96da242f61c91fc4b9157c6495fe4aee1c3..0bd90f77b2400f1ab40022504f91f3507e1d625d 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, allegro }:
 stdenv.mkDerivation rec {
   version = "5.6.4";
-  name = "liquidwar5-${version}";
+  pname = "liquidwar5";
   src = fetchurl {
     url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
     sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index af7101f216d583379e3954576a1516091a874ac3..800ac0fc4c7a768825397d6ea9c400ef0ff5a97c 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -6,11 +6,11 @@
 , libogg, libvorbis, libcaca, csound, cunit } :
 
 stdenv.mkDerivation rec {
-  name = "liquidwar6-${version}";
+  pname = "liquidwar6";
   version = "0.6.3902";
 
   src = fetchurl {
-    url = "mirror://gnu/liquidwar6/${name}.tar.gz";
+    url = "mirror://gnu/liquidwar6/${pname}-${version}.tar.gz";
     sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
   };
 
diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix
index 10a79a696732b2823d95f1c17a56f5fabd6c6009..d580d7586ff948d61f4359d05200f0c7d2edb600 100644
--- a/pkgs/games/ltris/default.nix
+++ b/pkgs/games/ltris/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, SDL, SDL_mixer }:
 
 stdenv.mkDerivation rec {
-  name = "ltris-${version}";
+  pname = "ltris";
   version = "1.0.19";
   buildInputs = [ SDL SDL_mixer ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/lgames/${name}.tar.gz";
+    url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
     sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
   };
 
diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix
index da711f59af0285dda806192ba7b0fb854b0193ca..ed0b2be0d9782da3e171b11a0603201aad11f3a1 100644
--- a/pkgs/games/mar1d/default.nix
+++ b/pkgs/games/mar1d/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "MAR1D-${version}";
+  pname = "MAR1D";
   version = "0.2.0";
   options = "-w${toString width}"
           + " -s${toString sensitivity}"
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index de67afe45a9473cb2f52b43ac6441d599ff4b66c..df613bb44470ed19585ab1b4a041bdffda46683e 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -17,7 +17,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "megaglest-${version}";
+  pname = "megaglest";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "MegaGlest";
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index 21d2ad87dfb8a25a3f7996f55a54f3d776e4883c..8b0808d8e8cce5674706a705ad44afb165388d61 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "meritous-${version}";
+  pname = "meritous";
   version = "1.4";
 
   src = fetchFromGitLab {
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 4fd44880b827f9c12b36550fb8af21addf9df543..9ddae8b65bf321aa364c7a63faac5f0bb198e926 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, jre }:
 stdenv.mkDerivation rec {
-  name = "minecraft-server-${version}";
+  pname = "minecraft-server";
   version = "1.14.4";
 
   src = fetchurl {
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 17366ae990404c38c0f05cef1d91be146b647483..52a91165537340e3fcd3758f5638e819913ca3ed 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -24,7 +24,8 @@ let
       };
     };
   in stdenv.mkDerivation {
-    name = "minetest-${version}";
+    pname = "minetest";
+    inherit version;
 
     src = sources.src;
 
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index dab83ddc900dea96a8168613e8297a3b345c04d0..4dcc7a6262f07081732416178fe9538cc4158112 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -2,7 +2,7 @@
 , boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "mudlet-${version}";
+  pname = "mudlet";
   version = "3.0.0-delta";
 
   src = fetchurl {
diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix
index c806dfa5b806abc3f2477fd2fb5bc9264a637138..c465b413db12f29792b8f315cbe3399614624d91 100644
--- a/pkgs/games/newtonwars/default.nix
+++ b/pkgs/games/newtonwars/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "newtonwars-${version}";
+  pname = "newtonwars";
   version = "20150609";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 39b3ae36f506f658245baaad1c058bec6e9e0edf..72d60eae7f66f67a7670d7c623908030ae633b77 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -13,7 +13,8 @@ let
 
   version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
 in stdenv.mkDerivation {
-  name = "nexuiz-${version}";
+  pname = "nexuiz";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip";
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 8ac020f3ce09529be489103399ba7574926d76b3..b39519193e772c3ce226a67b37e80189c3bf7acd 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }:
 
 stdenv.mkDerivation rec {
-  name = "openarena-${version}";
+  pname = "openarena";
   version = "0.8.8";
 
   src = fetchurl {
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix
index fa0411196318ffff4120d57f42a58eee201b7567..cce643e9f7db8f23d422c7a863c7dd3bb9f7dd43 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/pkgs/games/openclonk/default.nix
@@ -11,7 +11,7 @@ let
   };
 in stdenv.mkDerivation rec {
   version = "8.1";
-  name = "openclonk-${version}";
+  pname = "openclonk";
 
   src = fetchurl {
     url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index d2f1e27b10ecccd47e01bf2613b5d4ee1c8babe9..751eb6d5933e911543a478b967758a78ba58ec64 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -7,7 +7,7 @@
 # - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php
 
 stdenv.mkDerivation rec {
-  name = "opendune-${version}";
+  pname = "opendune";
   version = "0.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
index 3c4e85a91e5a7e42d5ab6589c3a808afed001a30..d59afc330a790e21e4bc5e2d87a1cb8f6190a7b6 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/pkgs/games/opendungeons/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "opendungeons-${version}";
+  pname = "opendungeons";
   version = "0.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 8cfcb1478288bc4c0bf0466df2d882125eb7c2ad..d9c992199c4005d72b8f9b985135b7d23e708ac0 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -12,12 +12,12 @@ let
   });
 in mkDerivation rec {
   version = "0.45.0";
-  name = "openmw-${version}";
+  pname = "openmw";
 
   src = fetchFromGitHub {
     owner = "OpenMW";
     repo = "openmw";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4";
   };
 
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index 63fb24dc4d7de2fd01a5c5099edcf363586e8349..fab4de64ee2c6a7c398e4578061cbcc93ace3fa3 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-09-17";
-  name = "openrw-${version}";
+  pname = "openrw";
 
   src = fetchgit {
     url = "https://github.com/rwengine/openrw";
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index e0acf60144ed3a9e5ed5d103dea2b89a8f3b7c54..de05e1944f397a4d31333001b1078d8aa1bfa677 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openspades-${version}";
+  pname = "openspades";
   version = "0.1.3";
   devPakVersion = "33";
 
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 91969a335f8f19e0523f6b87af21ae1f947856bc..e3c23ad26716d5838e0624a3119ce7cc6254e749 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -28,11 +28,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "openttd-${version}";
+  pname = "openttd";
   version = "1.9.2";
 
   src = fetchurl {
-    url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz";
+    url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
     sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr";
   };
 
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix
index c91f9807581e52ba4b0d61bfad5dfbc122c1b4d8..2dae58df9765e51c6a96a472d49d0dd4897d5202 100644
--- a/pkgs/games/opentyrian/default.nix
+++ b/pkgs/games/opentyrian/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchzip, SDL, SDL_net}:
 
 stdenv.mkDerivation rec {
-  name = "opentyrian-${version}";
+  pname = "opentyrian";
   version = "2.1.20130907";
 
   src = fetchurl {
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 211172cee203d57e4fa2ac3cc1aca4e715f5c8ae..9b3d92a350d38a51b8ed94a8db563cf57713035a 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.0.0.2018.10.08"; in
 stdenv.mkDerivation {
-  name = "openxcom-${version}";
+  pname = "openxcom";
+  inherit version;
   src = fetchFromGitHub {
     owner = "SupSuper";
     repo = "OpenXcom";
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
index 59e7c874d141c0ff3f4e593299b596fb5fc63f1a..a0169debfef876dd3edc90b50b1114028c76be7b 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/pkgs/games/pacvim/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "pacvim-${version}";
+  pname = "pacvim";
   version = "2018-05-16";
   src = fetchFromGitHub {
     owner = "jmoon018";
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
index c73c346512f92cc9075b0c6c788c5199636eebc4..28487a7f8e8a3985726e5ba9754fbea97b62810d 100644
--- a/pkgs/games/performous/default.nix
+++ b/pkgs/games/performous/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "performous-${version}";
+  pname = "performous";
   version = "1.1";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
index 6991735962d7a924469be203c5fe6c0d565c1dd1..4cfd7de6a55fe3382c1654b6218f8189136d7e49 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
 stdenv.mkDerivation rec {
   version = "1.0.13";
-  name = "pro-office-calculator-${version}";
+  pname = "pro-office-calculator";
 
   src = fetchFromGitHub {
     owner  = "RobJinman";
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 924101c2d4a892386ac3f7948105a1e7b8f6e406..9242921817899b47e1b6c83efd9dcf0392bf2ed2 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgo-${version}";
+  pname = "qgo";
   version = "unstable-2017-12-18";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix
index dfd384761921d939dba0d1a2b920122c18f274c7..f161f53bfe1e66d62fa02bfbca3ad264957508db 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/pkgs/games/qqwing/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "qqwing-${version}";
+  pname = "qqwing";
   version = "1.3.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 1564ba19bd2e5cf4245269c7f865add5d6813708..0602aace319ad9e4280e5e6fa20700b844fc5431 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -14,7 +14,7 @@ let
   wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };
 
   yquake2 = stdenv.mkDerivation rec {
-    name = "yquake2-${version}";
+    pname = "yquake2";
     version = "7.30";
 
     src = fetchFromGitHub {
diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
index 88ba8679e8a73ad1e657184a46b81c0be7de6444..0d8a64f14cdc728274c42a4f9f52a9b6a2f968e2 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/pkgs/games/quake3/content/demo.nix
@@ -3,7 +3,8 @@
 let
   version = "1.11-6";
 in stdenv.mkDerivation {
-  name = "quake3-demodata-${version}";
+  pname = "quake3-demodata";
+  inherit version;
 
   src = fetchurl {
     url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
index f35aaaad3527590d2ab5456921200e643e9eadde..e34064d93b0578de4af159c77f0a98492e593ae2 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -3,7 +3,8 @@
 let
   version = "1.32b-3";
 in stdenv.mkDerivation {
-  name = "quake3-pointrelease-${version}";
+  pname = "quake3-pointrelease";
+  inherit version;
 
   src = fetchurl {
     url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 7bc0863a33f8dfffc3546b8c664096701c8c2b84..7f0fb6fd06234cf327a0febb2ed0329a92b30f0d 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ioquake3-git-${version}";
+  pname = "ioquake3-git";
   version = "2019-05-29";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index f61b0e2379255c32497d5acb1a0fe58aad577f55..a8d740ea512862d42932ee8968e6fe910a1dae8f 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, SDL, fetchurl, gzip, libvorbis, libmad }:
 stdenv.mkDerivation rec {
-  name = "quakespasm-${version}";
+  pname = "quakespasm";
   majorVersion = "0.93";
   version = "${majorVersion}.1";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd";
   };
 
-  sourceRoot = "${name}/Quake";
+  sourceRoot = "${pname}-${version}/Quake";
 
   buildInputs = [
     gzip SDL libvorbis libmad
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 4cd073869dc8f2628de774541fdb7618ab967b88..114f862888d47de636360e2c2ae2e934321fa394 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -1,7 +1,7 @@
 { stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
 
 stdenv.mkDerivation rec {
-  name = "vkquake-${version}";
+  pname = "vkquake";
   majorVersion = "1.01";
   version = "${majorVersion}.0";
 
diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix
index c44072309b19b36949e0c9d84cd297b6f7f3460f..79d657e668dc45b2afde65caf8e8c4cf2f3f4b9e 100644
--- a/pkgs/games/residualvm/default.nix
+++ b/pkgs/games/residualvm/default.nix
@@ -9,7 +9,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.1.1";
-  name = "residualvm-${version}";
+  pname = "residualvm";
 
   src = fetchurl {
     url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2";
diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix
index b6a74ad8be6568ccaa563d63cc31e524d818ab90..9ab63553053fac433db64c941808ab8b879a656c 100644
--- a/pkgs/games/rftg/default.nix
+++ b/pkgs/games/rftg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "rftg-${version}";
+  pname = "rftg";
   version = "0.9.4";
 
   src = fetchurl {
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 274a095de6f4928d6a2cfce72ad1b77a89153cbf..09550339f83dbaafa94c572475e1a2029b8e2fbc 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.7.0";
-  name = "rigsofrods-${version}";
+  pname = "rigsofrods";
 
   src = fetchFromGitHub {
     owner = "RigsOfRods";
diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix
index 7cbfacd0b40954349bca0652b377d8b1fed005a4..780025f52226fd092a756d3001e5d3deb36e76e6 100644
--- a/pkgs/games/riko4/default.nix
+++ b/pkgs/games/riko4/default.nix
@@ -5,7 +5,7 @@ let
   # and this library does not have a proper release version, so let the
   # derivation for this stay next to the Riko4 derivation for now.
   sdl-gpu = stdenv.mkDerivation rec {
-    name = "sdl-gpu-${version}";
+    pname = "sdl-gpu";
     version = "2018-11-01";
     src = fetchFromGitHub {
       owner = "grimfang4";
@@ -27,7 +27,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "riko4-${version}";
+  pname = "riko4";
   version = "0.1.0";
   src = fetchFromGitHub {
     owner = "incinirate";
diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix
index 00d73f95bdb391823a2f35189e2a7cef80f72a4b..fa1eb338a89b576998b53d1b60c1ede7cbdb7ebc 100644
--- a/pkgs/games/robotfindskitten/default.nix
+++ b/pkgs/games/robotfindskitten/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "robotfindskitten-${version}";
+  pname = "robotfindskitten";
   version = "2.7182818.701";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${name}.tar.gz";
+    url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${pname}-${version}.tar.gz";
     sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp";
   };
 
diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix
index 8b07a38c7bb7340576820a977019d73e6dfb1429..459ff238b4a47e3fc77c08e17128af17f599d75d 100644
--- a/pkgs/games/rrootage/default.nix
+++ b/pkgs/games/rrootage/default.nix
@@ -10,7 +10,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "rrootage-${version}";
+  pname = "rrootage";
+  inherit version;
   src = fetchurl {
     url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz";
     sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln";
diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix
index a56365778fb19110c7f101d4b1de109bf02cb689..eaf1b3dc4fda18475328e3d02ae165c2d1451352 100644
--- a/pkgs/games/runelite/default.nix
+++ b/pkgs/games/runelite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }:
 
   stdenv.mkDerivation rec {
-  name = "runelite-${version}";
+  pname = "runelite";
   version = "1.6.0";
 
   src = fetchurl {
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix
index 79fef6740023239872dbd9e9e6f7ea1d70765346..345ce33fca0a28e077d0b5793d5908ada2e84bfc 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/pkgs/games/scid-vs-pc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "scid-vs-pc-${version}";
+  pname = "scid-vs-pc";
   version = "4.20";
 
   src = fetchurl {
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 301991c1a6fd88dd2d911925119615b0281eaedc..040902ffd73db34c4c52377a4d70ef79906e9a0c 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "scid-${version}";
+  pname = "scid";
   version = "4.3";
 
   src = fetchurl {
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index 430b22c9ba97a0b74770b6bd2361343836688f05..1527f61c4d0f94b3cf53a2b7077b067ebf9f2802 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "44";
-  name = "scorched3d-${version}";
+  pname = "scorched3d";
   src = fetchurl {
     url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz";
     sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw";
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 2ebc2c82e5066426a43ace1e75cb298fce6f79bc..cb8223daa2b069705b3567457b2730ce3700a5ef 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "scummvm-${version}";
+  pname = "scummvm";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz";
+    url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
     sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p";
   };
 
diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index 9f90c9f14aac60b462ff56697842c7199dc7fc9d..7811b4b7373f7d0ace99570d1d618e2d2a848702 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   version = "0.151.u0-1";
-  name    = "sdlmame-${version}";
+  pname = "sdlmame";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux"
     then fetchurl {
-      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-x86_64.pkg.tar.xz";
+      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-x86_64.pkg.tar.xz";
       sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9";
     }
     else fetchurl {
-      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-i686.pkg.tar.xz";
+      url    = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-i686.pkg.tar.xz";
       sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7";
     };
 
diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix
index de91f26d95de92d0a84477338298b9d4688d4e5d..a998a86370d92d8b699538fb3d62827c0b34d3a8 100644
--- a/pkgs/games/sil/default.nix
+++ b/pkgs/games/sil/default.nix
@@ -9,7 +9,7 @@ let
   '';
 in
 stdenv.mkDerivation rec {
-  name = "Sil-${version}";
+  pname = "Sil";
   version = "1.3.0";
 
   src = fetchzip {
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 5cbb3c1796f1d8260d5b69ebf43bebf82975f58c..e6889731619fb9b28801941819dad60caa4b6a8a 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -107,7 +107,8 @@ let
   };
 
   binaries = stdenv.mkDerivation rec {
-    name = "simutrans-${version}";
+    pname = "simutrans";
+    inherit version;
 
     src = binary_src;
 
diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix
index e8d915dd31a5456679597de46ebfb42ff03224d0..1334f555bbdebda2bff709b101b74b008d6b5548 100644
--- a/pkgs/games/snipes/default.nix
+++ b/pkgs/games/snipes/default.nix
@@ -7,7 +7,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "snipes-${version}";
+  pname = "snipes";
   version = "20180930";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 7f9f49f363a8526355a1433db94edc37724eea1a..2ffd3f3d053b9ab02b8bca8b2706cbd0b01402cc 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -2,12 +2,12 @@
 , boost, eigen2, lua, luabind, libGLU_combined, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "soi-${version}";
+  pname = "soi";
   version = "0.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
-    name = "${name}.tar.bz2";
+    name = "${pname}-${version}.tar.bz2";
     sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
   };
 
diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix
index 162db96726993d8fde6cc2265f322c4de1779c1a..2b69dfccad1545918e3ecdb7b10a2481692fce4e 100644
--- a/pkgs/games/space-orbit/default.nix
+++ b/pkgs/games/space-orbit/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "space-orbit-${version}";
+  pname = "space-orbit";
   version = "1.01";
   patchversion = "9";
 
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 1dcf432ccd48495af1c6977381b421e86e1530f1..9bfd917d1aa0c5393a05523829f89486dd5a3988 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "spring-${version}";
+  pname = "spring";
   version = "104.0";
 
   src = fetchurl {
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 8df4450d13d16da333cac037a9516e0f5bcae811..b7c9b691c0433e8bdab5d435e8cc1fe17926a0ba 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,7 +3,7 @@
 , makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
 
 stdenv.mkDerivation rec {
-  name = "springlobby-${version}";
+  pname = "springlobby";
   version = "0.267";
 
   src = fetchurl {
diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix
index 1408b66ab41b16ec34793b2d322f19ffbd51996d..9de9bd37e8dc73e7475e30a3f4aee56133813bea 100644
--- a/pkgs/games/stardust/default.nix
+++ b/pkgs/games/stardust/default.nix
@@ -2,11 +2,11 @@
 , libXi, libXmu, libXext, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "stardust-${version}";
+  pname = "stardust";
   version = "0.1.13";
 
   src = fetchurl {
-    url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz";
+    url = "http://iwar.free.fr/IMG/gz/${pname}-${version}.tar.gz";
     sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp";
   };
 
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 9bbdf0474e1a81b346481cc8bf7f579b18c5b97f..1d1912d97a156bd4ecf06523a905a131b9571ae8 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -5,7 +5,8 @@ let
   version = "1.0.0.61";
 
 in stdenv.mkDerivation rec {
-  name = "steam-original-${version}";
+  pname = "steam-original";
+  inherit version;
 
   src = fetchurl {
     url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix
index 1ea7f0677877bab0b202f511395265faa0b2f685..be865d20f2f4ca1fa4684455d22a529dd1f2eb86 100644
--- a/pkgs/games/steam/steamcmd.nix
+++ b/pkgs/games/steam/steamcmd.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "steamcmd-${version}";
+  pname = "steamcmd";
   version = "20180104"; # According to steamcmd_linux.tar.gz mtime
 
   src = fetchurl {
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 864888741660ad5059870b03a56f9269dd454abb..b29d22dfe736e26c070100726b1e3159d4294f7f 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "stepmania-${version}";
+  pname = "stepmania";
   version = "5.1.0-b2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 13033c7f9f0a373485ebb517c8fb1b3684e838ca..eea92b43b520cbaff0b128202276d155f8d486f1 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -9,7 +9,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "stockfish-${version}";
+  pname = "stockfish";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 3865d8fbef9e8cc9dbf59624deaa31747ba03300..6b3da08b70c7f11de1007fa4ecca273c0d40786a 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -2,7 +2,7 @@
 , makeWrapper, enet, libXcursor, bullet, openal }:
 
 stdenv.mkDerivation rec {
-  name = "stunt-rally-${version}";
+  pname = "stunt-rally";
   version = "2.6.1";
 
   src = fetchurl {
diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix
index cee65bfa5638f7da4a4a3469e940830c66fda7bf..6cfabc4ee6a79027eadccc143b5475b80a98af6d 100644
--- a/pkgs/games/supertux/default.nix
+++ b/pkgs/games/supertux/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "supertux-${version}";
+  pname = "supertux";
   version = "0.6.0";
 
   src = fetchurl {
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 13d296e5961a0d63a0a09a1c5175360bf57337e0..5432824ce6c0327b2dde15416ec007b33c683223 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, file, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name    = "terraria-server-${version}";
+  pname = "terraria-server";
   version = "1.3.5.3";
   urlVersion = lib.replaceChars ["."] [""] version;
 
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 68114bb75652ce6f2c6791f6575e9e1358d277db..9cc3bf7149ffa5f6fdf95c85fc55aebe4c7cf04f 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, qt5, box2d, which, cmake, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "tbe-${version}";
+  pname = "tbe";
   version = "0.9.3.1";
 
   src = fetchgit {
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index 929641cfab54de3882f5c020c11b1f9db1863c1a..b0901fcb9a0f39017bf9366f13b4c980e7d05742 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "the-powder-toy-${version}";
+  pname = "the-powder-toy";
   version = "94.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix
index f230a70c088008577a82137284d6e5273ad87345..fb3ebf36db3b6728a85f25472bb2c5e972a424ac 100644
--- a/pkgs/games/tinyfugue/default.nix
+++ b/pkgs/games/tinyfugue/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "tinyfugue-${version}";
+  pname = "tinyfugue";
   version = "50b8";
   verUrl = "5.0%20beta%208";
 
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 8549a860d8e8fce0edbe428bc52508af6b4a1fab..b5ff38b93a106297d9996fddaa4be4ba89ff2bb3 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "trackballs-${version}";
+  pname = "trackballs";
   version = "1.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix
index 470856af90e697b6fb0e38719aa27e024114355c..802bdb08a87c3e6e48dda5d82aa28bc86cf48309 100644
--- a/pkgs/games/tremulous/default.nix
+++ b/pkgs/games/tremulous/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }:
 stdenv.mkDerivation rec {
-  name = "tremulous-${version}";
+  pname = "tremulous";
   version = "1.1.0";
   src1 = fetchurl {
-    url = "mirror://sourceforge/tremulous/${name}.zip";
+    url = "mirror://sourceforge/tremulous/${pname}-${version}.zip";
     sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7";
   };
   # http://tremulous.net/wiki/Client_versions
diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix
index ddf0782b210d43ad986ae7f1215adfb619a9a175..603fb3ef491b76e1852525c9fefb8bfc3b6981bd 100644
--- a/pkgs/games/tuxpaint/default.nix
+++ b/pkgs/games/tuxpaint/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.22";
-  name = "tuxpaint-${version}";
+  pname = "tuxpaint";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
     sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca";
   };
 
diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix
index fa28dcefa5e0b7fd22bf53d709de4ee6cf6b36f9..a32da556cc90d7d0dc6146582baf7d310dbade1e 100644
--- a/pkgs/games/ue4/default.nix
+++ b/pkgs/games/ue4/default.nix
@@ -18,7 +18,7 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  name = "ue4-${version}";
+  pname = "ue4";
   version = "4.10.2";
   sourceRoot = "UnrealEngine-${version}-release";
   src = requireFile {
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index f3eec52098d01416475bc9976f2dd18d35a9338d..8dd8222e55e44b1bc1db6b6fdfd7d926bddcd75c 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -11,7 +11,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "ultrastardx-${version}";
+  pname = "ultrastardx";
   version = "2017.8.0";
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
index be1b5bd11956d027163fda4d7c26a4b1e86a59b1..ee3890aeea5b15468c6ec0189af6b612ebf09d2f 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/pkgs/games/unnethack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, utillinux, ncurses, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "unnethack-${version}";
+  pname = "unnethack";
   version = "5.2.0";
 
   src = fetchgit {
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index 00592f7c39bb21de6a57dc8ab16e1297cbe88fb9..638900c9e898c4a3a0475ad291785244dc2b5e0a 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -27,7 +27,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "uqm-${version}";
+  pname = "uqm";
   version = "0.7.0";
 
   src = fetchurl {
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 1cd87541b8c302ddaf62c8a2eeffb90d49e22b1d..999799de58d8f1e2801520cb89604fa4683d019c 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }:
 
 stdenv.mkDerivation rec {
-  name = "urbanterror-${version}";
+  pname = "urbanterror";
   version = "4.3.4";
 
   srcs =
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
index 7039ff44a09b06f074707aeba1ad9ec1be0ce7ec..1790f0830638371310e341aaa479538354cd8670 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/pkgs/games/ut2004/demo.nix
@@ -7,7 +7,7 @@ let
     else throw "Unsupported architecture";
 
 in stdenv.mkDerivation rec {
-  name = "ut2004-demo-${version}";
+  pname = "ut2004-demo";
   version = "3334";
 
   src = fetchurl {
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 6c571da561c5a584c027f5907cfe5d7bcdd53bd7..e018dfd664d314ed8e7542c678eb32f28ac03fe1 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -10,7 +10,8 @@
 let
   version = "git";
   bin = stdenv.mkDerivation {
-    name = "vdrift-${version}";
+    pname = "vdrift";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "vdrift";
diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix
index d57559a4d804a934e005efa5760da9e39050e8e6..7f552bdd5d668d2f18bc1afb4dc326fc3805c434 100644
--- a/pkgs/games/vitetris/default.nix
+++ b/pkgs/games/vitetris/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib }:
 
 stdenv.mkDerivation rec {
-  name = "vitetris-${version}";
+  pname = "vitetris";
   version = "0.58.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix
index 91f77277d9ecaf086d87599d27a33c1006a7908e..1d4545f17b14433d30861419f273a2af28d82428 100644
--- a/pkgs/games/vms-empire/default.nix
+++ b/pkgs/games/vms-empire/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
-  name = "vms-empire-${version}";
+  pname = "vms-empire";
   version = "1.14";
 
   src = fetchurl{
-    url = "http://www.catb.org/~esr/vms-empire/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz";
     sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890";
   };
 
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index c1a9a2a7defbbfb58796f842cafac5bf9917c061..9ea9ec7bd12fb50632dd9584c7f9724c2a14ed36 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -2,11 +2,11 @@
 , libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "voxelands-${version}";
+  pname = "voxelands";
   version = "1512.00";
 
   src = fetchurl {
-    url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
+    url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2";
     sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw";
   };
 
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index 04712b3ebff6ad8056cf2d99578b1b0515c40501..a861e3725a2d23eafebe40cf32b96392abeb205f 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "warmux-${version}";
+  pname = "warmux";
   version = "unstable-2017-10-20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 5333dad68798722150096460e6c59341bed5b257..6282658fc15223308d08f8983d320b9d12cd8aa4 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, warsow-engine, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "warsow-${version}";
+  pname = "warsow";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "http://slice.sh/warsow/${name}.tar.gz";
+    url = "http://slice.sh/warsow/${pname}-${version}.tar.gz";
     sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc";
   };
 
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index bf9e1cdd63549c0f811f7bb574c51363c09ae43e..64231b9c39c7c1e59dde1acb4e65a4e1b203e6a2 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -8,10 +8,8 @@ stdenv.mkDerivation rec {
   pname = "wesnoth";
   version = "1.14.7";
 
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
+    url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7";
   };
 
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index daf56b27e5d256e76b00c587c4c6479ff8d35e13..6f3bc2c11959788d43d130f3d413efe6d7fe6e27 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "widelands-${version}";
+  pname = "widelands";
   version = "19";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix
index 028b5f49b66ade06742322196e344d17d0b724fa..dd59ebbedd9467a458ac903589ab9e7c3b8e57a6 100644
--- a/pkgs/games/xjump/default.nix
+++ b/pkgs/games/xjump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }:
 
 stdenv.mkDerivation rec {
-  name = "xjump-${version}";
+  pname = "xjump";
   version = "2.9.3";
   src = fetchFromGitHub {
     owner = "hugomg";
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index a0fc6d5ca7189a5eefb6e652415f3c577198182d..d9bba3fdbdceb04932bc8a38ecd28a28f3717b07 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -3,7 +3,7 @@
 , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmoto-${version}";
+  pname = "xmoto";
   version = "0.5.11";
 
   src = fetchurl {
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix
index cd927a820aaa470436a71bc76f3c00cc2c47ffda..aefc8ad987677b3687825e9499dde89f8316c9f1 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/pkgs/games/xpilot/bloodspilot-client.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.0";
-  name = "bloodspilot-client-${version}";
+  pname = "bloodspilot-client";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix
index 42bcb326316987138a8fcb7ed08958ef53eb6188..2f37680bbaab6b6cc3cf448d3ca1d10a34e9af91 100644
--- a/pkgs/games/xpilot/bloodspilot-server.nix
+++ b/pkgs/games/xpilot/bloodspilot-server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "bloodspilot-xpilot-fxi-server-${version}";
+  pname = "bloodspilot-xpilot-fxi-server";
   version = "1.4.6";
 
   src = fetchurl {
diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
index 2ae25e957bb2a85475b2e84acc820599a2bbd18a..d0fe9f61896eceb421e3583feb48c26e8539674c 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/games/xpilot/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf
 , SDL_image, zlib, libXxf86misc }:
 stdenv.mkDerivation rec {
-  name = "xpilot-ng-${version}";
+  pname = "xpilot-ng";
   version = "4.7.3";
   src = fetchurl {
-    url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/xpilot/xpilot_ng/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj";
   };
   buildInputs = [
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix
index 07ed50d4e7b388eca83a321a09d85c4c732f4428..b3011fbce77ae64843028bb76c139af6528408f9 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/pkgs/games/xsnow/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "1.42";
-  name = "xsnow-${version}";
+  pname = "xsnow";
 
   src = fetchurl {
-    url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz";
+    url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz";
     sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
   };
 
diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index 0aa0c97f07d2fcc4153411742298571c6092ccb8..62cdaccc297503969eb114519d6c9832943dfdb1 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -2,7 +2,6 @@
 , withNethackLevels ? true
 }:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xsok";
   version = "1.02";
 
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index cf08db68cf03c03e40e530ebb65d1222120407a0..3f6062c4f6862bf89b65cb98a4c9dbde58c71d51 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "xsokoban-${version}";
+  pname = "xsokoban";
   version = "3.3c";
 
   src = fetchurl {
-    url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz";
+    url = "https://www.cs.cornell.edu/andru/release/${pname}-${version}.tar.gz";
     sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9";
   };
 
diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix
index 9203389355c7a8dfd690c3130f285292609e52a5..8f5f832058cc17e1faebe3741fbf8554331b4fdb 100644
--- a/pkgs/games/xtris/default.nix
+++ b/pkgs/games/xtris/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, xorg }:
 stdenv.mkDerivation rec {
-  name = "xtris-${version}";
+  pname = "xtris";
   version = "1.15";
 
   src = fetchzip {
diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index a5d9098242bd4d5087937065b2d560238a0572d7..3d5160bb591c826113b43749eb9e0c8c41d709d3 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -6,7 +6,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "fmod-${version}";
+  pname = "fmod";
   version = "4.44.64";
   shortVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index 3d5da2391157c2d5b3d48798f512be6a6cfa3e85..0722e4bbbf9518785bb69a1499791ab1b4088895 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
   pname = "zangband";
   version = "2.7.4b";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${pname}-${version}.tar.gz";
     sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
   };
 
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index d2b94a14fe415edb994ecff83206dd9934aa5eac..f6fde241129b13215fa97ce22f54f80a454f4a44 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -3,7 +3,7 @@
 , libsndfile, mpg123 }:
 
 stdenv.mkDerivation rec {
-  name = "zdoom-${version}";
+  pname = "zdoom";
   majorVersion = "2.8";
   version = "${majorVersion}.1";
 
diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
index fa2cafa298ac99b6e63240f07004ea7891e1945c..430d5269a68e8630769616344cb7014e8d6385ae 100644
--- a/pkgs/games/zdoom/zdbsp.nix
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, unzip, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "zdbsp-${version}";
+  pname = "zdbsp";
   version = "1.19";
 
   src = fetchurl {
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index 6292b8183b28efec2bf1ec3b4e829eb1814c35b8..83bf552b8b78331e96c69deb917cb04e89edc4f3 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "brightnessctl-${version}";
+  pname = "brightnessctl";
   version = "0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index f0be3cad723ca2aa986efa085cf527a731a62dc1..5e7596032b3dc2d472bd7eedceb9f82a0f790a12 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.6";
-  name = "cups-pk-helper-${version}";
+  pname = "cups-pk-helper";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 789aabce04350ed4d4850e22860a4df2acbbae89..b28374ab63575e35d352bd32f597969e8ef36d10 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -9,7 +9,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cups-${version}";
+  pname = "cups";
 
   # After 2.2.6, CUPS requires headers only available in macOS 10.12+
   version = if stdenv.isDarwin then "2.2.6" else "2.2.11";
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 08cc222e4a5b7f7a51029363960ebf46347cb3b7..948e5ed72ab1ee33bc32e51fbe4fe85a0d2ece3f 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib, cups }:
 
 stdenv.mkDerivation rec {
-  name = "brlaser-${version}";
+  pname = "brlaser";
   version = "4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 2634b7128719bb5319ca6e8efcdca3a17d5bf917..abd50850b18277ce38e6ed673eb8e2314927e694 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -2,7 +2,7 @@
 , withDebug ? false }:
 
 stdenv.mkDerivation rec {
-  name = "cnijfilter2-${version}";
+  pname = "cnijfilter2";
 
   version = "5.30";
 
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 27b86ab89198d368f175c9d36c2a35ab850c623a..15e3a1d97a904e7e6ba3dfb473c8b273682e450f 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -7,7 +7,7 @@
    file included in the tarball */
 
 stdenv.mkDerivation rec {
-  name = "cnijfilter-${version}";
+  pname = "cnijfilter";
 
   /* important note about versions: cnijfilter packages seem to use
      versions in a non-standard way.  the version indicates which
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index c8e5ddd09b146a9af457eadbea45ec1485a9cf37..ba8cffc0e654281cc6928ce21aae8450e28b46aa 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -12,7 +12,7 @@ let arch =
     else throw "Unsupported system ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation rec {
-  name = "cnijfilter-${version}";
+  pname = "cnijfilter";
 
   /* important note about versions: cnijfilter packages seem to use
      versions in a non-standard way.  the version indicates which
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index 8abda27a5cf28057141f0a5b6efc0c92843b87c9..c2b912007d88e3e9b4d401841b10530d1cb2637d 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, cups, ... }:
 
 stdenv.mkDerivation rec {
-  name = "cups-dymo-${version}";
+  pname = "cups-dymo";
   version = "1.4.0.5";
 
   # exposed version and 'real' version may differ
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index 83093da9c0aa69a1b8671640fac0294c6738c732..a2fdd1abc1921431f574ce0efdd21c0b8c84c11b 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cups-toshiba-estudio-${version}";
+  pname = "cups-toshiba-estudio";
   version = "7.89";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
index ffcc46d66e3649c9a3da7253cb4d836cbd79b024..23651a57df8c1f191fa9b2f7f34c2547f7b7ebf7 100644
--- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
+++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
@@ -6,7 +6,7 @@ let
          else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 in
 stdenv.mkDerivation rec {
-  name = "fxlinuxprint-${version}";
+  pname = "fxlinuxprint";
   version = "1.1.2-1";
 
   src = fetchzip {
diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
index b3fc87fbf1da9a660416e36e916c26f6b9226161..0dcd518de842124d61cb4ad3dc51f1ebec1b91bd 100644
--- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix
+++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
@@ -14,7 +14,7 @@ let pythonEnv = python2.buildEnv.override {
 };
 
 in stdenv.mkDerivation rec {
-  name    = "cups-googlecloudprint-${version}";
+  pname = "cups-googlecloudprint";
   version = "20160502";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
index 55b0deea97178114efb941149b5ee6cb0b4438e0..90f9a8e943ab3f1897ce61d2b37fc5ddd958f5bf 100644
--- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hll2390dw-cups-${version}";
+  pname = "hll2390dw-cups";
   version = "4.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index 9b40e4ff50e15f3a848cb2fa07249a18c3ddeadf..21a276f9d14265b5c1d97b3d1dea2a861819ebe5 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cups-kyocera-${version}";
+  pname = "cups-kyocera";
   version = "1.1203";
 
   dontPatchELF = true;
diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix
index bcd2914da0cef91a9e778af04261a8cf46bf487b..fa16a136f977943d6199a78e9bee848b9918738d 100644
--- a/pkgs/misc/cups/drivers/kyodialog3/default.nix
+++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix
@@ -15,7 +15,7 @@ let
   debRegion = if region == "EU" then "EU." else "";
 in
 stdenv.mkDerivation rec {
-  name = "cups-kyodialog3-${version}";
+  pname = "cups-kyodialog3";
   version = "8.1601";
 
   dontStrip = true;
diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
index 72a40f41f8852815c5856ab8c0ebf1dcf4c65a51..c7484e6d30b01e3d1dd48741fc928a79ca6d6a41 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mfcj470dwlpr, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "mfcj470dw-cupswrapper-${version}";
+  pname = "mfcj470dw-cupswrapper";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index f31dd9061ec3c1990517cad56a6d99b1cecb72bb..befafd855bcf20bb78dc7d65ab6ef00851ceecdf 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "mfcj470dw-cupswrapper-${version}";
+  pname = "mfcj470dw-cupswrapper";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
index 4b31ccf3877431b68c8ee5d144027b3a7008e18b..4ec9e3fc6c8ebae0863d0fd7f119f737f0ea7e07 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "mfcj6510dw-cupswrapper-${version}";
+  pname = "mfcj6510dw-cupswrapper";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 9d9535ce37b0f85a684dc0fb97abfdae5ddaa0ba..b12ef18e46c411935ddbb1eb4871be228a694612 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -20,7 +20,7 @@
 # The user can run brprintconf_mfcj6510dw in the shell.
 
 stdenv.mkDerivation rec {
-  name = "mfcj6510dwlpr-${version}";
+  pname = "mfcj6510dwlpr";
   version = "3.0.0-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index 8e31cd2956a5b0179e997688a9bef63455e08627..91110104bc96823b1d87fc89bd47ec121a5e327d 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -1,11 +1,11 @@
 { coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2700dnlpr-${version}";
+  pname = "mfcl2700dnlpr";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf102085/${pname}-${version}.i386.deb";
     sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
index 2099291d434ba1b581fc3247f1235167579c42fb..b58e7b4faa447bc38e42cd6ebe30d26b022b68f4 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2720dwcupswrapper-${version}";
+  pname = "mfcl2720dwcupswrapper";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101802/${pname}-${version}.i386.deb";
     sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
index 8dbc56fe846dee24b7fdf7c744bbd0b079365bd9..b4b16563610a3ac4b75a658e0c74592130b47ad3 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
@@ -1,11 +1,11 @@
 { pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2720dwlpr-${version}";
+  pname = "mfcl2720dwlpr";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101801/${pname}-${version}.i386.deb";
     sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
index 0da85498723f2543f4198002411d2308090f239f..f2303a45a2f37933a78d024788eb7771344b7818 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2740dwcupswrapper-${version}";
+  pname = "mfcl2740dwcupswrapper";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101726/${pname}-${version}.i386.deb";
     sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
index 6d3cf18e5296e7191f7bf8a851d3a9312e69a419..c2209806724adf962e15f48fba7b6593ee548c8e 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
@@ -1,11 +1,11 @@
 { pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2740dwlpr-${version}";
+  pname = "mfcl2740dwlpr";
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb";
     sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
index 17040498acc0f899eae7d3619ca8c63fa57c1874..50f3b583e42f731f7eaeaa9a86d8b5a74774a014 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
@@ -2,11 +2,11 @@
 mfcl8690cdwlpr, perl, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "mfcl8690cdwcupswrapper-${version}";
+  pname = "mfcl8690cdwcupswrapper";
   version = "1.4.0-0";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb";
+    url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb";
     sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
index a521b3ea0218372f195cdc205ba2fd1405d774e5..0e088401c0a0c51e26e9285cf97c3869c91f56c3 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
@@ -2,11 +2,11 @@
 makeWrapper, perl, pkgs, stdenv, which }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl8690cdwlpr-${version}";
+  pname = "mfcl8690cdwlpr";
   version = "1.3.0-0";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb";
+    url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb";
     sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v";
   };
 
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index b395d73a26694b71ce96d50c9fb4e7b54b39daaa..8c906db642e18fb102b79c5e69ff93de1f77e123 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
@@ -7,7 +7,7 @@ let
       else "i386";
 
 in stdenv.mkDerivation rec {
-  name = "samsung-unified-linux-driver-${version}";
+  pname = "samsung-unified-linux-driver";
   version = "1.00.36";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
index b2c4bbb0f2037277334b757ad9e50030daf4a04b..9135441a6e7dd2f23efccd16b836698f5d51da91 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
@@ -7,7 +7,7 @@ let
       else "i386";
 
 in stdenv.mkDerivation rec {
-  name = "samsung-unified-linux-driver-${version}";
+  pname = "samsung-unified-linux-driver";
   version = "1.00.37";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index df0a270a5b2bad66ae715659de4efcb27d3f85ac..5dc3979307066daa6b1861f2a631ed444d87c777 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -18,7 +18,7 @@
 let
   cups' = stdenv.lib.getLib cups;
 in stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
+  pname = "samsung-UnifiedLinuxDriver";
   version = "4.00.39";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index 547e25b6514e4d271c040e197d47e7651ed7a8ed..f81fa27503fd09f39b852ee8238888d0afd77b88 100644
--- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
@@ -20,7 +20,7 @@ let
   appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
   libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
 in stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
+  pname = "samsung-UnifiedLinuxDriver";
   version = "4.01.17";
 
   src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix
index 9321cf526bee6fac2f9ffa611a1b16b26726157f..b70b5daa7662bcc6a69864ca0676dc81f1c200c6 100644
--- a/pkgs/misc/cups/drivers/zj-58/default.nix
+++ b/pkgs/misc/cups/drivers/zj-58/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "cups-zj-58";
   version = "2018-02-22";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "klirichek";
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 2a0a4369860a2ae3b872c7355af8b57dd0f4af34..927755fdb74330ba04183b6370acbf4a6e9f6981 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -8,11 +8,11 @@ let
   binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
 
 in stdenv.mkDerivation rec {
-  name = "cups-filters-${version}";
+  pname = "cups-filters";
   version = "1.25.0";
 
   src = fetchurl {
-    url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
+    url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
     sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
   };
 
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index d865a8906cfba696480e4f1b69e6c47b84fa0c03..a232552712d622d641aaab2e60621ef16c5bc8e5 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -200,7 +200,7 @@ let fwdir = symlinkJoin {
 };
 in
 let iscan-data = stdenv.mkDerivation rec {
-  name = "iscan-data-${version}";
+  pname = "iscan-data";
   version = "1.39.0-1";
 
   src = fetchurl {
@@ -216,7 +216,7 @@ let iscan-data = stdenv.mkDerivation rec {
 };
 in
 stdenv.mkDerivation rec {
-  name = "iscan-${version}";
+  pname = "iscan";
   version = "2.30.3-1";
 
   src = fetchurl {
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix
index c61bfb806c59d0c9c2b1ee720cc09e886246463d..0fa637e040e2416571278c5a99ff0f1103700526 100644
--- a/pkgs/misc/drivers/epson-201106w/default.nix
+++ b/pkgs/misc/drivers/epson-201106w/default.nix
@@ -6,7 +6,8 @@ let
 in
   stdenv.mkDerivation {
 
-    name = "epson-201106w-${version}";
+    pname = "epson-201106w";
+    inherit version;
 
     src = fetchurl {
       url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm";
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix
index 1dac6034fdab9c2924d142032e91833bcbd6729e..fe52b104a5289b8a11b0c631dbefe62a15d0c4d3 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/pkgs/misc/drivers/epson-alc1100/default.nix
@@ -9,7 +9,8 @@ let
   };
 in
   stdenv.mkDerivation {
-    name = "epson-alc1100-${version}";
+    pname = "epson-alc1100";
+    inherit version;
 
     src = fetchurl {
       url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz";
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index ce95ca00e110e76b2d05236522f30014ec214e6f..c65c13e886ffd2bab292a8e37b6cf8900eacf494 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cups }:
 
 stdenv.mkDerivation rec {
-  name = "epson-escpr-${version}";
+  pname = "epson-escpr";
   version = "1.6.16";
 
   src = fetchurl {
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 9ce6f5d7b010ef0d39970a6e705675be20104e0e..2110de6e4c1187d9932ac44211ccba5d9de73a99 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cups, busybox }:
 
 stdenv.mkDerivation rec {
-  name = "epson-inkjet-printer-escpr2-${version}";
+  pname = "epson-inkjet-printer-escpr2";
   version = "1.0.29";
 
   src = fetchurl {
-    url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm";
+    url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm";
     sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5";
   };
 
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   unpackPhase = ''
     rpm2cpio $src | cpio -idmv
 
-    tar xvf ${name}-1lsb3.2.tar.gz
-    cd ${name}
+    tar xvf ${pname}-${version}-1lsb3.2.tar.gz
+    cd ${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix
index 2a92f8a59d91c3b0fdbfd536a671a10a6e44be41..9da1a8269ab11c58bbd650b1859dd3ccea1b693d 100644
--- a/pkgs/misc/drivers/epson_201207w/default.nix
+++ b/pkgs/misc/drivers/epson_201207w/default.nix
@@ -5,7 +5,8 @@ let
 in
   stdenv.mkDerivation {
 
-    name = "epson_201207w-${version}";
+    pname = "epson_201207w";
+    inherit version;
 
     src = fetchurl {
       url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm";
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index 31b13baf7964da1251b7c2880a1290d6315baaed..fb6b4956ef1725d0bf438b2d30f738126bde30f6 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, udev }:
 
 stdenv.mkDerivation rec {
-  name = "moltengamepad-git-${version}";
+  pname = "moltengamepad-git";
   version = "2016-05-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index a7d5710a2793c4dbbdfcfe39810c7415afc4613a..cd322bf8fdb70e260b27fd59c87f5f71d18449ee 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -3,7 +3,8 @@ let
   version = "20160218";
 in
 stdenv.mkDerivation {
-  name = "postscript-lexmark-${version}";
+  pname = "postscript-lexmark";
+  inherit version;
 
   src = fetchurl {
     url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index d44c90d198a91e21804320b207b2c28d5ed93f38..366535b51c65a2f620d744b56111218cd1636c6b 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -5,7 +5,7 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "steamcontroller-${version}";
+  pname = "steamcontroller";
   version = "2017-08-11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 35a9bd2e384428b1aaec451a01df5a7e0a7f458f..be199936426c907cbd2d33bce25b72113a8268fc 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -17,7 +17,8 @@ in
       url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
       sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp";
     };
-    name = "sundtek-${version}";
+    pname = "sundtek";
+    inherit version;
 
     phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index c942ec59f37e96d8d6dc6a01f7cf1bf3593e49f5..1ed279d2998b4ca591662319f551c965b2ee2ace 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -4,7 +4,8 @@
 let
   version = "0.8.8";
 in stdenv.mkDerivation {
-  name = "xboxdrv-${version}";
+  pname = "xboxdrv";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz";
diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix
index 36f6ca5b8c0cd3c364633236d5abeaf37f9510d3..829367aa32993c04c0659af70c89965b33ce5046 100644
--- a/pkgs/misc/dumb/default.nix
+++ b/pkgs/misc/dumb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, allegro, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "dumb-${version}";
+  pname = "dumb";
   version = "2.0.3";
   enableParallelBuilding = true;
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 5a37b1b32c5be39661596465461fba4c78f0620a..2e6ccd0a491895be76697c0d4bca70e0af90eec5 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
-  name = "atari++-${version}";
+  pname = "atari++";
   version = "1.81";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 4806c7f9e0f1b82a58d2565d18c3fb39771b26b0..228da687094785db7b14d3479da8db6dfe8be8b6 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -3,11 +3,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
-  name = "atari800-${version}";
+  pname = "atari800";
   version = "4.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz";
     sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88";
   };
 
diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix
index 601503dc07ec99faae67f0f20b353a8c8db4d579..a725d9c9b086bde2771ba7bb42f1450b5f7b375c 100644
--- a/pkgs/misc/emulators/attract-mode/default.nix
+++ b/pkgs/misc/emulators/attract-mode/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "attract-mode-${version}";
+  pname = "attract-mode";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
index 666f953f6b570d7e0a54e6de3838c5027d9a9d00..88e8556ec6c3f154b71377c16de751d048113ec1 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -3,7 +3,7 @@
 let
   vasm =
     stdenv.mkDerivation rec {
-      name = "vasm-${version}";
+      pname = "vasm";
       version = "1.8c";
       src = fetchFromGitHub {
         owner = "mbitsnbites";
@@ -19,7 +19,7 @@ let
     };
 in
 stdenv.mkDerivation rec {
-  name = "blastem-${version}";
+  pname = "blastem";
   version = "0.5.1";
   src = fetchurl {
     url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";
diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix
index a560ecd0a21d1e326b7acfb9f1dc8daed09ebf76..13cd21391f1138620a75d5e093c5ceea6ffd83da 100644
--- a/pkgs/misc/emulators/ccemux/default.nix
+++ b/pkgs/misc/emulators/ccemux/default.nix
@@ -34,7 +34,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ccemux-${version}";
+  pname = "ccemux";
+  inherit version;
 
   src = jar;
   dontUnpack = true;
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 33c5d3cebf1422f98eb5259349fb370590fc67ce..71beaf125481737c78bbab130ca30cbba7cc3666 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
-  name = "vhba-${version}";
+  pname = "vhba";
   version = "20190410";
 
   src  = fetchurl {
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index 3e8f78c4411505782605f126499f5fa5e30c4e1e..efa1a881f4ab864a48c827ee02f2f921645d1cc9 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
 
 stdenv.mkDerivation rec { 
-  name = "citra-${version}";
+  pname = "citra";
   version = "2019-05-25";
 
   # Submodules
diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix
index 70e7351e295c3056d8daca14d482c8a7f0007d13..bdec34e396f7a85ef5cad5f5c7648a76a5a79a9f 100644
--- a/pkgs/misc/emulators/darcnes/default.nix
+++ b/pkgs/misc/emulators/darcnes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
 
 stdenv.mkDerivation rec {
-  name = "darcnes-${version}";
+  pname = "darcnes";
   version = "9b0401";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index d177012546e9c3445e139c99fc7bc3fdcbcb1431..6bb5be3c71371aeab2189355073facb75da52db0 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -10,11 +10,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "desmume-${version}";
+  pname = "desmume";
   version = "0.9.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz";
     sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
   };
 
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index a14f18da4669b9f11bcf5e5a0f52b1447295afd6..813730d435d0395306dc9a9e6adbda4acd18120e 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -5,7 +5,7 @@
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-${version}";
+  pname = "dolphin-emu";
   version = "5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index ab8ec6868cf2340324c75c6f908960333ec4ffb3..e96b2e07890e8965f32a37346e00a882124a9f6c 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,7 +20,7 @@ let
     startupNotify = "false";
   };
 in stdenv.mkDerivation rec {
-  name = "dolphin-emu-${version}";
+  pname = "dolphin-emu";
   version = "5.0-10879";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 9dec1ecacae0c8801188a94810574e4d25bef9b4..7312ad41ada50c860c5aa201b109ded91068131c 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -2,7 +2,7 @@
 , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "emulationstation-${version}";
+  pname = "emulationstation";
   version = "2.0.1a";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index edf4fe017a2e92f9325bbc16caf308ff7ce86bfd..6950e12e889a2c3dd37869a61c7acdf5c6a75187 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "epsxe-${version}";
+  pname = "epsxe";
   version = "2.0.5";
 
   src = let
diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix
index 882bf13f4eaf8845b2dea0b546dc213b13b62190..079af05e794d4885a88a72610d8d477e863abadb 100644
--- a/pkgs/misc/emulators/firebird-emu/default.nix
+++ b/pkgs/misc/emulators/firebird-emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
 
 stdenv.mkDerivation rec {
-  name = "firebird-emu-${version}";
+  pname = "firebird-emu";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 9856c93eda2dc8d616c15f3cf891b1f2101359ce..7e1272faf11bfce7a214a02703aff19bb69286a8 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "fs-uae-${version}";
+  pname = "fs-uae";
   version = "2.8.4";
 
   src = fetchurl {
-    url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
+    url = "https://fs-uae.net/fs-uae/stable/${version}/${pname}-${version}.tar.gz";
     sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj";
   };
 
diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix
index ea2d6bbfecc8478defe8feb7eded489bd9665dae..04c5b441f013c94a08c0dcf4071155eb13cdb4f4 100644
--- a/pkgs/misc/emulators/gxemul/default.nix
+++ b/pkgs/misc/emulators/gxemul/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gxemul-${version}";
+  pname = "gxemul";
   version = "0.6.0.1";
 
   src = fetchurl {
-    url = "http://gxemul.sourceforge.net/src/${name}.tar.gz";
+    url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz";
     sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407";
   };
 
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin;
-    mkdir -p $out/share/${name};
+    mkdir -p $out/share/${pname}-${version};
     cp gxemul $out/bin;
-    cp -r doc $out/share/${name};
-    cp -r demos $out/share/${name};
+    cp -r doc $out/share/${pname}-${version};
+    cp -r demos $out/share/${pname}-${version};
     cp -r ./man $out/;
   '';
 
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 1349fa0f0b6ff2a1109500a4232b6f9f3745529e..ad96ca36bc163e3693ba1bb69d1b0f69e935222d 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -10,7 +10,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "higan-${version}";
+  pname = "higan";
   version = "106";
   sourceName = "higan_v${version}-source";
 
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index 32d3013d842c39b28f8f8c112ae0d3f344797602..c2494d702708cb447a4439a2dab2b2b7aa8b146e 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -4,7 +4,7 @@ let
   libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
 
 in stdenv.mkDerivation rec {
-  name = "kega-fusion-${version}";
+  pname = "kega-fusion";
   version = "3.63x";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index 32201c48ee98873034cae02b73a5c4804cf7bd14..edb70ba726481fd6153c71ab7a3f6ea5b530816c 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libdsk-${version}";
+  pname = "libdsk";
   version = "1.5.10";
 
   src = fetchurl {
-    url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz";
+    url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz";
     sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g";
   };
 
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 9101c1587c2572723c603e0d8598aaa86af2f725..74c456cfb1051577cd9af36498db17406468dea4 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -2,11 +2,11 @@
 , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "mednafen-${version}";
+  pname = "mednafen";
   version = "0.9.48";
 
   src = fetchurl {
-    url = "https://mednafen.github.io/releases/files/${name}.tar.xz";
+    url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
     sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k";
   };
 
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 75eeeea4c008b04f0bf2bc66ce8eee437500b2ba..146d532026143fdd0286dc71cccbfc1c7cb2676e 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mednafen-server-${version}";
+  pname = "mednafen-server";
   version = "0.5.2";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index c62d9c90ca794489f808d78de4026a0f002a4e55..40390068e7be62cf2eabea9557a29dddd059bb94 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "mednaffe-${version}";
+  pname = "mednaffe";
   version = "0.8.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 039bc57e60312850c436c047984e987952b7bb54..6dc7bc30f322940b305502881c37e5bc348f1080 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -14,7 +14,7 @@ let
     startupNotify = "false";
   };
 in stdenv.mkDerivation rec {
-  name = "mgba-${version}";
+  pname = "mgba";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 9ff99110eccfafbce71074ca8699a23991a70c22..460dd7ad5fb52b41022e2e0ccc214fd4ad71858a 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "mupen64plus-${version}";
+  pname = "mupen64plus";
   version = "2.5";
 
   src = fetchurl {
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 5bc7bcec9d41f15f207c630b3f5a55b00f6768ab..6bef474d7ea4ea234d89b1c29db3927ab0d426c4 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.47";
-  name = "nestopia-${version}";
+  pname = "nestopia";
 
   src = fetchFromGitHub {
     owner = "rdanbrook";
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index d2539cbc81717cb54b8ff55a0d2ef76fb1e70d62..8a95d6f28837e855ac244c0ec5ea009d754b3af4 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "openmsx-${version}";
+  pname = "openmsx";
   version = "git-2017-11-02";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 851c05c0578bb1a2a55cd09fc051b157d81a6a37..1924452e2abe9369edb53cd2b96791bda8bfb58a 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -3,7 +3,7 @@
 , wxGTK30, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "pcsx2-${version}";
+  pname = "pcsx2";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index 5af3042bde4dc446950bbeccbce1f3429635fefc..8f1e5e02c186f949a7130fe1739284e7f4919924 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "pcsxr-${version}";
+  pname = "pcsxr";
   version = "1.9.94";
 
   # codeplex does not support direct downloading
@@ -67,14 +67,14 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    mkdir -p "$out/share/doc/${name}"
+    mkdir -p "$out/share/doc/${pname}-${version}"
     cp README \
        AUTHORS \
        doc/keys.txt \
        doc/tweaks.txt \
        ChangeLog.df \
        ChangeLog \
-       "$out/share/doc/${name}"
+       "$out/share/doc/${pname}-${version}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 159eefad66625e32fdb643a91fca0226c0c6cf72..619938ba5c649e708b9e8e9c43b46674b942fa75 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null);
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "ppsspp-${version}";
+  pname = "ppsspp";
   version = "1.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 65cc0bd9c05a761c9a24f6c3122d99a87568cb88..ca8d87b380055333e533c000eb93506b444c15c6 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -8,11 +8,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qmc2-${version}";
+  pname = "qmc2";
   version = "0.195";
 
   src = fetchurl {
-      url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz";
+      url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
       sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
   };
   
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index ee7ff114ec8f4e3604fc3603955abba423036700..f26769cd28ddaa12062a0027a92b7338c183cd9d 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -26,7 +26,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "retroarch-bare-${version}";
+  pname = "retroarch-bare";
   version = "1.7.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index 1072a66e0eac7c470d0abba7baa5ede347c48861..8bdc79f2d8ec9fa100d02e1955fe7548319dda9a 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "kodi-retroarch-advanced-launchers-${version}";
+  pname = "kodi-retroarch-advanced-launchers";
   version = "0.2";
 
   dontBuild = true;
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index 2537669bbc4236ba7d72afb16a32877106ddedab..25af4f8d50a706f6d985408627f1008019b5030b 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "retrofe-${version}";
+  pname = "retrofe";
   version = "0.6.169";
 
   src = fetchhg {
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 4c44377c11e62b09648d40786993c767ef0615cc..ae1b1bf6bda24cfd1d919d04a406d31574fb9733 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -10,7 +10,7 @@ let
   gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
 in
 stdenv.mkDerivation rec {
-  name = "rpcs3-${version}";
+  pname = "rpcs3";
   version = "${majorVersion}-${gitVersion}";
 
   src = fetchgit {
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index a58f95875ccf09a5829ff0285d3642f107556bdb..0ae92121cab1c0c054d5768d3ba8dc4e807bd5e2 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -2,7 +2,7 @@
 , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
 
 stdenv.mkDerivation rec {
-  name = "snes9x-gtk-${version}";
+  pname = "snes9x-gtk";
   version = "1.57";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 41ba5a3b2e612e0bbd8979afa60b1ec3a484ebe6..c2d98cda060d28fcfe41229a47cf93be35928b49 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "stella-${version}";
+  pname = "stella";
   version = "4.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz";
+    url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz";
     sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index c8712d208590edfb8b990b1e0bfdfdb9a5a40a0f..4df9086a317fc52318e9ce64d524ebdc1b848362 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "visualboyadvance-m-${version}";
+  pname = "visualboyadvance-m";
   version = "2.1.3";
   src = fetchFromGitHub {
     owner = "visualboyadvance-m";
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index a2d462fd990e88986e31c2c43bd47df229ad5095..ed8652d08f1b575686357312ae449760c370998b 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -2,11 +2,11 @@
 , freeglut ? null, openal ? null, SDL2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "yabause-${version}";
+  pname = "yabause";
   version = "0.9.15";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
   };
 
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 446aac629829d50e760ab227df631dbbb2a3ff50..5b80a55362594e0e4fa7ef9e6d3056da514eac9b 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -36,10 +36,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "ghostscript-${version}";
+  pname = "ghostscript";
+  inherit version;
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz";
     inherit sha512;
   };
 
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index 991be274ecc997d55bcdbcbcdd6e379f562b41b0..0f2abedd3b534e44c9266dce0fae162c711f0ef6 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -65,7 +65,7 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled";
 
 
 stdenv.mkDerivation rec {
-  name = "gnash-${version}";
+  pname = "gnash";
   version = "0.8.11-2019-30-01";
 
   src = fetchgit {
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 8c9838ccec539c2f0ca8d14cc41e10a74126f002..cb487677881ac710db97c3593fcfc5bc5445bb4f 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -14,7 +14,7 @@ let
   optCelt = shouldUsePkg celt;
 in
 stdenv.mkDerivation rec {
-  name = "jack1-${version}";
+  pname = "jack1";
   version = "0.125.0";
 
   src = fetchurl {
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
index 7f355bc81560c09514e064b00b8af799dd59a5c0..0c3370814bc35ef2b6f6d628c4d63cb1fe2f5869 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libcardiacarrest-${version}";
+  pname = "libcardiacarrest";
   version = "12.2.8"; # <PA API version>.<version>
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix
index 1a064e8c627d45d6afab71e9c269457498dd5b4c..5af75be690cbb1233fd31a67553f4d68ba9e5849 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/pkgs/misc/long-shebang/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl }: let
   version = "1.2.0";
 in stdenv.mkDerivation {
-  name = "long-shebang-${version}";
+  pname = "long-shebang";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz";
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix
index d977d822351e01d8c943d519b3458800d11552e0..06a6a7e655057e6b63c4213408677e6bd75057fd 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/pkgs/misc/mnemonicode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mnemonicode-${version}";
+  pname = "mnemonicode";
   version = "2015-11-30";
   src = fetchFromGitHub {
     owner = "singpolyma";
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index fe9e8d3f4b007aef127fd95e03410670d44f5ef3..d701bd654d2122aa73bbe31950d053c6e9061b65 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec{
   version="1.28";
-  name = "mxt-app-${version}";
+  pname = "mxt-app";
 
   src = fetchFromGitHub {
     owner = "atmel-maxtouch";
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix
index 25441a30d86b2302bf02859a663495d032d6ac27..eefd83c72600f46bc4b2dcaf7aac91b726f1b24c 100644
--- a/pkgs/misc/sailsd/default.nix
+++ b/pkgs/misc/sailsd/default.nix
@@ -10,7 +10,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "0.2.0";
-  name = "sailsd-${version}";
+  pname = "sailsd";
   src = fetchFromGitHub {
     owner = "sails-simulator";
     repo = "sailsd";
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix
index cd5db3067f41b3ae617269410350e87d4f890919..d25f253bd0059db688cfd92b32a9f93c6e105648 100644
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/pkgs/misc/screensavers/betterlockscreen/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "betterlockscreen-${version}";
+  pname = "betterlockscreen";
   version = "3.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 6b28c39f767990b7ec4ac997c5f643f5dcc872be..b1c2ec5c3bda4c4509e97a7756e46d4345659b3a 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -3,7 +3,6 @@
 , glee }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "electricsheep";
   version = "2.7b33-2017-10-20";
 
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index b3c48cb4024948e703d51932d29f0569a71bad15..ae61291b087913984f1f0ac382df1a666be97de8 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -1,7 +1,7 @@
 { stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-pixeled-${version}";
+  pname = "i3lock-pixeled";
   version = "1.2.1";
 
   src = fetchFromGitLab {
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 9855e86888676a9f360a88a6bcbbe0c296fc5407..5cfddaaea571c550ba5860277a90445afd953bba 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "11-dev";
-  name = "physlock-${version}";
+  pname = "physlock";
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "physlock";
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 404346bba6313ed0d53a88829e666237e4e23de7..fb80f9922ce9028442388294efd0fd109b75ef78 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgs }:
 
 stdenv.mkDerivation rec {
-  name = "pipes-${version}";
+  pname = "pipes";
   version = "1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index e8b9346a8727371c5eb55388b050959167580974..7f6d99297ab169beb7d1838d1f8a7959b604cd60 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.1";
-  name = "rss-glx-${version}";
+  pname = "rss-glx";
 
   src = fetchurl {
     url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2";
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
index b6f82cd45d7c7e9975667205c1ea176625e17eb8..4d4e1c1fc418abf56e6e27b5c74fb2f35495b0b3 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xautolock-${version}";
+  pname = "xautolock";
   version = "2.2-7-ga23dd5c";
 
   # This repository contains xautolock-2.2 plus various useful patches that
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index d68ac0f9fc198e06667977b87713117f8837e29d..1dcf16585f0b12f3fdc302020815f5f89f6ec305 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7.0.2";
-  name = "seafile-shared-${version}";
+  pname = "seafile-shared";
 
   src = fetchFromGitHub {
     owner = "haiwen";
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix
index 2556e7d9d837cd62cc66dde4ce13d58fd87c5718..1993b4bcce405d1420150cd99e12f26f3e874d4d 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/pkgs/misc/sndio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "sndio-${version}";
+  pname = "sndio";
   version = "1.6.0";
   enableParallelBuilding = true;
   buildInputs = [ alsaLib ];
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index 6db3b44b68662fc7d818bd2a228d7851d712805c..f61c9f5e1b9bea6de9de2c420ff19586082c9863 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "sound-of-sorting-${version}";
+  pname = "sound-of-sorting";
   version = "unstable-2015-07-21";
 
   src = fetchgit {
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
index ec8ef076c2fce07c9f882fd44897a834b11809e1..b5dc7a13f1838220d00283bf43224782169b18dc 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/pkgs/misc/stabber/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "stabber-unstable-${version}";
+  pname = "stabber-unstable";
   version = "2016-11-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix
index 875973c9d3f5c63392dbfb2fbbb156de7731b468..a7624d2889bba31d7f4b7a78575515c70eddf178 100644
--- a/pkgs/misc/themes/adapta-kde/default.nix
+++ b/pkgs/misc/themes/adapta-kde/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "adapta-kde-theme-${version}";
+  pname = "adapta-kde-theme";
   version = "20180512";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 6d2a16cbfd237190e60a03b19ffad1a1ab7048e7..5fd8f1a594ea0f2cebab569d9d848c732ad5c319 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "adapta-gtk-theme-${version}";
+  pname = "adapta-gtk-theme";
   version = "3.95.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
index 14fe0f21d80ee548962f406e2674c5dd9e1454ba..870b348cc32065bd3134c9ea84f5a10b6d9d0c93 100644
--- a/pkgs/misc/themes/albatross/default.nix
+++ b/pkgs/misc/themes/albatross/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "Albatross-${version}";
+  pname = "Albatross";
   version = "1.7.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
index 42ff954a46ba8fd71989f529f71c07d0209257c0..054cd1aeffc3c56f18485489caac426072f67958 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/pkgs/misc/themes/arc-kde/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "arc-kde-theme-${version}";
+  pname = "arc-kde-theme";
   version = "2017-11-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 4b7702ed6359b2da41771c77c0ff5e2fbc46915c..3a0636a658af58161efe59e60e51ff3607ca6c27 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "Blackbird";
   version = "2017-12-13";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = "${pname}";
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix
index daeb7d7ad36d00d3b864f93cc2dbc731e3d0671a..04929a4cb4d183cbf84838b062d898765e79c074 100644
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ b/pkgs/misc/themes/clearlooks-phenix/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7.0.1";
-  name = "clearlooks-phenix-${version}";
+  pname = "clearlooks-phenix";
 
   src = fetchurl {
     url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz";
diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index f0bb2bf729dc8d37e926937cd71ab92179f13071..9cdefb9bb54b9d23e5b22e800ef24ee65b56d4b5 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "e17gtk-${version}";
+  pname = "e17gtk";
   version = "3.22.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
index bc4b57e8b58e435bfb8fb3f5d9fdd08d61ed936c..1a4241be86547b7f49fa420aadeebd96201c0b3a 100644
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ b/pkgs/misc/themes/equilux-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
 
 stdenv.mkDerivation rec {
-  name = "equilux-theme-${version}";
+  pname = "equilux-theme";
   version = "20181029";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix
index e6096ef829d010c7b4968f14953de3c642ab4eb5..ebeb7f2d8665373081d18e1bc9c2ecf6ad6f4287 100644
--- a/pkgs/misc/themes/jade1/default.nix
+++ b/pkgs/misc/themes/jade1/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "theme-jade1-${version}";
+  pname = "theme-jade1";
   version = "3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
index 8adf6a1e4330f41601dd4b9860826b3ce3ce3b4b..fac8c38eecaee241210e4896cc536ae89a5f498b 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/pkgs/misc/themes/kde2/default.nix
@@ -5,7 +5,8 @@
 let
   version = "2017-03-15";
 in mkDerivation rec {
-  name = "kde2-decoration-${version}";
+  pname = "kde2-decoration";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "repos-holder";
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
index 97a018f929e32384dd5f6e165095f2a7c4615ca5..4fd06fae61bc0018405adeb2922f84118a994281 100644
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ b/pkgs/misc/themes/numix-solarized/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20170810";
-  name = "numix-solarized-gtk-theme-${version}";
+  pname = "numix-solarized-gtk-theme";
 
   src = fetchFromGitHub {
     owner = "Ferdi265";
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
index 9001ad9e5a3afa6dfb975944de61a2000aa874c0..dfa788f6ea7bcea4257e453637ecb87996450bf8 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2017-04-24";
-  name = "numix-sx-gtk-theme-${version}";
+  pname = "numix-sx-gtk-theme";
 
   src = fetchurl {
     url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz";
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index eb4b8c76301b5476679d4277e039464ff34a4b80..e01f8174e9ea3ef8cdb673097e3b516106ad08a0 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.7";
-  name = "numix-gtk-theme-${version}";
+  pname = "numix-gtk-theme";
 
   src = fetchFromGitHub {
     repo = "numix-gtk-theme";
diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
index 5e4f8ffa3d46718a7a86429a167a08115a0fc862..64ead2f75f4b602f01368e07d6ffc9450de796d3 100644
--- a/pkgs/misc/themes/onestepback/default.nix
+++ b/pkgs/misc/themes/onestepback/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "onestepback-${version}";
+  pname = "onestepback";
   version = "0.991";
 
   srcs = [
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 8bcb48812a3e56652b4d3d30499d054fe4e1b52b..2f7a53dc2d431f37f980ffdf730b9f0bdb47ff20 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-08-16";
-  name = "paper-gtk-theme-${version}";
+  pname = "paper-gtk-theme";
 
   src = fetchFromGitHub {
     owner = "snwh";
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index 348b4ae4eb94a4e1787a9c567c78e605c6344c77..0071e386e88c20f257d900fd066493905affbc55 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -8,7 +8,8 @@
 let
   version = "1.9";
 in mkDerivation {
-  name = "qtcurve-${version}";
+  pname = "qtcurve";
+  inherit version;
   src = fetchurl {
     url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
     sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
index 55cd6e1dac049190996ff6a8ea89a68b4e366002..3d9403b84f462d8fe6ae6388fddb386d46096d58 100644
--- a/pkgs/misc/themes/solarc/default.nix
+++ b/pkgs/misc/themes/solarc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "solarc-gtk-theme-${version}";
+  pname = "solarc-gtk-theme";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 06d42da79362897aee5fbc4db0cf44bc4432f9d9..81c681f537157da675d3b54ac83fc56c39673a48 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "theme-vertex";
   version = "20170128";
 
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index e10fa1b06b78f6a8025dede4001173a131d14137..a0b6be3a418c10340a53b0f70b7f71f11adc655e 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "urbit-${version}";
+  pname = "urbit";
   version = "0.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index c8cda8482bf1f75bba3a82be624c6d9cfc486206..a841acdca94edb00f952821fa1ee04bf8e64991d 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXext, libXt, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "xosd-${version}";
+  pname = "xosd";
   version = "2.2.14";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libxosd/${name}.tar.gz";
+    url = "mirror://sourceforge/libxosd/${pname}-${version}.tar.gz";
     sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg";
   };
 
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 4d33fc0f3f88c860d231759fca67a5c6bb8c7923..ba5002c8c48f73e031fd0f81e4f48ebdcdd2a274 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -4,7 +4,7 @@ let
   # sadly needs to be exported because security_tool needs it
   sdk = stdenv.mkDerivation rec {
     version = "10.12";
-    name    = "MacOS_SDK-${version}";
+    pname = "MacOS_SDK";
 
     # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
     #  1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
index 28dcbdcb4a2a3582d1921a6befff5882c5e89585..6a0c819a0a31a43ba0caca86df720b6df3282790 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "551.1";
-  name    = "objc4-${version}";
+  pname = "objc4";
 
   src = fetchapplesource {
     inherit version;
diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix
index 9dd1205c114697732c39a3d0bb067dcb45bf8f3d..12b358126512d5fecd4c82ec7e4f8757d5407abc 100644
--- a/pkgs/os-specific/darwin/chunkwm/default.nix
+++ b/pkgs/os-specific/darwin/chunkwm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }:
 
 stdenv.mkDerivation rec {
-  name = "chunkwm-${version}";
+  pname = "chunkwm";
   version = "0.4.9";
   src = fetchzip {
     url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz";
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index a9051fd1279f95d07aa00c9fe06e629e30ea96c9..5c63b8e0dfb35ac93998cd944c854581c169adb8 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "duti";
-  name = "${pname}-${version}";
   version = "1.5.4pre";
   src = fetchFromGitHub {
     owner = "moretension";
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 190c0ae2213187b534e4d7f503c28aa43357cef3..e374bd2f11c61313e9d93b3b4946adb307795517 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "goku-${version}";
+  pname = "goku";
   version = "0.1.11";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index 3ff03aace4eebdeb5764e07650a6afa4574e284a..be8554983074c10c2440b808e21b33c52c0d56af 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "iproute2mac-${version}";
+  pname = "iproute2mac";
 
   src = fetchFromGitHub {
     owner = "brona";
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index fb7bb12a493fca3d38526dce68f8273f53198e28..90f92b0b6443639e8c5b5d69ad2bb2e71d36d3da 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name = "khd-${version}";
+  pname = "khd";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix
index 3076392ecb26612515e1a1a18a5ae249970e9821..c3fa76f50960bee15b32d1b6a8b8f1162a6639b9 100644
--- a/pkgs/os-specific/darwin/kwm/default.nix
+++ b/pkgs/os-specific/darwin/kwm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "kwm-${version}";
+  pname = "kwm";
   version = "4.0.5";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix
index 0b59ecb2299e846152ecbcc55f48e27921b82f31..cb81c2e81495a168aac69e646307c8092c1270fb 100644
--- a/pkgs/os-specific/darwin/lsusb/default.nix
+++ b/pkgs/os-specific/darwin/lsusb/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "lsusb-${version}";
+  pname = "lsusb";
 
   src = fetchFromGitHub {
     owner = "jlhonora";
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
index 75f1113e9f082f374b74c1177523f7746150f7c0..12bf02bf89ff785e92e9b53a5a0b069e004521dc 100644
--- a/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "m-cli-${version}";
+  pname = "m-cli";
   version = "0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 960e0677da1e6ee8af420df3abe7be23c022abb2..23b5ded1fe614d4df28b0fff4e8a4e6335d08328 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, icu, libuuid, tzdata }:
 
 stdenv.mkDerivation rec {
-  name = "opencflite-${version}";
+  pname = "opencflite";
   version = "476.19.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencflite/${name}.tar.gz";
+    url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz";
     sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
   };
 
diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix
index 404e752c279e045af4f05500047c503a18f42a63..77e63c779b9c3880180a668c8ba7e44c70ccd92b 100644
--- a/pkgs/os-specific/darwin/osxfuse/default.nix
+++ b/pkgs/os-specific/darwin/osxfuse/default.nix
@@ -17,7 +17,6 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   pname = "osxfuse";
   inherit version;
diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix
index aa7bfb5c3be7267754aba0b138412d7fc94307b0..19ab34145e80e80fc48231852656fd61d666ac08 100644
--- a/pkgs/os-specific/darwin/qes/default.nix
+++ b/pkgs/os-specific/darwin/qes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "qes-${version}";
+  pname = "qes";
   version = "0.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 631c59523e2a4323e51e983cb678c8cefc371c4f..9f5f8aa44228d6e294d257bbc17d75c1ee75d5ad 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "reattach-to-user-namespace-${version}";
+  pname = "reattach-to-user-namespace";
   version = "2.7";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 713847313c2c43b80541b8ceb1eddd5398a86e3c..ba5d3e9255bc9e66b1dd8d22527d938f938b5aad 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "skhd-${version}";
+  pname = "skhd";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix
index b18c603a911b610a2fea06334d262b760573ea57..9efa230d3b728ea57f5c8806df556f7c772dab8b 100644
--- a/pkgs/os-specific/darwin/smimesign/default.nix
+++ b/pkgs/os-specific/darwin/smimesign/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name    = "smimesign-${version}";
+  pname = "smimesign";
   version = "v0.0.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index fcbcfe00a3e7c3766a4f11207a5c1d4c171298e1..50c6d4fd2f41c1a636fac7dece95402be27fd777 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.2";
-  name = "trash-${version}";
+  pname = "trash";
 
   src = fetchFromGitHub {
     owner = "ali-rantakari";
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 37de98780b695f05a315b331f7966e6e8ea81167..cc7317f5520a43c2e2a72043195471773b889c06 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "acpi-${version}";
+  pname = "acpi";
   version = "1.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";
     sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 14b10e6752bbd476e4fd428f50aaf7491c29b734..743e8f3576b029fa185ebc2906f08ad0c0f820e1 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -3,11 +3,11 @@
 # some use gtk2, some gtk3 (and some even fltk13).
 
 stdenv.mkDerivation rec {
-  name = "alsa-tools-${version}";
+  pname = "alsa-tools";
   version = "1.1.7";
 
   src = fetchurl {
-    url = "mirror://alsa/tools/${name}.tar.bz2";
+    url = "mirror://alsa/tools/${pname}-${version}.tar.bz2";
     sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 09c430bcd53bc10c243613ac651f7d530b726be9..6f23d19031881da9edd97110273694d0627558f7 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-${version}";
+  pname = "alsa-utils";
   version = "1.1.9";
 
   src = fetchurl {
-    url = "mirror://alsa/utils/${name}.tar.bz2";
+    url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
     sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx";
   };
 
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index b03636d6f7f6431d61190e8d78ba48d870264555..aed0ed374a78f036a27998e5388f8f759e723b3b 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -5,7 +5,7 @@
 #   services.udev.packages = [ pkgs.android-udev-rules ];
 
 stdenv.mkDerivation rec {
-  name = "android-udev-rules-${version}";
+  pname = "android-udev-rules";
   version = "20190315";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 5d002bf72eacdfbdc681e732e28eb1ccc665a8db..5144add3a37f4efa9a393f989f30a0ba9c8b3556 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
-  name = "atop-${version}";
+  pname = "atop";
 
   src = fetchurl {
     url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index 50c48098ab08e0f07852185de8b4c8de7e3a2410..205d788da6e563249df17c2f2a9503a6fe7dbb96 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -27,7 +27,8 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "beegfs-${version}";
+  pname = "beegfs";
+  inherit version;
 
   src = fetchurl {
     url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index a2ebc0cdc5304d6ece4231aa93a896ce1924cc19..7f5cd206f32cd1ac8682729ad5bca3ab54853de7 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bpftrace-${version}";
+  pname = "bpftrace";
   version = "0.9.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
index d77539fb89ed508c85ec6e34e08702a491381917..44c2cfff5a2b9d527ba4ca7e973e24a1accfcee7 100644
--- a/pkgs/os-specific/linux/cachefilesd/default.nix
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cachefilesd-${version}";
+  pname = "cachefilesd";
   version = "0.10.10";
 
   src = fetchurl {
-    url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
+    url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2";
     sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd";
   };
 
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix
index 0c32c3f5e62a68e8e37eba2de45c50ee6aa7030b..0149398bfa3e712b5d4b79615b245d5e6989de6a 100644
--- a/pkgs/os-specific/linux/can-isotp/default.nix
+++ b/pkgs/os-specific/linux/can-isotp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "can-isotp-${version}";
+  pname = "can-isotp";
   version = "20180629";
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 616c99c8f46a0f95a1da0cd1104d3275ac98cd13..7913c703b5bcf344c187b91bd272e650739e5363 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "can-utils-${version}";
+  pname = "can-utils";
   # There are no releases (source archives or git tags), so use the date of the
   # latest commit in git master as version number.
   version = "20170830";
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 674b695b1eeeae54c8aa6b27ceae85b8936fae17..b724112af8863ee1c074ec88d1c816ff0d05f6e1 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bison, flex, libsepol }:
 
 stdenv.mkDerivation rec {
-  name = "checkpolicy-${version}";
+  pname = "checkpolicy";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index ba66bd309bc3b0cab274ab0bc1ddbeb997f914e0..ea6a6e775722a8f707c4526341adb0c2aad70b4a 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -2,11 +2,11 @@
 , kerberos, keyutils, pam, talloc }:
 
 stdenv.mkDerivation rec {
-  name = "cifs-utils-${version}";
+  pname = "cifs-utils";
   version = "6.9";
 
   src = fetchurl {
-    url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
+    url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
     sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
   };
 
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 298f5e30d0188a4f69fffaf2bfcb8cd00a9884a1..f826ddd423d8ea1e3db242f6ec179da3b0442e60 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -67,7 +67,7 @@ assert journalSupport      -> systemd != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "conky-${version}";
+  pname = "conky";
   version = "1.11.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 755e88b46cbc517bb9b4a5cbaccbf20d27727938..20c441ffae2fb80353a5e7f67381bcd8170ad34d 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -3,11 +3,11 @@
 , libnetfilter_cthelper, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "conntrack-tools-${version}";
+  pname = "conntrack-tools";
   version = "1.4.5";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2";
     sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
   };
 
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index d813376da8e5536522a34d334f0d0972ed4d3d14..8ea3e3445cce6f90f825e7606cbb67666fc93405 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "linuxconsoletools-${version}";
+  pname = "linuxconsoletools";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
+    url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2";
     sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9";
   };
 
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 940913d6a6c8aac6c86758c1d01dd8043a894c81..84c113c648cd4239b1c571d388c61e562d114138 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }:
 
 stdenv.mkDerivation rec {
-  name = "crda-${version}";
+  pname = "crda";
   version = "3.18";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 0821fbdc15cf2ad8feb6827ef8bcc069f780dcbd..354eea40b24b50036217aa3119c70a4dc38c8991 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -3,11 +3,11 @@
 , which, python, makeWrapper, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name    = "criu-${version}";
+  pname = "criu";
   version = "3.12";
 
   src = fetchurl {
-    url    = "https://download.openvz.org/criu/${name}.tar.bz2";
+    url    = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";
     sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf";
   };
 
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 82b0bb2f3565c6ec5e61e07443be2b4010b17da5..5f5005d8b97d08fd1a594caf8b269a2f5d0312a7 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -2,7 +2,7 @@
 , dbus, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-broker-${version}";
+  pname = "dbus-broker";
   version = "21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index e8c1e9bfe5e54a0ac8c35994b8882ce91332b31c..5896262ac217d9cdd429240d3d1c911c017567f1 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "directvnc-${version}";
+  pname = "directvnc";
   version = "0.7.7.2015-04-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 2ea939ccdb0902dcb8b5dfe5f1827b3d9bf6f52d..7ce5535313c2e4d27a9a0a349f32aedd01126bd2 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -10,7 +10,7 @@ let
   libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
 
 in stdenv.mkDerivation rec {
-  name = "displaylink-${version}";
+  pname = "displaylink";
   version = "4.4.24";
 
   src = requireFile rec {
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 534e57354474ce33bc84f5df7093b9e23c8be88c..1d67b16a492154afd136dd37f74e145be2ba7205 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bash, perl, python }:
 
 stdenv.mkDerivation rec {
-  name = "dmtcp-${version}";
+  pname = "dmtcp";
   version = "2.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix
index 936dbf719a873e94c1aaba1401b8a994547eb72d..f5b7e44a3fbc769b8d93654df14535b85ddb2adb 100644
--- a/pkgs/os-specific/linux/dropwatch/default.nix
+++ b/pkgs/os-specific/linux/dropwatch/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   pname = "dropwatch";
   version = "1.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "nhorman";
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix
index 9d92575b668787fff6c701517f1a6bf5316d30d7..23bd39ff3885e7b089a4813df8b5ad812129e4cd 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/pkgs/os-specific/linux/ebtables/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ebtables-${version}";
+  pname = "ebtables";
   version = "2.0.10-4";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index 744ab80d74f94ad27362fe6db87da59372ffc14e..ddc8ee64ba0063ac640636812a6947a7d9776e18 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "eventstat-${version}";
+  pname = "eventstat";
   version = "0.04.07";
   src = fetchzip {
     url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix
index 28a92d31eaa271a472a0b20e2c7d1b6746d1b58e..6aaaaec1b13e6f40df0480852f8913a13de96d6c 100644
--- a/pkgs/os-specific/linux/extrace/default.nix
+++ b/pkgs/os-specific/linux/extrace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "extrace-${version}";
+  pname = "extrace";
   version = "0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 94ea85f433d9cc4bfbc741eae486eb7535f79d7d..b99f719f8361e96f62b9c136aa29416be5e67899 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python3, which }:
 
 stdenv.mkDerivation rec {
-  name = "fatrace-${version}";
+  pname = "fatrace";
   version = "0.13";
 
   src = fetchurl {
-    url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index 1cc0e7ae4ca768e40d75ccb3677fa9556adf41c9..58cd88b4dce024db486510da2da087c198003b40 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -3,7 +3,8 @@
 let version = "5.100.138"; in
 
 stdenv.mkDerivation {
-  name = "b43-firmware-${version}";
+  pname = "b43-firmware";
+  inherit version;
 
   src = fetchurl {
     url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2";
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 2637beb517a3e660ddfdb7d5f6c659879f534f2b..959c0c74618e7a6aefd833185c13c0ef3284dd58 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, b43FirmwareCutter }:
 
 stdenv.mkDerivation rec {
-  name = "b43-firmware-${version}";
+  pname = "b43-firmware";
   version = "6.30.163.46";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index a57a6f1d70f6bdee28f7d6bea4a0d5eb7f72c6c4..4d5271a9ddfee61fc84b4d755030c915eafe1ecc 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -4,7 +4,7 @@
 # this packages as they expect the firmware to be named "BCM.hcd"
 # see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865
 stdenv.mkDerivation rec {
-  name = "broadcom-bt-firmware-${version}";
+  pname = "broadcom-bt-firmware";
   version = "12.0.1.1012";
 
   src = fetchurl {
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cabextract bt-fw-converter ];
 
   unpackCmd = ''
-    mkdir -p ${name}
-    cabextract $src --directory ${name}
+    mkdir -p ${pname}-${version}
+    cabextract $src --directory ${pname}-${version}
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
index 8927e1a28e7c021ff29fb90152d45574509b6bcc..9a99881be462731f093dcbb2f538205380a0e70c 100644
--- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
+++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }:
 
 stdenv.mkDerivation  rec {
-  name = "bt-fw-converter-${version}";
+  pname = "bt-fw-converter";
   version = "2017-02-19";
   rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153";
 
@@ -15,8 +15,8 @@ stdenv.mkDerivation  rec {
   buildInputs = [ perl perlPackages.RegexpGrammars bluez ];
 
   unpackCmd = ''
-    mkdir -p ${name}
-    cp $src ${name}/bt-fw-converter.pl
+    mkdir -p ${pname}-${version}
+    cp $src ${pname}-${version}/bt-fw-converter.pl
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 5f8f6c54252161b435803a854731997a92a65bac..c9723c944ab1b8a2575cd41c549f0d66bbdeb154 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -35,7 +35,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "facetimehd-firmware-${version}";
+  pname = "facetimehd-firmware";
+  inherit version;
   src = fetchurl {
     url = dmgUrl;
     sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv";
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index c251e3963e7b79d8253d579888fc4b5e261c85a4..380444f026933c75b692f328053278e4e52b90f3 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "firmware-linux-nonfree-${version}";
+  pname = "firmware-linux-nonfree";
   version = "2019-07-17";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
index 5b14546c90fd0d901ed09faf647f2011f2119748..70a0bdbe2406a5cfd3a787bcd09a481288262eed 100644
--- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
@@ -2,7 +2,8 @@
 let
   version = "12";
 in stdenv.mkDerivation {
-  name = "fwupdate-${version}";
+  pname = "fwupdate";
+  inherit version;
   src = fetchurl {
     url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
     sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1";
diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
index b60ce6f1b4afbf635938cbd94e525df8ed862a47..421a3300f7b07b32557bfaa1dc29e3a6195c8c06 100644
--- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "openelec-dvb-firmware-${version}";
+  pname = "openelec-dvb-firmware";
   version = "0.0.51";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index e64c4c09ebd91b3058ebcbc5cb2e17f27c85855a..26ed20206359e69d55859621997b0407a4ec182f 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "raspberrypi-wireless-firmware-${version}";
+  pname = "raspberrypi-wireless-firmware";
   version = "2018-08-20";
 
   srcs = [
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 4685f6757179bb05397c106b9e712c4a1fa92575..321ce8ffc06d0c4124566ef10d038d1555ff3c77 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "raspberrypi-tools-${version}";
+  pname = "raspberrypi-tools";
   version = "2018-10-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix
index 0a6364f07df5e52b794f5113e23379437c9e00ee..0abd458aa8f3d988eb2a2645a44f3f667347225f 100644
--- a/pkgs/os-specific/linux/flashbench/default.nix
+++ b/pkgs/os-specific/linux/flashbench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "flashbench-${version}";
+  pname = "flashbench";
   version = "2012-06-06";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index 1594ddf288a9102cd44fb18886788ea991d504f2..db88ff05812e9eb08721b4bab21c9e782a7fef22 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "forkstat-${version}";
+  pname = "forkstat";
   version = "0.02.11";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index a091b2f17c5e9b3018fe077e019204b8396f9972..09774016ef266abe00a57735ec367216b6310b8f 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (kernel) version src;
 
-  name = "freefall-${version}";
+  pname = "freefall";
 
   postPatch = ''
     cd tools/laptop/freefall
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index da787d84d79dd604c45ec0feef6cf1d940d1254b..35e1972b574b3e831082936b5dc8a024474073fa 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -3,7 +3,7 @@
 # Don't use this for anything important yet!
 
 buildGoPackage rec {
-  name = "fscrypt-${version}";
+  pname = "fscrypt";
   version = "0.2.4";
 
   goPackagePath = "github.com/google/fscrypt";
diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 8622dc001a877179f10c10e6aad40e678b62a257..ecab0350d789794672c2aa827d51a96545ba4b7a 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -3,7 +3,7 @@
 # Don't use this for anything important yet!
 
 stdenv.mkDerivation rec {
-  name = "fscryptctl-unstable-${version}";
+  pname = "fscryptctl-unstable";
   version = "2017-10-23";
 
   goPackagePath = "github.com/google/fscrypt";
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 915431c0cb1f93a0a0049c765d2813fcf7d559a1..4d283d5dc0c62acbd73b671fe6cc7e34b58c2d6c 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ftop-${version}";
+  pname = "ftop";
   version = "1.0";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${pname}-${version}.tar.bz2";
     sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82";
   };
 
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index f829f1da424e9842da5a5502e6ac64fd692af4b6..35c91c5ec0719655d81540fa727e4615041e5491 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -10,12 +10,13 @@
 let
   isFuse3 = stdenv.lib.hasPrefix "3" version;
 in stdenv.mkDerivation rec {
-  name = "fuse-${version}";
+  pname = "fuse";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "libfuse";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = sha256Hash;
   };
 
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 4531de86b1b37b261a72e6069c0bf78689abd3f6..07252b8bc31f0fc1cee30f44fb87388e72d919bb 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -2,7 +2,7 @@
 , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
 
 stdenv.mkDerivation rec {
-  name = "fwts-${version}";
+  pname = "fwts";
   version = "19.07.00";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix
index 9fc052c5ac1b3ba5f9ca4e92e490002633197eea..56fa4f1d7d6890a0e83c5e74c98bfe0fe8ece2a8 100644
--- a/pkgs/os-specific/linux/gfxtablet/default.nix
+++ b/pkgs/os-specific/linux/gfxtablet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "gfxtablet-uinput-driver-${version}";
+  pname = "gfxtablet-uinput-driver";
 
   buildInputs = [
     linuxHeaders
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index fc308285dd6de798aebad84448632253160aa983..03018c98818cd927144b88aea28189e9d57408e3 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }:
 
 stdenv.mkDerivation rec {
-  name = "google-authenticator-libpam-${version}";
+  pname = "google-authenticator-libpam";
   version = "1.06";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix
index d56253c6cedd1be76696f914c1d3ea31497297c6..0325461763a26bcd4e4a3eb16607e1acf0164117 100644
--- a/pkgs/os-specific/linux/gpu-switch/default.nix
+++ b/pkgs/os-specific/linux/gpu-switch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gpu-switch-unstable-${version}";
+  pname = "gpu-switch-unstable";
   version = "2017-04-28";
   src = fetchFromGitHub {
     owner = "0xbb";
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 7f64ed227719ac2d43793c8916645e229d370572..bea70da995bd714b80323e21354a654d43d8facf 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "gradm-${version}";
+  pname = "gradm";
   version = "3.1-201608131257";
 
   src  = fetchurl {
-    url    = "http://grsecurity.net/stable/${name}.tar.gz";
+    url    = "http://grsecurity.net/stable/${pname}-${version}.tar.gz";
     sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb";
   };
 
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index acafa0376f5c5c55178185c50a04d5137aa36a7e..8e6db2a5774b533451e4ae12c2150debe7b68980 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -6,7 +6,7 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "2.0.6";
-  name = "guvcview-${version}";
+  pname = "guvcview";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix
index 15bdabcc3dc84ec2028a5e63f449f17a997f21aa..d2319fdcf5c7cd040ef8909f659b4f0784e6b785 100644
--- a/pkgs/os-specific/linux/hibernate/default.nix
+++ b/pkgs/os-specific/linux/hibernate/default.nix
@@ -3,7 +3,8 @@
 let version = "2.0";
 in
   stdenv.mkDerivation rec {
-    name = "hibernate-${version}";
+    pname = "hibernate";
+    inherit version;
     src = fetchurl {
       url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz";
       sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh";
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 7629a20473b2c5bbb7c98dafb86bd5c03b0d8dbc..e90470cd589188661e6aa8896dfcc6e8115c0129 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
 stdenv.mkDerivation rec {
-  name = "hostapd-${version}";
+  pname = "hostapd";
   version = "2.8";
 
   src = fetchurl {
-    url = "https://w1.fi/releases/${name}.tar.gz";
+    url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
     sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj";
   };
 
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index dfca87e271654d6fbdb00289929646a02fd75730..38335682ddb8abe386610d2e29cebac85e0725a5 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "hwdata-${version}";
+  pname = "hwdata";
   version = "0.316";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index f89747dc200d65bf14732dc39024eed706a52276..36ca1eb16b49d9a790bdf6970f53d04eff79cbe3 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -2,7 +2,7 @@
 
 let
   daemons = stdenv.mkDerivation rec {
-    name = "hyperv-daemons-bin-${version}";
+    pname = "hyperv-daemons-bin";
     inherit (kernel) src version;
 
     nativeBuildInputs = [ makeWrapper ];
@@ -55,7 +55,7 @@ let
     '';
 
 in stdenv.mkDerivation rec {
-  name    = "hyperv-daemons-${version}";
+  pname = "hyperv-daemons";
 
   inherit (kernel) version;
 
diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 5b061183356cf79bf7938338766de406ff59cb8a..1b87619faa32ff5b73e25abec5c55731cd2dc8fe 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, read-edid }:
 
 stdenv.mkDerivation rec {
-  name = "i2c-tools-${version}";
+  pname = "i2c-tools";
   version = "4.1";
 
   src = fetchurl {
-    url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz";
+    url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz";
     sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp";
   };
 
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index ac5f9fc5ba302c693ceafb20f9cd160f94188e89..2f792cb7ea7446d182d8aef42a4570fdf1a42dba 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -2,7 +2,7 @@
 , withGui ? false, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "i7z-${version}";
+  pname = "i7z";
   version = "0.27.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix
index b9390d1d589349ecfb550ccd2ecc349273f6f032..1b22c1eafd3b5b37d6d383a684b5e4c308faba5d 100644
--- a/pkgs/os-specific/linux/ifenslave/default.nix
+++ b/pkgs/os-specific/linux/ifenslave/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ifenslave-${version}";
+  pname = "ifenslave";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 6de3b19afd7ef0857e3e9dbec6f69fc937f8ae49..69ec6560d83dce90baca272e8ee67a09f01614b6 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "ima-evm-utils-${version}";
+  pname = "ima-evm-utils";
   version = "1.1";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
index cd0fc01384bcf98ea9ec406f0bcce55a7d32e4c2..c6248ee90836a284059aeed54f57d0b460a2d1ce 100644
--- a/pkgs/os-specific/linux/input-utils/default.nix
+++ b/pkgs/os-specific/linux/input-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, linuxHeaders }:
 
 stdenv.mkDerivation rec {
-  name = "input-utils-${version}";
+  pname = "input-utils";
   version = "1.3";
   
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix
index 38069981723d5969eb71ec105fb3e0189e2be5ef..1f67208db8b95e84594880e7c178f76d1132a674 100644
--- a/pkgs/os-specific/linux/intel-ocl/default.nix
+++ b/pkgs/os-specific/linux/intel-ocl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "intel-ocl-${version}";
+  pname = "intel-ocl";
   version = "5.0-63503";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix
index 932b8143898276844496e187f7f5120e908de956..7b41b095091da76c94af0e1f723c578d3ae4ef3a 100644
--- a/pkgs/os-specific/linux/iomelt/default.nix
+++ b/pkgs/os-specific/linux/iomelt/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.7";
 in stdenv.mkDerivation {
-  name = "iomelt-${version}";
+  pname = "iomelt";
+  inherit version;
   src = fetchurl {
     url = "http://iomelt.com/s/iomelt-${version}.tar.gz";
     sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im";
diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix
index a9be26a2026231e80c8ad69cd57e78dbd5c32644..5a0555f6680510107629503abd2879c59bb1ef5b 100644
--- a/pkgs/os-specific/linux/iptstate/default.nix
+++ b/pkgs/os-specific/linux/iptstate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libnetfilter_conntrack, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "iptstate-${version}";
+  pname = "iptstate";
   version = "2.2.6";
 
   src = fetchurl {
-    url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068";
   };
 
diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix
index 67a123a376483148234fc0d480a3ed4ce6f58c16..f5d80dc5258ce5d19331eec7b0c840c61964107c 100644
--- a/pkgs/os-specific/linux/ipvsadm/default.nix
+++ b/pkgs/os-specific/linux/ipvsadm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "ipvsadm-${version}";
+  pname = "ipvsadm";
   version = "1.30";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz";
     sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm";
   };
 
diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
index e606e3db6ee6b92c02715903e3d8cecd5e018b3e..8dc9e2694d4707f81a158ddf21e7cb2f9c33d97f 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
 
 stdenv.mkDerivation rec {
-  name = "irqbalance-${version}";
+  pname = "irqbalance";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index a37e65f8cb50e8ab2a851aadd93a7336eef5c4d9..3386a7f9206283bd9a384dd423d450fb08c078bb 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kbd-${version}";
+  pname = "kbd";
   version = "2.0.4";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
     sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
   };
 
diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix
index 32c9f6906806f18ec6a1199bc973c0f5447d39a9..e6e8981189445e9b11894518250f0200fc73bb52 100644
--- a/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/pkgs/os-specific/linux/kbd/keymaps.nix
@@ -2,7 +2,7 @@
 
 {
   dvp = stdenv.mkDerivation rec {
-    name = "dvp-${version}";
+    pname = "dvp";
     version = "1.2.1";
 
     src = fetchurl {
@@ -19,7 +19,7 @@
   };
 
   neo = stdenv.mkDerivation rec {
-    name = "neo-${version}";
+    pname = "neo";
     version = "2476";
 
     src = fetchurl {
diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix
index 44a63c9f1ece01810e3aa55f2aeb09174ed88511..6df3e4fffe7083ba0110baa629a91dd2bea4aa5b 100644
--- a/pkgs/os-specific/linux/kbdlight/default.nix
+++ b/pkgs/os-specific/linux/kbdlight/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "kbdlight-${version}";
+  pname = "kbdlight";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 527811c2b8d63c510eef76f9384b25977cbe4a71..2c01dcb97312643482444e98f5d0a09bfec986fa 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -93,7 +93,8 @@ let
 
   configfile = stdenv.mkDerivation {
     inherit ignoreConfigErrors autoModules preferBuiltin kernelArch;
-    name = "linux-config-${version}";
+    pname = "linux-config";
+    inherit version;
 
     generateConfig = ./generate-config.pl;
 
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 8adb862a265f362ec3274b84e3d57363b073c0b1..326afdfff46434537cec538f2d92180f455ff8e9 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "kexec-tools-${version}";
+  pname = "kexec-tools";
   version = "2.0.19";
 
   src = fetchurl {
     urls = [
-      "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
-      "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
+      "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz"
+      "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz"
     ];
     sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d";
   };
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 1d9497a7eddff49f08aafcf3968702a2f1ab4a90..7d6ee61030c177d23d51bacc53357267b25f1ae1 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "keyutils-${version}";
+  pname = "keyutils";
   version = "1.6";
 
   src = fetchurl {
-    url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
+    url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2";
     sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk";
   };
 
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 8cae61d56a927db988b52aa37acd75e535899168..8e224c8f33b8d30bb4035bbbe5058f893bcca7f7 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "klibc-${version}";
+  pname = "klibc";
   version = "2.0.4";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 266c94fd8c848878ec21aa937b0d2bf86494407c..55ae78219d185b2862d1c179ff4b6a21e0324558 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -4,7 +4,8 @@ let
   version = "22-1.1ubuntu1"; # Zesty
 
 in stdenv.mkDerivation {
-  name = "kmod-blacklist-${version}";
+  pname = "kmod-blacklist";
+  inherit version;
 
   src = fetchurl {
     url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix
index 0c333feab1c14945201b6071542fd1d0f9950d50..96bb91175dc8876234b950ff962f4835661190bb 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -7,7 +7,8 @@ let
   git = https://github.com/LemonBoy/ldm.git;
 in
 stdenv.mkDerivation rec {
-  name = "ldm-${version}";
+  pname = "ldm";
+  inherit version;
 
   # There is a stable release, but we'll use the lvm branch, which
   # contains important fixes for LVM setups.
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index 949c8135df7b59fa9b6b4ce88a68767a9c4c42c1..fef7a3236b302d71d7f16d5a36798d28a9a65ae2 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.110";
-  name = "libaio-${version}";
+  pname = "libaio";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz";
+    url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz";
     sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
   };
 
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index a23c0cb092690783f69cabb9ad865f672efb1451..1294bd3d2680dca1f21c666c97e8f61fe559872e 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -5,7 +5,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "libbpf-${version}";
+  pname = "libbpf";
   version = "0.0.3pre114_${substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index 981e928ba6599cda0df923a1a44467a4fa0211fd..d0fc97d0dd3541a047896bf38b46b658422468c5 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -3,13 +3,13 @@
 assert python2 != null || python3 != null -> swig != null;
 
 stdenv.mkDerivation rec {
-  name = "libcap-ng-${version}";
+  pname = "libcap-ng";
   # When updating make sure to test that the version with
   # all of the python bindings still works
   version = "0.7.9";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.gz";
+    url = "${meta.homepage}/${pname}-${version}.tar.gz";
     sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
   };
 
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 87f354aa75d321dc988ce7099e09223f883eb60a..9c730bb9659774a87f639da199809a4ed097daf3 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, attr, perl, pam }:
 
 stdenv.mkDerivation rec {
-  name = "libcap-${version}";
+  pname = "libcap";
   version = "2.27";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz";
+    url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
     sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs";
   };
 
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm "$lib"/lib/*.a
-    mkdir -p "$doc/share/doc/${name}"
-    cp License "$doc/share/doc/${name}/"
+    mkdir -p "$doc/share/doc/${pname}-${version}"
+    cp License "$doc/share/doc/${pname}-${version}/"
   '' + stdenv.lib.optionalString (pam != null) ''
     mkdir -p "$pam/lib/security"
     mv "$lib"/lib/security "$pam/lib"
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index 1e920247a75404cf493564f6de5b4a5777bccc73..026b43fc615da9e2ad7e7c587307b8f81fc2fda5 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
 
 stdenv.mkDerivation rec {
-  name    = "libcgroup-${version}";
+  pname = "libcgroup";
   version = "0.41";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libcg/${name}.tar.bz2";
+    url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2";
     sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
   };
 
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 34d10d3aa5fb2c01c1ad2f7e71b8e823815309ee..0789d53b43446ac10feb74b23f61b0a203c4c7de 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -2,7 +2,7 @@
 , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:
 
 stdenv.mkDerivation rec {
-  name = "libnl-${version}";
+  pname = "libnl";
   version = "3.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index 5dab4b34f4669d5d1bcde1dc5ef7808d643027cd..a09bb2a6ceb49cfdcfeca6efdb74081a1b01f5ed 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -2,7 +2,7 @@
 , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "libratbag-${version}";
+  pname = "libratbag";
   version = "0.9.905";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 51e1a3220941b5b77041449297ef849f7429153d..028c008eccf6ae2fd4e3bbda31b812dc921108b4 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -8,7 +8,7 @@ assert enablePython -> swig != null && python != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libselinux-${version}";
+  pname = "libselinux";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 59f5f11d07699405190581860d6dbf7c7008679c..4fe323ee23de1dfdcd005e4ed98d26b9aef704db 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libsemanage-${version}";
+  pname = "libsemanage";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index f16c241a0a1f24353a231c575f4366aaa58d81db..e96ea01cce421f3d4d2e4ea08fa6461fa6dab42b 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libsepol-${version}";
+  pname = "libsepol";
   version = "2.7";
   se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 874faf7799b34579b75a430459c036020e547374..d0ae185285347c3a799a0c929791f7a5a00ef80e 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -3,7 +3,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "libsmbios-${version}";
+  pname = "libsmbios";
   version = "2.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix
index c0c6ad54579cdb4e2bb2229df9226d58ffdbb639..ecdc658f2f1e4f6a9b91d546e17fd49424438dfd 100644
--- a/pkgs/os-specific/linux/libudev0-shim/default.nix
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libudev0-shim-${version}";
+  pname = "libudev0-shim";
   version = "1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix
index 879e85a0c945b3ff5746c30defa915cbd2978927..5cccc82b8430fa7f730ddb3e99be90525a329d51 100644
--- a/pkgs/os-specific/linux/libwebcam/default.nix
+++ b/pkgs/os-specific/linux/libwebcam/default.nix
@@ -9,7 +9,6 @@
 stdenv.mkDerivation rec {
   pname = "libwebcam";
   version = "0.2.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index 1856c8861cc46be7f25a39d4a64b06c270266f3c..6a0dd34d021dff28844d98f86ae18cc67fe97cc5 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2";
-  name = "light-${version}";
+  pname = "light";
   src = fetchFromGitHub {
     owner = "haikarainen";
     repo = "light";
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 0536ba064a3d4c51ec02fd39a6a61ff4da0c9f58..b9e58cb5a4c7b3bdd672d1b0e17a59f30b0775d3 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -5,7 +5,7 @@
 assert sensord -> rrdtool != null;
 
 stdenv.mkDerivation rec {
-  name = "lm-sensors-${version}";
+  pname = "lm-sensors";
   version = "3.5.0";
 
   src = fetchzip {
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 3c7ceb1270c0d5948eb7bab9fee2c95a3822fe7b..74abd12868d57a67ea419c1e2e37bffb78d87b3d 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "lockdep-${version}";
+  pname = "lockdep";
   version = "4.1.2";
   fullver = "4.1.2";
 
diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
index c215d9401940309c96c0dd4ad545bf2d7a00c3e8..9aa1698b766509129dfbe1597cb6e0e301a01053 100644
--- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
@@ -4,7 +4,7 @@
 # up-to-date so we simply use that instead of having to maintain our own rules
 
 stdenv.mkDerivation rec {
-  name = "logitech-udev-rules-${version}";
+  pname = "logitech-udev-rules";
   inherit (solaar) version;
 
   buildCommand = ''
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix
index 93cab433c9c66f0c39d9670d8a511331be2e7d08..b2d1ca4791a688e31bb0f7d9a43d01b56bbe8f91 100644
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -13,7 +13,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "lsiutils-${version}";
+  pname = "lsiutils";
+  inherit version;
   
   srcs = [ src "Source/lsiutil.tar.gz" ];
 
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 469096d014d7923fb1aead31f1c5886e3c36233d..9944250bf307e7cabd56e353c41187e66a513997 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -7,7 +7,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "lvm2-${version}";
+  pname = "lvm2";
+  inherit version;
 
   src = fetchgit {
     url = "git://sourceware.org/git/lvm2.git";
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 17063851cee282c1c433de3ef5c4bf73b71bc38c..fff66fe328a5aec435e3521bc1473109cc128155 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxc-${version}";
+  pname = "lxc";
   version = "3.2.1";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix
index c335031f2e5611bb2b536799450bf7ee8e21e064..ec76cda97692d8c180cab43ce033dff03db81341 100644
--- a/pkgs/os-specific/linux/macchanger/default.nix
+++ b/pkgs/os-specific/linux/macchanger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "macchanger-${version}";
+  pname = "macchanger";
   version = "1.7.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 9528b9be7f7db02b730f0f25fcc26d81873970d2..8b62ce76409ebc16355af93428d99faca1c8656f 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mbpfan-${version}";
+  pname = "mbpfan";
   version = "2.1.1";
   src = fetchFromGitHub {
     owner = "dgraziotin";
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index f7f2193eaa09bd15f5739f742d0f52a0b48bf811..a58bfc321d3ce50fe35a5827dde2fbc7c8e152d5 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "mcelog-${version}";
+  pname = "mcelog";
   version = "164";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix
index 485272b1401b3e3668080b42d344fb78551fecf3..c81a0c9097afbf413c72d46f93d7e32ce5e76f63 100644
--- a/pkgs/os-specific/linux/microcode/iucode-tool.nix
+++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "iucode-tool-${version}";
+  pname = "iucode-tool";
   version = "2.3.1";
 
   src = fetchFromGitLab {
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index b65486cb2fe11306d86ee559e48f3f5ca4a3bace..0edf322cce5477efbee540e56d7cd40988aa71ce 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -2,7 +2,7 @@
 , glib, readline, pcre, systemd, udev }:
 
 stdenv.mkDerivation rec {
-  name = "miraclecast-${version}";
+  pname = "miraclecast";
   version = "1.0-20190403";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
index 533cd90a2d3cc6773227c23c314c2d32e09ce0d5..a7f0a332bebd44bc8b204fd3e2d9718d5e7e57f6 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "mmc-utils-${version}";
+  pname = "mmc-utils";
   version = "2018-03-27";
 
   src = fetchgit {
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix
index ac083e545feda42f54cace6a302a5472b7834ec3..766c01eed3fce0face166fff3f091aa53362442a 100644
--- a/pkgs/os-specific/linux/molly-guard/default.nix
+++ b/pkgs/os-specific/linux/molly-guard/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, busybox, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "molly-guard-${version}";
+  pname = "molly-guard";
   version = "0.6.3";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix
index 128f3eac263564ceb9ece12f049edd33d06a4c8c..f7b81bd3915d6c9533344c683a8dffe7f5622c3f 100644
--- a/pkgs/os-specific/linux/msr-tools/default.nix
+++ b/pkgs/os-specific/linux/msr-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "msr-tools-${version}";
+  pname = "msr-tools";
   version = "1.3";
 
   src = fetchurl {
-    url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip";
+    url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip";
     sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
   };
 
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 078f894f73eb3a721f5678c4bef1ba3ee9fb869c..afe07a5c4dbe57a3efaf749ba11dfb677d84e2c4 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
 
 stdenv.mkDerivation rec {
-  name = "multipath-tools-${version}";
+  pname = "multipath-tools";
   version = "0.8.2";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz";
     sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s";
   };
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 42f745b02e30f13079c94f38189afa7d1fd6a092..3cd8f224ce46f5638036a33522c3be05a93f72ee 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "net-tools-${version}";
+  pname = "net-tools";
   version = "1.60_p20170221182432";
 
   src = fetchurl {
-    url = "mirror://gentoo/distfiles/${name}.tar.xz";
+    url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
     sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a";
   };
 
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 12fdbabcc0b4d8c66fdf913414b15cff58ed805c..3f53c0f5817878e83bea5ddb68b4a0341b9158c6 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nfs-utils-${version}";
+  pname = "nfs-utils";
   version = "2.4.1";
 
   src = fetchurl {
-    url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
+    url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
     sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5";
   };
 
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 23852559436d03498440a19e5007d4049ca77f35..843676b9ccac7bbe1fbe18416dc8da087f851a99 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -8,10 +8,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.9.1";
-  name = "nftables-${version}";
+  pname = "nftables";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
     sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza";
   };
 
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
index 5f425c9685cf9f0d069eb4e6f3dd301e528e7c4d..cb6dd4ab946c5c1280ca96b536653de5b5871e08 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "nmon-${version}";
+  pname = "nmon";
   version = "16k";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index 2db2e12bb961bcb1ba323adae533ae36a6c11759..4417ffb569bfb2180e0aa69e8be64765e58e9fb0 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "numactl-${version}";
+  pname = "numactl";
   version = "2.0.12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index bead5f84eac910f1487cfd041475451711455730..4040d70260c574085a1077edbde8402b70c9eacb 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "odp-dpdk-${version}";
+  pname = "odp-dpdk";
   version = "1.19.0.0_DPDK_17.11";
 
   src = fetchurl {
-    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
+    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
     sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
   };
 
diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix
index 93cf33979f4b5874dba9be560ad7c4a80f82c446..70f46519375b7f38cfb5f95289cd009326191480 100644
--- a/pkgs/os-specific/linux/ofp/default.nix
+++ b/pkgs/os-specific/linux/ofp/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ofp-${version}";
+  pname = "ofp";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index a2644fcbc3fdcd88b23680d31dc5ecae846a8dc3..274e960a89b0126a30a2e970f2f0cc66a25c08e8 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "open-iscsi-${version}";
+  pname = "open-iscsi";
   version = "2.0.877";
 
   nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 21d32af3ba83303f6694b2640607b40c3accc547..7b34c1029baeed7c0ed3887c0054fe735edb3050 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, openssl, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "open-isns-${version}";
+  pname = "open-isns";
   version = "0.99";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index a2a272f1b3a588c27c1d6786df570dad5fdcfbac..bf26b9e2b28bda82ebc9a0907e05f90a0d6c824a 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -8,10 +8,10 @@ let
   _kernel = kernel;
 in stdenv.mkDerivation rec {
   version = "2.5.4";
-  name = "openvswitch-${version}";
+  pname = "openvswitch";
 
   src = fetchurl {
-    url = "http://openvswitch.org/releases/${name}.tar.gz";
+    url = "http://openvswitch.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv";
   };
 
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index e1525a951a96fcee2ea74100c86522f5333db2b1..5d7357cb8380957eeec0bd3b879853028415655e 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "pagemon-${version}";
+  pname = "pagemon";
   version = "0.01.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 1f2a7d3edf2717b55aea50bc415353abf7c2dfad..d1a035d744807a18d19555f7eedf6f47f9810bbb 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }:
 
 stdenv.mkDerivation rec {
-  name = "linux-pam-${version}";
+  pname = "linux-pam";
   version = "1.3.1";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix
index 10856bb52c9cf2d7245931a449d1f127884137ee..a1c91516ce000eff74ee707105025f27f7510c3f 100644
--- a/pkgs/os-specific/linux/pam_pgsql/default.nix
+++ b/pkgs/os-specific/linux/pam_pgsql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }:
 
 stdenv.mkDerivation rec {
-  name = "pam_pgsql-${version}";
+  pname = "pam_pgsql";
   version = "0.7.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 72846e185ebdaae86ff376a8dc3439cc4b3ead8b..6e9ab379dbcff2e65a4b049a10201be258014f31 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }:
 
 stdenv.mkDerivation rec {
-  name    = "pam_u2f-${version}";
+  pname = "pam_u2f";
   version = "1.0.8";
 
   src     = fetchurl {
-    url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
+    url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
     sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj";
   };
 
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 8fdd2356c30dc6e008462d3fda9ac3ba1a8415ec..754f6bcac333f6dcb3894925fd790427c4c6a3cd 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, elf-header }:
 
 stdenv.mkDerivation rec {
-  name = "paxctl-${version}";
+  pname = "paxctl";
   version = "0.9";
 
   src = fetchurl {
-    url = "https://pax.grsecurity.net/${name}.tar.gz";
+    url = "https://pax.grsecurity.net/${pname}-${version}.tar.gz";
     sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
   };
 
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix
index c1500e51ac377c7a10a72b8716adb3bc9d63916b..e01f84576ced78fcb9d2dbcd8b280f5f22397a89 100644
--- a/pkgs/os-specific/linux/paxtest/default.nix
+++ b/pkgs/os-specific/linux/paxtest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, paxctl }:
 
 stdenv.mkDerivation rec {
-  name    = "paxtest-${version}";
+  pname = "paxtest";
   version = "0.9.15";
 
   src = fetchurl {
-    url    = "https://www.grsecurity.net/~spender/${name}.tar.gz";
+    url    = "https://www.grsecurity.net/~spender/${pname}-${version}.tar.gz";
     sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym";
   };
 
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index 6365175290adab29008d9da3f67c44d5dad03c8d..9b9e563f80351ecaa135759014cb6f61522f0ade 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "201902";
-  name = "pcm-${version}";
+  pname = "pcm";
 
   src = fetchFromGitHub {
     owner = "opcm";
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 1155a793b014edb0d52f73cd0aa1adbca8e2ba14..f3e63133d1e1294421bf7f780e5843c374c9b6f1 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "pflask-${version}";
+  pname = "pflask";
   version = "git-2015-12-17";
   rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
 
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index 523f7382a2cff00c8801ea813db41b94e32c226e..62aa18fa643e75cd8ea214b7e5795c8c3d22c98d 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pipework-${version}";
+  pname = "pipework";
   version = "2017-08-22";
   src = fetchFromGitHub {
     owner = "jpetazzo";
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index a7bb4a81510d6d89c1700868c64b03142d00d099..0d92c7c6909812ea2c0f2cc9062dc9414acf8596 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -16,7 +16,7 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "pktgen-${version}";
+  pname = "pktgen";
   version = "3.5.0";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 43f184f384ddd88bd19a396d4f201279d60b644d..24213cd2fb5ac54d7d27e9d69c9ee9241d566002 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -5,7 +5,8 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
 let
   version = "1.0.beta1-9e810b1";
 in stdenv.mkDerivation {
-  name = "ply-${version}";
+  pname = "ply";
+  inherit version;
   nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index 2092a50041f10d1601adca45fbb9d72b4dd1dfd6..b074c6d7244382708d5e31aebea1ae225cb13e1a 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "plymouth-${version}";
+  pname = "plymouth";
   version = "0.9.4";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz";
     sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa";
   };
 
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index cd0e277b2c6b9af14bff6cc38a157fe96863298f..0981a0b5a4bd6acb751024fbc74c863d20bd439a 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -8,7 +8,7 @@
 assert stdenv.lib.hasSuffix "/" mediaDir;
 
 stdenv.mkDerivation rec {
-  name = "pmount-${version}";
+  pname = "pmount";
   version = "0.9.23";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index a7cac46ae6a049bcb9672430a57443224ba1b886..fb507d4da4856516e1d65aa58251632f07e1e5f8 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
 
 stdenv.mkDerivation rec {
-  name = "policycoreutils-${version}";
+  pname = "policycoreutils";
   version = "2.7";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 1a4919a5d9d41f626baa705ba184c6fe73af1c0c..3daab3917e84222da5651289d934cb63269c23cf 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -17,7 +17,7 @@ in
 stdenv.mkDerivation rec {
   version = "${prl_major}.2.1-41615";
   prl_major = "12";
-  name = "prl-tools-${version}";
+  pname = "prl-tools";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix
index aa7d0ec4604377d9fa628709e552549fc95656dc..0185d3022bc24a460c542c2e24d08cbdbbd90ea7 100644
--- a/pkgs/os-specific/linux/procdump/default.nix
+++ b/pkgs/os-specific/linux/procdump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "procdump-${version}";
+  pname = "procdump";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 1ed85bc94cb7c3ae7fe61db97962d3d2535a81e4..1f39a99ea0bff2ad1c0ad9fd8a2f94859007651d 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "procps-${version}";
+  pname = "procps";
   version = "3.3.15";
 
   # The project's releases are on SF, but git repo on gitlab.
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix
index 1ef3b71884fdfc69da51c20e7492ff1c1c17be29..f8eb8c0a969f7b483214bf60ded86dec079ab7ef 100644
--- a/pkgs/os-specific/linux/pscircle/default.nix
+++ b/pkgs/os-specific/linux/pscircle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }:
 
 stdenv.mkDerivation rec {
-  name = "pscircle-${version}";
+  pname = "pscircle";
   version = "1.3.1";
 
   src = fetchFromGitLab {
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 68e51afdf1bb89c83d6d255ac592104a219f878f..413b7d5dcbdff7c3609b3763168510c2cb5cfc7a 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "psmisc";
   version = "23.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitLab {
     owner = pname;
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 36ad73c48d6896ffdc9f59683694ee005412c1d7..c013a0107eabd1c97493f0aa736a85ee362367ee 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -2,7 +2,7 @@
 , ncurses, libdrm, libpciaccess, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "radeontop-${version}";
+  pname = "radeontop";
   version = "2019-06-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index e604f73de2dd9f8999e1818d85551ac88ae1daff..ce0e8707ff57c2ca2a273dbb0e38589c4bc7aa24 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -7,7 +7,8 @@ let
   version = "25.0";
 
 in stdenv.mkDerivation {
-  name = "rdma-core-${version}";
+  pname = "rdma-core";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "linux-rdma";
diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix
index 3e57bbc11bdc54db11f59d16ec5c2fe132ce9e71..815005ae290ed48189cd071d31fd01cdd761d253 100644
--- a/pkgs/os-specific/linux/read-edid/default.nix
+++ b/pkgs/os-specific/linux/read-edid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, cmake, libx86 }:
 
 stdenv.mkDerivation rec {
-  name = "read-edid-${version}";
+  pname = "read-edid";
   version = "3.0.2";
 
   src = fetchurl {
-    url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz";
+    url = "http://www.polypux.org/projects/read-edid/${pname}-${version}.tar.gz";
     sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7";
   };
 
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
index ee7325edbe70cccd1fe61ae1cbb72135814d68ca..3cb964f364d3423383a8ede5bac06c05e514cce1 100644
--- a/pkgs/os-specific/linux/regionset/default.nix
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.2"; in
 stdenv.mkDerivation {
-  name = "regionset-${version}";
+  pname = "regionset";
+  inherit version;
 
   src = fetchurl {
     url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index bd25dc65ec85d014c5bed872c59f054bef09ee86..c078fb18c4ee06b80eab079123674889ec0a3691 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.0";
-  name = "reptyr-${version}";
+  pname = "reptyr";
 
   src = fetchFromGitHub {
     owner = "nelhage";
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 8c7b75a881f4a43530bf1c504ea419480c9237ff..b1afbfea0de2bfdd9d8c9af086347901bf0ba3a5 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: 
 
 stdenv.mkDerivation rec {
-  name = "rewritefs-${version}";
+  pname = "rewritefs";
   version = "2017-08-14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix
index ecaa4e89d49d6f13e9f56aa8dbb1201e63c8fb05..1f5b31d0deb601e182a651dcd87979358a5ac77b 100644
--- a/pkgs/os-specific/linux/roccat-tools/default.nix
+++ b/pkgs/os-specific/linux/roccat-tools/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "roccat-tools-${version}";
+  pname = "roccat-tools";
   version = "5.9.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/roccat/${name}.tar.bz2";
+    url = "mirror://sourceforge/roccat/${pname}-${version}.tar.bz2";
     sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg";
   };
 
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index b29b1f639cf731ab6c323af4d0e9cf3705e43b64..447f9127d6071f9432fb004d547b4947d41b88b0 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -5,7 +5,7 @@ with lib;
 let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi";
 
 in stdenv.mkDerivation rec {
-  name = "rtlwifi_new-${version}";
+  pname = "rtlwifi_new";
   version = "2018-02-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix
index 2c02ef924c3f77ad3b2c75c61a1e2f082d3afb7d..316c98000795086f2015551c4cc684fc20333e75 100644
--- a/pkgs/os-specific/linux/schedtool/default.nix
+++ b/pkgs/os-specific/linux/schedtool/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "schedtool-${version}";
+  pname = "schedtool";
   version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "freequaos";
     repo = "schedtool";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp";
   };
 
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index a8d5112c63b9181a513ba084a9ed81b2ba22c145..5517f163b3e0d3f8889bf629deb495108428b650 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "sdparm-${version}";
+  pname = "sdparm";
   version = "1.10";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/sg/p/${name}.tar.xz";
+    url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz";
     sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
   };
 
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
index 527c94de46b3e5cab15e5c3272d72b026643118d..b8f80a0124c2aef62c29d5c70fd408582b8df4c2 100644
--- a/pkgs/os-specific/linux/selinux-python/default.nix
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 with python3.pkgs;
 
 stdenv.mkDerivation rec {
-  name = "selinux-python-${version}";
+  pname = "selinux-python";
   version = "2.7";
   se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
index 71d2ee6e80afbcc56cd40dddbbb01291e6dba255..99bbfbe7287a49cb59713c2ba712f41792ca3981 100644
--- a/pkgs/os-specific/linux/selinux-sandbox/default.nix
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 with python3.pkgs;
 
 stdenv.mkDerivation rec {
-  name = "selinux-sandbox-${version}";
+  pname = "selinux-sandbox";
   version = "2.7";
   se_release = "20170804";
 
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix
index 10ba1a3c7d07b1e94276584423243bf6e90c16f0..178d102381e094071d5c1c42bb76fee581dce385 100644
--- a/pkgs/os-specific/linux/semodule-utils/default.nix
+++ b/pkgs/os-specific/linux/semodule-utils/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libsepol }:
 
 stdenv.mkDerivation rec {
-  name = "semodule-utils-${version}";
+  pname = "semodule-utils";
   version = "2.7";
 
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
-    url = "${se_url}/${se_release}/${name}.tar.gz";
+    url = "${se_url}/${se_release}/${pname}-${version}.tar.gz";
     sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch";
   };
 
diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix
index 4067e5f70e27a844e2b7cdb709a2c7e92a3b5132..53250b345e8359502ce8838bab332aefc63be7a3 100644
--- a/pkgs/os-specific/linux/sepolgen/default.nix
+++ b/pkgs/os-specific/linux/sepolgen/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libsepol, python }:
 
 stdenv.mkDerivation rec {
-  name = "sepolgen-${version}";
+  pname = "sepolgen";
   version = "1.2.2";
   inherit (libsepol) se_release se_url;
 
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 6b808f0d6a63e066f314ff786d0f9667e149aa19..ccc0df59d108495017e0de655007cb665e9fe797 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "shadow-${version}";
+  pname = "shadow";
   version = "4.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
index de12b3719af3f0eb4aed6fe7a544a075a9e9e15b..f40652922d85a06c6b50853afb6155f92b157d56 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "smem-${version}";
+  pname = "smem";
   version = "1.5";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index 10b33b176d2170f2dd8b3cedfbc015c9d18197fa..f2fa48b9efbed731378cf96ed8208f62a0b0aa85 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "smemstat-${version}";
+  pname = "smemstat";
   version = "0.02.05";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix
index 449edf481a952af194bbf815acf2f61458290276..6f2e6306003b416e4449489ea3395f3a1d08b9c6 100644
--- a/pkgs/os-specific/linux/speedometer/default.nix
+++ b/pkgs/os-specific/linux/speedometer/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "speedometer-${version}";
+  pname = "speedometer";
   version = "2.8";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 80c5c1f650ba5c340f45fcd11358b04911bf63ce..3dbdb99549a15ea6d95b38b17e5dd3615842f3e9 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -11,11 +11,11 @@ let
   docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
 in
 stdenv.mkDerivation rec {
-  name = "sssd-${version}";
+  pname = "sssd";
   version = "1.16.4";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
+    url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz";
     sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb";
   };
 
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix
index c7543aee93372ae7e3659157e2ac3603f90d358c..db362613d374249c89e442c2f8ed6e58a3f13537 100644
--- a/pkgs/os-specific/linux/syscall_limiter/default.nix
+++ b/pkgs/os-specific/linux/syscall_limiter/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = "syscall_limiter-${version}";
+  pname = "syscall_limiter";
   version = "2017-01-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index cf1f2f242f476af6b7728919dbbde8cbc06c3b74..ce2bd1fa99f3eb15efd54a4c7bbc841f73972735 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "sysdig-${version}";
+  pname = "sysdig";
   version = "0.26.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b7f1af618feb86c56013e5ab106300444408d86e..45f4d60e4e3101a03d5cccac2407f7a7d10a641b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   version = "242";
-  name = "systemd-${version}";
+  pname = "systemd";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
   # Also fresh patches should be cherry-picked from that tree to our current one.
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 5df7bb827aadd04d765e9f0c050112e5ae6ee282..309d69ebad5c3c69f8d667503570ffe8c53ff4b2 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -4,7 +4,7 @@ let
   vanillaVersion = "7.6.q";
   patchLevel = "26";
 in stdenv.mkDerivation rec {
-  name = "tcp-wrappers-${version}";
+  pname = "tcp-wrappers";
   version = "${vanillaVersion}-${patchLevel}";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index faf47c96a5e6e1cd81da5ed2b2282ae9cddac764..299ac8ad22036fb188096ca3c786ea93310f6662 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "thunderbolt-${version}";
+  pname = "thunderbolt";
   version = "0.9.3";
   src = fetchFromGitHub {
     owner = "01org";
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix
index 3c833de8b0c328429b8060c3b4c246f80f65ed79..47b89f138c52e142fe5b092ec425b60707f3f0ba 100644
--- a/pkgs/os-specific/linux/tiptop/default.nix
+++ b/pkgs/os-specific/linux/tiptop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "tiptop-${version}";
+  pname = "tiptop";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/${name}.tar.gz";
+    url = "${meta.homepage}/releases/${pname}-${version}.tar.gz";
     sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i";
   };
 
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix
index 53b6cbc3401aed1c4a9ba352e643800842bb5012..dfcf4c9937b1f62b94dc60de3396e50298bdef6f 100644
--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@@ -16,12 +16,11 @@
 stdenv.mkDerivation rec {
   pname = "tiscamera";
   version = "0.9.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "TheImagingSource";
     repo = pname;
-    rev = "v-${name}";
+    rev = "v-${pname}-${version}";
     sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87";
   };
 
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 880fd61ec2c637657d3dcdcdaee0df6d03804e0d..9fde84060247e012596a547d86ee9f1864bee16e 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tomb-${version}";
+  pname = "tomb";
   version = "2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix
index b4e584f2979ba3301916cfc4afa154823d98425b..bb6d51669e6edc4e1b1a664b65c0cf5ba5dbca1f 100644
--- a/pkgs/os-specific/linux/tpacpi-bat/default.nix
+++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix
@@ -2,7 +2,7 @@
 
 # Requires the acpi_call kernel module in order to run.
 stdenv.mkDerivation rec {
-  name = "tpacpi-bat-${version}";
+  pname = "tpacpi-bat";
   version = "3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 3133602b44eb55e4c81ec5950cdce46b560d3f0a..e6571b46ee055459f99a04ba7eb4bfb259979675 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
 stdenv.mkDerivation rec {
-  name    = "trace-cmd-${version}";
+  pname = "trace-cmd";
   version = "2.8.3";
 
   src = fetchgit (import ./src.nix);
diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix
index 739bd4471927732ba2b1a25dc03dbb4a9a0ec8bf..d4f83eb8caf6ff54d4f98c210f98d657dd7b292f 100644
--- a/pkgs/os-specific/linux/untie/default.nix
+++ b/pkgs/os-specific/linux/untie/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "untie-${version}";
+  pname = "untie";
   version = "0.3";
   src = fetchurl {
-    url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2";
+    url = "http://guichaz.free.fr/untie/files/${pname}-${version}.tar.bz2";
     sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m";
   };
 
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index 1c5678b81e03acd6dd1795c65bdc45dc7318e984..efc7406cc19409b77d8ecbb9d8248c9c04c7c9db 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -16,12 +16,12 @@ assert libgcrypt != null -> libsodium == null;
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
-  name = "usbguard-${version}";
+  pname = "usbguard";
 
   repo = "https://github.com/USBGuard/usbguard";
 
   src = fetchurl {
-    url = "${repo}/releases/download/${name}/${name}.tar.gz";
+    url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k";
   };
 
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 0962bd91132981fd10225fbdae813abf08e9b7a0..b79a2cd342a87d7c837e70317936be502d089724 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -8,10 +8,11 @@ let
   patchVersion = "2";
 
 in stdenv.mkDerivation rec {
-  name = "util-linux-${version}";
+  pname = "util-linux";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz";
     sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3";
   };
 
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix
index 1a40ec50c99999e2d64d9b68bf513b6a48a00eea..19f59d0068064f62031766fb0265caafb2a34e13 100644
--- a/pkgs/os-specific/linux/uvcdynctrl/default.nix
+++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.0";
-  name = "uvcdynctrl-${version}";
+  pname = "uvcdynctrl";
 
   src = fetchFromGitHub {
     owner = "cshorler";
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index ede9fa682809bc82b13e7fce0a913be7e3139a5a..9bb6fcdd0a0069941fe8290a73a5768589aa0a09 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -7,11 +7,11 @@
 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
 
 mkDerivation rec {
-  name = "v4l-utils-${version}";
+  pname = "v4l-utils";
   version = "1.16.6";
 
   src = fetchurl {
-    url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
+    url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2";
     sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr";
   };
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 02e08bec7ad7fa6701e919af873a6c4c0e8c97f4..570eb4ca4ef3e594f37f3c5e9ba63ed0d04554f0 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
 
 stdenv.mkDerivation rec {
-  name = "wireguard-${version}";
+  pname = "wireguard";
   inherit (wireguard-tools) src version;
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index fa7250f7cee896e57ae4f84d41fa30f3ac97a5dd..69525c92ede97de4bafebdcc3c6dd9ba3001b2dc 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -6,10 +6,10 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "2.9";
 
-  name = "wpa_supplicant-${version}";
+  pname = "wpa_supplicant";
 
   src = fetchurl {
-    url = "https://w1.fi/releases/${name}.tar.gz";
+    url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
     sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw";
   };
 
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix
index 7911a2172ba08a2a682288ca9162a9d68353bc42..1c2aaa8ee01d5013b935e51add145323a5183f0e 100644
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/pkgs/os-specific/linux/x86info/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.30";
-  name = "x86info-${version}";
+  pname = "x86info";
 
   src = fetchurl {
-    url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz";
+    url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz";
     sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y";
   };
 
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix
index 5f7bca097bf629bb8ff246348c0409f1a209bc82..440a797a72326f1e6097f77e6054e5ca6015af29 100644
--- a/pkgs/os-specific/linux/xsensors/default.nix
+++ b/pkgs/os-specific/linux/xsensors/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }:
 
 stdenv.mkDerivation rec {
-  name = "xsensors-${version}";
+  pname = "xsensors";
   version = "0.70";
   src = fetchurl {
     url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz";
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index 3738760bb2904ddc80bde13b4dbfa2a8b64274b1..a6c74d029c57f96fda9e68d47e0483178c752de9 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "cygwin-setup-${version}";
+  pname = "cygwin-setup";
   version = "20131101";
 
   src = fetchcvs {
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
index 88af53dd046ec3483344fb4c58eca5acd5944248..fedfea15ccb0f7b2f19c81e9b72100b761fff92d 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -3,9 +3,10 @@
 let
   version = "2.5.1";
 in stdenv.mkDerivation rec {
-  name = "libgnurx-${version}";
+  pname = "libgnurx";
+  inherit version;
   src = fetchurl {
-    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz";
+    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz";
     sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
   };
 
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index a7d4f09b90e977b87d88fffcaab9741759b32a4a..022aaffe59618e5ac8c558d25e999e40aab53864 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -3,7 +3,8 @@
 let
   version = "5.0.4";
 in stdenv.mkDerivation {
-  name = "mingw-w64-${version}";
+  pname = "mingw-w64";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index de0f36dac5fab9f15945e4ee8b9d1f8e301b331d..286f4a0d41fb6b8e02bb8d8e2880c72f72ec321c 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "pthreads-w32-${version}";
+  pname = "pthreads-w32";
   version = "2.9.1";
 
   src = fetchzip {
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 9538747da6d10b4ece5ee78569c13314d12a4ade..14a0df257471232557aea4e4205f519fb631116c 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rabbitmq-server-${version}";
+  pname = "rabbitmq-server";
 
   version = "3.7.17";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
-    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr";
   };
 
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index dca2c072185620857570082f8edb378c588b0dc5..0c1c69982fa1bd48bd4a9a742febe4fbebcb39aa 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -50,7 +50,7 @@ with versionMap.${majorVersion};
 
 stdenv.mkDerivation rec {
   version = "${scalaVersion}-${kafkaVersion}";
-  name = "apache-kafka-${version}";
+  pname = "apache-kafka";
 
   src = fetchurl {
     url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz";
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 47ef9934a5e8485a1559547693234c28b2cd4e85..6e47fce3e4862f4d31e1e71c51241b13070eac56 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -8,7 +8,7 @@
 let
   common = {version, sha256, externals}: stdenv.mkDerivation rec {
     inherit version;
-    name = "asterisk-${version}";
+    pname = "asterisk";
 
     buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite
                     dmidecode libuuid newt
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 46160fee24b4d85327a93ffc56a89e7e9248d487..c9dcba28382578612f7fbbf475aae35770f49381 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-confluence-${version}";
+  pname = "atlassian-confluence";
   version = "6.15.8";
 
   src = fetchurl {
-    url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz";
+    url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
     sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3";
   };
 
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 1d0e28ac9f28e7021ea72304c47e001cc9e58ced..81b90091e669ed02bae0a35c20902921b9ca983d 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -2,11 +2,11 @@
 , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-crowd-${version}";
+  pname = "atlassian-crowd";
   version = "3.4.5";
 
   src = fetchurl {
-    url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
+    url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
     sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3";
   };
 
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 3a05c2d8d610a8895788f3e391aeadb2dcc8e129..2b7117f419f50fec3c1b39b179b9b25a71a3f58e 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "atlassian-jira-${version}";
+  pname = "atlassian-jira";
   version = "8.3.2";
 
   src = fetchurl {
diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index 528dc8a48a0b49798b24fd526d206ed41bc524f6..58ebbf88f78a8714f837a639e0a518d63110b78d 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   version = "1.11";
-  name = "beanstalkd-${version}";
+  pname = "beanstalkd";
 
   installPhase=''make install "PREFIX=$out"'';
 
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index e54394a9a7d5770493d648dbfc77a57287c3a870..d4b4441408e7d6de83ed3cc35177822dd42935b4 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -6,11 +6,12 @@ let
 
   generic = { version, sha256, enableIPv6 ? false }:
     stdenv.mkDerivation rec {
-      name = "bird-${version}";
+      pname = "bird";
+      inherit version;
 
       src = fetchurl {
         inherit sha256;
-        url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
+        url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
       };
 
       nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 4b71aaeca3ada5937bb7d44984296e58976a30b8..e21ad5723b0197d4cbb84c5ef74f2758c8136cab 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -12,7 +12,8 @@ daemonlib = fetchgit {
 in
 
 stdenv.mkDerivation rec {
-  name = "brickd-${version}";
+  pname = "brickd";
+  inherit version;
 
   src = fetchgit {
     url = "git://github.com/Tinkerforge/brickd.git";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 61316d0a60a171321a99cc53e21e904279bed486..675f1beb891d33714d03b1eff1a1d52bf86f1c1b 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "caddy-${version}";
+  pname = "caddy";
   version = "1.0.0";
 
   goPackagePath = "github.com/mholt/caddy";
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index befa36edd9e260c4731a6bd5df097a69aa8e9ff1..f9532d48a11de238a9b8d9c55f43c49acee48e7c 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "cayley-${version}";
+  pname = "cayley";
   version = "0.6.1";
 
   goPackagePath = "github.com/cayleygraph/cayley";
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 8530d8cb068e515f53f0cf229fba034c26852401..e48dec7d20c8cc4e9282edfcca7e9efcf4e9ac10 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clickhouse-${version}";
+  pname = "clickhouse";
   version = "19.13.1.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix
index 21a5bad72fc87cf74866f938b6249d41f64ef0a2..bf8623f0a893fc70d67005c2a256c4e51ee31c01 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/pkgs/servers/cloud-print-connector/default.nix
@@ -8,7 +8,7 @@
 # - https://github.com/Mic92/dotfiles/blob/ba2a01144cfdc71c829d872a3fc816c64663ad7f/nixos/vms/matchbox/modules/cloud-print-connector.nix
 
 buildGoPackage rec {
-  name = "cloud-print-connector-unstable-${version}";
+  pname = "cloud-print-connector-unstable";
   version = "1.16";
   rev = "481ad139cc023a3ba65e769f08f277368fa8a5de";
 
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 1b3e5466ec397d49f2abd105dae31196a348835d..c448e4936f64df7603d40885913e1a84ed065e2f 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "slurm-${version}";
+  pname = "slurm";
   version = "19.05.2.1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "SchedMD";
     repo = "slurm";
     # The release tags use - instead of .
-    rev = "${builtins.replaceStrings ["."] ["-"] name}";
+    rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
     sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir";
   };
 
diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix
index 84985b8f0eb3c506d5b496e71f9fafba7073171e..93794ce7052eef8a3919ade46cf6485192dbc49a 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@@ -2,7 +2,7 @@
 , jre, makeWrapper, bash, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "confluent-platform-${version}";
+  pname = "confluent-platform";
   version = "5.3.0";
   scalaVersion = "2.12";
 
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d364c2a5bcdfcae87f25628b8975ac406ea19f68..4c8877e92de44a6b46f1fdd1a20a23844e235a63 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul-${version}";
+  pname = "consul";
   version = "1.5.2";
   rev = "v${version}";
 
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index ad15db070f412cd1e85d6bf8c7cc0795c9322e53..e1d02d2f9d7424f772d2ae5c30dd5a4dc2770cce 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "coturn-${version}";
+  pname = "coturn";
   version = "4.5.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
index 8b2895392bec1c8ff1692537a05c10e296f46e12..a528cd2ca26e96b493cdac752dc2ccf8c2e8cfdf 100644
--- a/pkgs/servers/couchpotato/default.nix
+++ b/pkgs/servers/couchpotato/default.nix
@@ -3,7 +3,7 @@
 with pythonPackages;
 
 buildPythonApplication rec {
-  name = "couchpotato-${version}";
+  pname = "couchpotato";
   version = "3.0.1";
   disabled = isPy3k;
 
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index 1c093facde5cb9ec693025754995a886fd03bc5c..24e607f4b00cd78b4d668fdacb1240af6a994035 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  name = "dante-${version}";
+  pname = "dante";
   version = "1.4.2";
 
   src = fetchurl {
-    url = "https://www.inet.no/dante/files/${name}.tar.gz";
+    url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz";
     sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms";
   };
 
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 5056df06e5981d7bc3108f44fb981ffafcfeb9a4..8e89b6f980fa198e9d3b12e7bf2511e8f00bac4f 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dgraph-${version}";
+  pname = "dgraph";
   version = "0.8.2";
 
   goPackagePath = "github.com/dgraph-io/dgraph";
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index c45098b2ae09e5c62de6a664556cffbc5d5ed466..b4ad70f8277f4f843fd4f7e83e47fc40580783bf 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "dictd-${version}";
+  pname = "dictd";
   version = "1.12.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 13e4757fe89e4df406904553bda3fa011a03d501..b7dbf04026d2feb2d43e289a4f5ecb0d3edf8314 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "20161001";
-  name = "dict-db-wiktionary-${version}";
+  pname = "dict-db-wiktionary";
   data = fetchurl {
     url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
     sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m";
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 8a1bb6313ad2d21d480a62afd3287ad1cec9ae32..2c97101d9cbb6a8c82bda2331757b42277cc43f2 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "542";
-  name = "dict-db-wordnet-${version}";
+  pname = "dict-db-wordnet";
 
   buildInputs = [python wordnet];
   convert = ./wordnet_structures.py;
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
index f5c0cf230af3e3231d370604311bf83f8c6a0834..d9f831c862fb0d260ee427623968956969f6a19c 100644
--- a/pkgs/servers/dict/libmaa.nix
+++ b/pkgs/servers/dict/libmaa.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.2";
-  name = "libmaa-${version}";
+  pname = "libmaa";
 
   src = fetchurl {
     url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz";
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index aefa3af83363ff1ff577b227c6b1b9bd53bce83e..cf81d9b4b9af356b45a3d717759217bb31151895 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "diod-${version}";
+  pname = "diod";
   version = "1.0.24";
 
   src = fetchurl {
-    url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/chaos/diod/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
   };
 
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 0b40b99cfc16c25f1a0daeab223de347916c236c..af914ae6cd72d78810378854f5606451d2be462b 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -11,10 +11,11 @@ assert enablePython -> python3 != null;
 let version = "9.14.4"; in
 
 stdenv.mkDerivation rec {
-  name = "bind-${version}";
+  pname = "bind";
+  inherit version;
 
   src = fetchurl {
-    url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii";
   };
 
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 214c3e91f0ef02cbacb0841fa213ad433af6a61f..def78223f1270610a5b138ea7cfd2b52c1184de4 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "coredns-${version}";
+  pname = "coredns";
   version = "1.3.1";
 
   goPackagePath = "github.com/coredns/coredns";
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index 6757542050af2e9bd8910b0199950fe5a52c3cf9..cb004a596d22c08a7ba632a500b1d2ba1c1c518f 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, systemd
 , boost, libsodium, libedit, re2
 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec {
-  name = "dnsdist-${version}";
+  pname = "dnsdist";
   version = "1.3.2";
 
   src = fetchurl {
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 718028b2bc0c2002e781b0d01709dc5361e742cd..8191bf5acbf119663342f67e7550e6f8f2694a68 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -6,7 +6,7 @@ let inherit (stdenv.lib) optional optionals; in
 
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
-  name = "knot-dns-${version}";
+  pname = "knot-dns";
   version = "2.8.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1d8896bfc10f781046bf816d700521d1e2fcc4b8..22b1f2a67e2cf51ef5888cdfbdaf5593fed22015 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -22,11 +22,11 @@ exportLuaPathsFor = luaPkgs: ''
 '';
 
 unwrapped = stdenv.mkDerivation rec {
-  name = "knot-resolver-${version}";
+  pname = "knot-resolver";
   version = "4.2.0";
 
   src = fetchurl {
-    url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
+    url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
     sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4";
   };
 
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index fcddd569b361acf105fbff8947cd52858c747a7b..0a584ce1acaabfd44c6a9ace2ea98e6315579b14 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -7,7 +7,7 @@ assert enableProtoBuf -> protobuf != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pdns-recursor-${version}";
+  pname = "pdns-recursor";
   version = "4.2.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 3c63b6d8eb75768f7c3120db9824073b2f003d46..76c346180cdbb0ce1ab0f4fb99e991c24fe20e2d 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "powerdns-${version}";
+  pname = "powerdns";
   version = "4.1.13";
 
   src = fetchurl {
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index e71abb8bc00f01f97b52a493903c5bdf431fe6fd..0a0b6c0e1d1ab03c1a92cb4ef9594b0af2021796 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "echoip-${version}";
+  pname = "echoip";
   version = "unstable-2018-11-20";
 
   goPackagePath = "github.com/mpolden/echoip";
diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix
index d52fdd14301d4345aa63460b13bf29675f8442d6..5293b18368e7b48bde8a482471753ec5058fa67f 100644
--- a/pkgs/servers/elasticmq-server-bin/default.nix
+++ b/pkgs/servers/elasticmq-server-bin/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "elasticmq-server";
   version = "0.14.6";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar";
+    url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar";
     sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz";
   };
 
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index d3c5555fa6ad4f846f9c867af9c5dab3a1ec5bfc..5a693fd75291ee3a26c29cb3826e32743bbbbbf2 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "etcd-${version}";
+  pname = "etcd";
   version = "3.3.13"; # After updating check that nixos tests pass
   rev = "v${version}";
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index 5e2381ada1d10ed2b9a5c7457ee97cec5575c633..1e05c856ab5eb41f02863d16ebdea830f91e05bf 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }:
 stdenv.mkDerivation rec {
-  name = "exhibitor-${version}";
+  pname = "exhibitor";
   version = "1.5.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 8bab12116b02390fae83975cf482f68e4c130fba..c8ddcf438f7b769e36d0efb4523d7b7f2b26b000 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcgiwrap-${version}";
+  pname = "fcgiwrap";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index 5ce680e36460e6dc0d7c8c90b2fd9db6bd0fd9dd..7be7416d04d59cbde5bab27ac15a0cc5f1c1ef15 100644
--- a/pkgs/servers/felix/default.nix
+++ b/pkgs/servers/felix/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "apache-felix-${version}";
+  pname = "apache-felix";
   version = "5.6.1";
   src = fetchurl {
     url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz";
diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix
index 3ac3c98718f79874d5d42ae3243cbde91f3ccd69..2fe628db0466be82992cc2e8aca2b555bc1225e1 100644
--- a/pkgs/servers/felix/remoteshell.nix
+++ b/pkgs/servers/felix/remoteshell.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.2";
-  name = "apache-felix-remoteshell-bundle-${version}";
+  pname = "apache-felix-remoteshell-bundle";
   src = fetchurl {
     url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar";
     sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq";
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index caf7d8360f076ddaaa2818432e7181d034c4405e..31de5925916147d1eac590b62df6e6dfa800becc 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.5.7.27050-0";
-  name = "firebird-${version}";
+  pname = "firebird";
 
   # enableParallelBuilding = false; build fails
 
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 87e4a22b0514fbb8da22bae5e9832a94dec38263..e8a1a633e4db4233b3c2b2c0bd4e29ad8bc615ea 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -22,7 +22,7 @@ let
     , officialRelease ? true
     , patches ? []
     }: stdenv.mkDerivation rec {
-        name = "foundationdb-${version}";
+        pname = "foundationdb";
         inherit version;
 
         src = fetchFromGitHub {
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index 0eb71492be3e46fdac2b0cc4f50c4e9f1b475aaf..34b9f6ecaf0d19b3a11a3516e24b83c6fcb2b8db 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -46,7 +46,7 @@ let
 
     , patches ? []
     }: stdenv.mkDerivation rec {
-        name = "foundationdb-${version}";
+        pname = "foundationdb";
         inherit version;
 
         src = fetchFromGitHub {
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index ed36b33bdebc1b1eca3a758af454e39ca36c390b..6c6eb2b0c0910fc00e9c7b25f258fb993465f098 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -42,7 +42,7 @@ assert withRest -> curl != null && withJson;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "freeradius-${version}";
+  pname = "freeradius";
   version = "3.0.19";
 
   src = fetchurl {
diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix
index e8e08271b3bce66d801845efd12149af8655364f..1bb2ebc4f86813382833678d1488260fb72700bf 100644
--- a/pkgs/servers/gnatsd/default.nix
+++ b/pkgs/servers/gnatsd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "gnatsd-${version}";
+  pname = "gnatsd";
   version = "1.4.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix
index 754cba58825836967a9262cc4aed8fb3f741b936..1bec32e5125bc832c361c71336205b95000566be 100644
--- a/pkgs/servers/gopher/gofish/default.nix
+++ b/pkgs/servers/gopher/gofish/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "gofish-${version}";
+  pname = "gofish";
   version = "1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/gofish/gofish/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz";
     sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s";
   };
   	
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index ebade244bdf7e4ce6fb135278ab397c868d8e9c2..da24b0a0e26e8564edb71dd7bc475e4e4cce8142 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gotty-${version}";
+  pname = "gotty";
   version = "0.0.13";
   rev = "v${version}";
 
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index c4be1f3c3b34a90c801c70db7bd5cb7a6cd399e0..ff127e705e50b7ab6f2d779fc91fca0fd947f697 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, jre, makeWrapper }:
 stdenv.mkDerivation rec {
-  name = "h2-${version}";
+  pname = "h2";
 
   version = "1.4.193";
 
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 6a33ac638d215f3d4e9ee04d8a0514d48f488171..3d05933f513064b0857a3c8a3ef9067be552797e 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper }:
 stdenv.mkDerivation rec {
-  name = "hbase-${version}";
+  pname = "hbase";
   version = "0.98.24";
 
   src = fetchurl {
diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
index 58033edb07d7f57f30e94968cf913a5295f44133..7bc2da8b023999eacb43039d28b2439ad38c38f9 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, docutils, libev, openssl, pkgconfig }:
 stdenv.mkDerivation rec {
   version = "1.5.0";
-  name = "hitch-${version}";
+  pname = "hitch";
 
   src = fetchurl {
-    url = "https://hitch-tls.org/source/${name}.tar.gz";
+    url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz";
     sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf";
   };
 
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 5f8884cbd3b71132a726a7a05b73056a87ff25ee..5d4d88e1cda87ff3149c314b35f1c7767bbd89b3 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -58,6 +58,10 @@ in python.pkgs.buildPythonApplication rec {
   # no tests implemented
   doCheck = false;
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml"
+  '';
+
   meta = with lib; {
     description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
     homepage = https://github.com/home-assistant/appdaemon;
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 664953ca34dc339918812b4a3a80ef96a8cfd9b8..6e4be4a36fea91b8ae0ba359cdb49081bc4f85f2 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -7,7 +7,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "4store-${version}";
+  pname = "4store";
   version = "1.1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 3c3d4c20df1b28755aceeff4e6363bf91385418c..4ffbb0100167a1917408413b725708a5526414a6 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -17,7 +17,7 @@ assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
   version = "2.4.39";
-  name = "apache-httpd-${version}";
+  pname = "apache-httpd";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 8a773631ee6c3999c53426e91f0fb0d442fa6c18..6bad43a62f0ae0aca82d47969909169345ff2848 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mod_auth_mellon-${version}";
+  pname = "mod_auth_mellon";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index ff767d9ad437113d64a1ac5231062a59eca17d0e..a6f4f99267105da72bd47e9adfd359cfe6b54dad 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -10,7 +10,8 @@ let
     };
 in
 stdenv.mkDerivation {
-  name = "mod_fastcgi-${version}";
+  pname = "mod_fastcgi";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index a0fa4b4bca9633d012b5b7c058d0c6cde4501322..0e17cc40efe3bfba4c196cfd3e06ff346d084dae 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, apacheHttpd, python, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "mod_wsgi-${version}";
+  pname = "mod_wsgi";
   version = "4.6.7";
 
   src = fetchurl {
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index aa826a9c528b3360c4f5ab9fc495f9ad97b692a4..65ec2510d342e7bf4c647476d506265276cae8d7 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apt-cacher-ng-${version}";
+  pname = "apt-cacher-ng";
   version = "3.2";
 
   src = fetchurl {
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index b3c4abfed9068bf0cc006cf81a76efbf075ef797..a9d806f9de8418aeeb0e0e93cc9c881d2d99cf80 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -2,14 +2,14 @@
 , coreutils, bash, makeWrapper, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "couchdb-${version}";
+  pname = "couchdb";
   version = "2.3.1";
 
 
   # when updating this, please consider bumping the OTP version
   # in all-packages.nix
   src = fetchurl {
-    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
     sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3";
   };
 
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 2299f732a76e01593a7aefc6b0cef95db2c3fda4..f2e5e67dd7ac989f6b6cb1dd98810179dba51386 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -2,11 +2,11 @@
 , sphinx, which, file, pkgconfig, getopt }:
 
 stdenv.mkDerivation rec {
-  name = "couchdb-${version}";
+  pname = "couchdb";
   version = "1.7.1";
 
   src = fetchurl {
-    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
     sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
   };
 
diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index 3efc97f6296bf10c413e27c0c92ac163f3303a95..42de9904f90a2df65247a4f6d2f930ff7eca149e 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "darkhttpd-${version}";
+  pname = "darkhttpd";
   version = "1.12";
 
   src = fetchurl {
-    url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2";
+    url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2";
     sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
   };
 
diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix
index 19b2d01f5be8560c38f44b4e850ecdbe653aac70..395504e49703b4157089a4a26486365db084890b 100644
--- a/pkgs/servers/http/gatling/default.nix
+++ b/pkgs/servers/http/gatling/default.nix
@@ -4,10 +4,11 @@ let
   version = "0.15";
 in
 stdenv.mkDerivation rec {
-  name = "gatling-${version}";
+  pname = "gatling";
+  inherit version;
 
   src = fetchurl {
-    url = "https://www.fefe.de/gatling/${name}.tar.xz";
+    url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz";
     sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg";
   };
 
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
index afa48eeafc2ececee7a502767d2bf2a8fb72e1a8..26c320499e55e7f000642487ac984090e389ff9b 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/pkgs/servers/http/h2o/default.nix
@@ -6,7 +6,7 @@
 with builtins;
 
 stdenv.mkDerivation rec {
-  name = "h2o-${version}";
+  pname = "h2o";
   version = "2.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 742db5567075e8ee28f939763a9b0ec38c1ff45c..a3bcb64e6c057d552d5b631b3e407a281a9221f8 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -16,7 +16,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hiawatha-${version}";
+  pname = "hiawatha";
   version = "10.9";
 
   src = fetchFromGitLab {
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 80a3d6b105cb97f1543ba25e4ceacbef783d6ae6..5ce44322e92f508507cf88cba455ee3e72bf200a 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jetty-${version}";
+  pname = "jetty";
   version = "9.4.16.v20190411";
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix
index 878211ebf024da7dbaed98c5a5478206c4c02abb..f692832e882be445329964de0321121af4ce6de3 100644
--- a/pkgs/servers/http/lwan/default.nix
+++ b/pkgs/servers/http/lwan/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "lwan";
   version = "0.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "lpereira";
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index b18e1ea162f020cab05cdb7c3264bdf4ca40486a..3c29ddb8e0a6ca41c7534cd9120a21418aa07d3c 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -4,10 +4,11 @@
 let version = "0.11"; in
 
 stdenv.mkDerivation rec {
-  name = "myserver-${version}";
+  pname = "myserver";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
+    url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz";
     sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax";
   };
 
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index d670e1592c2772ff0c3c6d3d1763a6c205a19810..e74d2f84d6272b02e857270f0c11267de317dd2c 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -21,7 +21,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nginx-${version}";
+  pname = "nginx";
+  inherit version;
 
   src = fetchurl {
     url = "https://nginx.org/download/nginx-${version}.tar.gz";
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 479c9e41aa91de20474fc6a7b1378ee2a6c48e41..bef7f43ea71f0311179ccd4dcb51efd25c7128ee 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -3,7 +3,7 @@
 , lighttpd, iproute }:
 stdenv.mkDerivation rec {
   version = "2014-06-29-1";
-  name = "nix-binary-cache-${version}";
+  pname = "nix-binary-cache";
 
   phases = ["installPhase"];
 
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 6bb4ce46a43b3fedb9af771b00447852c483deb4..3990c5de81850ef0eec01515831437ac0628f956 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -4,7 +4,7 @@ gd, geoip, perl }:
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openresty-${version}";
+  pname = "openresty";
   version = "1.15.8.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index c38ca046a35b78202f8339f61b61417fe5681112..19d0b9a2641cb771120fd43274aec7d37f1b58e0 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  name = "pshs-${version}";
+  pname = "pshs";
   version = "0.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
index b5d5d5f7992d39f5e95edaeefa72fd6ae87361e9..d118e8af66d4d9c6bbd27038bdb5f034f8672f77 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "spawn-fcgi-${version}";
+  pname = "spawn-fcgi";
   version = "1.6.4";
 
   src = fetchsvn {
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index cac31ed9d5959ad8f0bd8217e0fa28c4cd0d9462..a7ea61de04202cab1a4b347ed93d65b431f1f897 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.3.1";
-  name = "tengine-${version}";
+  pname = "tengine";
 
   src = fetchurl {
     url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 6e012c98737e1a844650ee0bcd60481c01bbc2c9..b72439bc37a2581bdacb6156b812571c5efae051 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "thttpd-${version}";
+  pname = "thttpd";
   version = "2.29";
 
   src = fetchurl {
-    url = "https://acme.com/software/thttpd/${name}.tar.gz";
+    url = "https://acme.com/software/thttpd/${pname}-${version}.tar.gz";
     sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
   };
 
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 5da89200816fa3f4f210eeada54638a329be11ce..59a4ab6e5b491c3cc1f77d88abd0a4568e977268 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apacheAnt, jdk, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "axis2-${version}";
+  pname = "axis2";
   version = "1.7.9";
 
   src = fetchurl {
-    url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
+    url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip";
     sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
   };
 
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index fded6bdfafba951aaea1c0133fc80b95aef6ead5..38b4974e1554df6551a5d301b0e057126b4589e2 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -3,11 +3,11 @@
 let
 
   common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
-    name = "apache-tomcat-${version}";
+    pname = "apache-tomcat";
     version = "${versionMajor}.${versionMinor}";
 
     src = fetchurl {
-      url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
+      url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index f802024ea876c377a965e0b41859a53b459f1e9c..0c0f118d0b91ed408d2f22a94dd1540429483113 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -16,7 +16,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.10.0";
-  name = "unit-${version}";
+  pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix
index 3fb3890f9c4e9c721efcb68214e73513652d4951..79c7d9e9eca1c01689e56b26ff11a13f43a4bf90 100644
--- a/pkgs/servers/http/webfs/default.nix
+++ b/pkgs/servers/http/webfs/default.nix
@@ -7,11 +7,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "webfs-${version}";
+  pname = "webfs";
   version = "1.21";
 
   src = fetchurl {
-    url = "https://www.kraxel.org/releases/webfs/${name}.tar.gz";
+    url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz";
     sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a";
   };
 
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index 5d6b47d28b5d10f4be8ac14dd86cbbbb0e3879c3..707b48786483ae4b326388be023b61180a04c9e2 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "webhook-${version}";
+  pname = "webhook";
   version = "2.6.8";
 
   goPackagePath = "github.com/adnanh/webhook";
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 827f6122b5732b1621a2243829f91ec6edbf4765..109f7bc06dcdc6a6227989b8efd42841a6911b71 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, erlang, pam, perl }:
 
 stdenv.mkDerivation rec {
-  name = "yaws-${version}";
+  pname = "yaws";
   version = "2.0.6";
 
   src = fetchurl {
-    url = "http://yaws.hyber.org/download/${name}.tar.gz";
+    url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz";
     sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9";
   };
 
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 912e520180e6d407e073cef77bda2b45a2be7759..075226f36078d98f9b6c246200d259fab381fba9 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -2,7 +2,7 @@
 , quicktemplate, go-bindata, easyjson }:
 
 buildGoPackage rec {
-  name = "hydron-unstable-${version}";
+  pname = "hydron-unstable";
   version = "2019-02-17";
   goPackagePath = "github.com/bakape/hydron";
   goDeps = ./deps.nix;
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 280df5f00d2a4700a80c94c85e29a7427c9a63f6..9cdfd8d2b3380fffc75933c5f38200dfacbf3b21 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
-  name = "icingaweb2-${version}";
+  pname = "icingaweb2";
   version = "2.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix
index fdad63d67af4b0ddabb00332f6b507691d5265ab..8171f61c112dabcdb0fa9f1a14da11d6cd8269af 100644
--- a/pkgs/servers/identd/nullidentdmod/default.nix
+++ b/pkgs/servers/identd/nullidentdmod/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "nullidentdmod-${version}";
+  pname = "nullidentdmod";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix
index e60a1f54f4246cc7bcbe7f61206cf1bc8f90b890..85d1186f525ac341d9fac9df2ccb27e05a8aa93a 100644
--- a/pkgs/servers/identd/oidentd/default.nix
+++ b/pkgs/servers/identd/oidentd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "oidentd-${version}";
+  pname = "oidentd";
   version = "2.4.0";
   nativeBuildInputs = [ bison flex ];
 
   src = fetchurl {
-    url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz";
+    url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li";
   };
 
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index f57c94cd108492eb3d4ffd53645d233aea8e13dc..9823a36d7545f90e968ac74c15b8f8a58169b2e7 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -3,7 +3,7 @@
 , buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "interlock-${version}";
+  pname = "interlock";
   version = "2016.04.13";
   rev = "v${version}";
 
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index 002760ff0fd3b07c0a2924bae4ca00b69a8d06f2..e7d6d9ac52a595d5d1bf072924a70b8c76412aad 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -2,7 +2,7 @@
 , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation rec {
-  name = "irker-${version}";
+  pname = "irker";
   version = "2017-02-12";
 
   src = fetchFromGitLab {
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 8369cdce4d531fa182cf600fdc4dc2ebbd7feea5..0299c02814807531b1bb4b5074dad3d95d3aa8fc 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "jackett-${version}";
+  pname = "jackett";
   version = "0.11.589";
 
   src = fetchurl {
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${name}}
-    cp -r * $out/share/${name}
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}
 
     makeWrapper "${mono}/bin/mono" $out/bin/Jackett \
-      --add-flags "$out/share/${name}/JackettConsole.exe" \
+      --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \
       --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib"
   '';
 
diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix
index bbf39e5be4663f37f1dcd09de1d5838d29f21ff7..2f8241e7b09d1e7ea31af3e61bf2f46af1824b75 100644
--- a/pkgs/servers/jetbrains/youtrack.nix
+++ b/pkgs/servers/jetbrains/youtrack.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "youtrack-${version}";
+  pname = "youtrack";
   version = "2018.2.44329";
 
   jar = fetchurl {
-    url = "https://download.jetbrains.com/charisma/${name}.jar";
+    url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar";
     sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk";
   };
 
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index 3ebcaf7286b462ff2a3fad49fed1be13243de5d2..bec8ccbbf18dc2a94327f96e2de15839fafcb2a5 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -60,10 +60,10 @@ let
   };
 
 in stdenv.mkDerivation rec {
-    name = "kippo-${version}";
+    pname = "kippo";
     version = "0.8";
     src = fetchurl {
-      url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz";
+      url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz";
       sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d";
     };
     buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix
index 7c7755dee482be3f0b51f83bdf09e1c94ff0239c..4eb0b26c30665b68e424a3ff42d40602b618f99a 100644
--- a/pkgs/servers/kwakd/default.nix
+++ b/pkgs/servers/kwakd/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "kwakd-${version}";
+  pname = "kwakd";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index fc88d645f27aa364775ff7cf17f42215a776a4ed..43ddc5f7b0f49d747af1436b6b8aadbdd1eacce8 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "lidarr-${version}";
+  pname = "lidarr";
   version = "0.6.2.883";
 
   src = fetchurl {
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 2e17001abc50ed3e04b8df3d1cdb215520703e10..798bda8e306e5a683f74efd4df4ae5227dc19c50 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -3,7 +3,7 @@
 }:
 
 buildGoPackage rec {
-  name = "livepeer-${version}";
+  pname = "livepeer";
   version = "0.2.4";
 
   goPackagePath = "github.com/livepeer/go-livepeer";
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 080cbc89775680059128068b20e78eaa6b891f1a..5a318c311af8331214249365e73bb857a42c22ae 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, openssl, perl, zlib, jam }:
 stdenv.mkDerivation rec {
   version = "3.2.0";
-  name = "archiveopteryx-${version}";
+  pname = "archiveopteryx";
 
   src = fetchurl {
-    url = "http://archiveopteryx.org/download/${name}.tar.bz2";
+    url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2";
     sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
   };
 
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index dce0b91740926f637c6afcb9fa042202c8757576..b7d791f3416617ddd9794a6b17e5698d870bdfee 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dovecot, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-pigeonhole-${version}";
+  pname = "dovecot-pigeonhole";
   version = "0.5.7.2";
 
   src = fetchurl {
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
index 019c84d2898bd9c3ec255fbec751bf748bddc778..429d735ffcd0bfe3b34dc3ee3e404ab7ffd1b970 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "MailHog-${version}";
+  pname = "MailHog";
   version = "1.0.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e9f66b92be29f7b232320a3a0f506f9435094dfc
--- /dev/null
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python2 }:
+
+stdenv.mkDerivation rec {
+  pname = "mailman";
+  version = "2.1.29";
+
+  src = fetchurl {
+    url = "mirror://gnu/mailman/${pname}-${version}.tgz";
+    sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
+  };
+
+  buildInputs = [ python2 python2.pkgs.dnspython ];
+
+  patches = [ ./fix-var-prefix.patch ];
+
+  configureFlags = [
+    "--without-permcheck"
+    "--with-cgi-ext=.cgi"
+    "--with-var-prefix=/var/lib/mailman"
+  ];
+
+  installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'.
+
+  makeFlags = [ "DIRSETGID=:" ];
+
+  meta = {
+    homepage = https://www.gnu.org/software/mailman/;
+    description = "Free software for managing electronic mail discussion and e-newsletter lists";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.peti ];
+  };
+}
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index 98b270ad7d41317565a1f0d666349103fcf3943b..2c1c07e502a7c6314cee5e51fbcb8698a5add937 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mlmmj-${version}";
+  pname = "mlmmj";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "http://mlmmj.org/releases/${name}.tar.gz";
+    url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn";
   };
 
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index 4b753bdf0cdb102dd6c1682e38bd977243f572ca..7738c4eb3d4ad1acb38b4aee956f170bde53d856 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -5,7 +5,7 @@ assert tls -> gnutls != null;
 stdenv.mkDerivation rec {
 
   version = "2.2";
-  name = "nullmailer-${version}";
+  pname = "nullmailer";
 
   src = fetchurl {
     url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 2e1b3a4f7980ed1f38ff5343c620836375997441..fdc2b3fd2c42909dee5b93b2750aee30abbcd5e8 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensmtpd-${version}";
+  pname = "opensmtpd";
   version = "6.4.2p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib libressl db pam ];
 
   src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
     sha256 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd";
   };
 
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 1d4ad63c37d2acef99007985d2bccfe026a8fb10..71b27facbab67bca02826177f94ad3134fdb319a 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -10,11 +10,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensmtpd-extras-${version}";
+  pname = "opensmtpd-extras";
   version = "6.4.0";
 
   src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
     sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb";
   };
 
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index a4b0b921adb29ebc518920401b075356c081b4b5..39845f12f03cdc9c02f94337bc9b7b933a8b532f 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -24,12 +24,12 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "postfix-${version}";
+  pname = "postfix";
 
   version = "3.4.6";
 
   src = fetchurl {
-    url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
+    url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
     sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n";
   };
 
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
index 8c00bcdbee25003cc314c695c00c5d3bb38d722b..890cd1880535f49bbafb2587075793d89a4574a7 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -22,7 +22,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "pfixtools-${version}";
+  pname = "pfixtools";
+  inherit version;
 
   src = pfixtoolsSrc;
 
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index f13c57e3b35d562e3a26ed13bb83a495c3e48703..49854927e57f8ecf3748c99145f2553762840c39 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "postsrsd-${version}";
+  pname = "postsrsd";
   version = "1.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix
index d5e410a86c1f5b5418fd4213f81ca3e2219f684f..5da94ca80269e441de8c03fad391034e2ee8c604 100644
--- a/pkgs/servers/mail/pypolicyd-spf/default.nix
+++ b/pkgs/servers/mail/pypolicyd-spf/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonApplication, fetchurl, pyspf }:
 
 buildPythonApplication rec {
-  name = "pypolicyd-spf-${version}";
+  pname = "pypolicyd-spf";
   majorVersion = "2.0";
   version = "${majorVersion}.2";
 
   src = fetchurl {
-    url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z";
   };
 
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9d7730e399f3ac53cd52f7fb6c346e88b87504f1
--- /dev/null
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre
+, libmilter, opendkim, libmemcached, glib }:
+
+let patchedLibmilter = stdenv.lib.overrideDerivation  libmilter (_ : {
+    patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ];
+});
+in
+
+stdenv.mkDerivation rec {
+  pname = "rmilter";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "vstakhov";
+    repo = "rmilter";
+    rev = version;
+    sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh";
+  };
+
+  nativeBuildInputs = [ bison cmake flex pkgconfig ];
+  buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/vstakhov/rmilter;
+    license = licenses.asl20;
+    description = ''
+      Daemon to integrate rspamd and milter compatible MTA, for example
+      postfix or sendmail
+    '';
+    maintainers = with maintainers; [ avnik fpletz ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 67a647b236b441fa02929914804c7a3cb550bdf1..2b3986c412d06339a79ea5562190db2392c0e551 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -13,7 +13,7 @@ let libmagic = file;  # libmagic provided by file package ATM
 in
 
 stdenv.mkDerivation rec {
-  name = "rspamd-${version}";
+  pname = "rspamd";
   version = "1.9.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 9e5a9ffe780d11ca9556b71c1e7c67e3743bc02b..673d3f1f21bbf43d79d681a4738e5741e41bc716 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchurl }:
 
 buildGoPackage rec {
-  name = "matterbridge-${version}";
+  pname = "matterbridge";
   version = "1.11.0";
 
   goPackagePath = "github.com/42wim/matterbridge";
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 2fc8232f0a2894eaee54cebc85b0ffbf9a429d93..2919647e5734a744c53719fc94bbf906fcd73b55 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -4,7 +4,8 @@ let
   version = "5.9.0";
 
   mattermost-server = buildGoPackage rec {
-    name = "mattermost-server-${version}";
+    pname = "mattermost-server";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "mattermost";
@@ -23,7 +24,8 @@ let
   };
 
   mattermost-webapp = stdenv.mkDerivation {
-    name = "mattermost-webapp-${version}";
+    pname = "mattermost-webapp";
+    inherit version;
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 6707055eaa6bfbe8f503e4b807afa4d47c8ad080..bb6d1584a670b024c9f37097bfbae95c25ed2c54 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "matterircd-${version}";
+  pname = "matterircd";
   version = "0.18.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 824f8ea20259255ee27d4ffc4279cc64ea8d72de..3d79d8421dd218d8455303fae837cf682f3dcc33 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mautrix-unstable-${version}";
+  pname = "mautrix-unstable";
   version = "2019-07-04";
 
   goPackagePath = "maunium.net/go/mautrix-whatsapp";
diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index 33b7674cf9e52e989d4d112dc0fc9faeefdefd6f..33151c4063b3d51c6a126793a127e436484bee5f 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "mediatomb-${version}";
+  pname = "mediatomb";
   version = "0.12.1";
 
   src = fetchgit {
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 06e9f3fc961fad0dee0caf2e204eb839b1a940c1..326fae6bcf7a62e82986cd5a51a74be79582067b 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -3,7 +3,7 @@
 , nodePackages, emscripten, opencv, statik }:
 
 buildGoPackage rec {
-  name = "meguca-unstable-${version}";
+  pname = "meguca-unstable";
   version = "2019-03-12";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index f30b5af6cad51145b0805a99375ab2176d00ac34..a9873261d78e42fd08777558821a306d75605335 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.16";
-  name = "memcached-${version}";
+  pname = "memcached";
 
   src = fetchurl {
-    url = "https://memcached.org/files/${name}.tar.gz";
+    url = "https://memcached.org/files/${pname}-${version}.tar.gz";
     sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5";
   };
 
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index fe1f1c6760d8a430f901d1e840961d715574a6e3..8430f2d61e8e901ef9fa021ac9e8c6890da608ab 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mesos-dns-${version}";
+  pname = "mesos-dns";
   version = "0.1.2";
   rev = "v${version}";
   
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index a20793a849cf458daea1f852a28edd588f845ee1..b6a70864cc5c1747009bdce35965237e3f6250a1 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "minio-${version}";
+  pname = "minio";
   version = "2019-02-26T19-51-46Z";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix
index 10c8811c548faf9072b2dbd021d3c84789fc3855..48817f76bdae2fd4b4b2a888a31ca33a04034103 100644
--- a/pkgs/servers/mirrorbits/default.nix
+++ b/pkgs/servers/mirrorbits/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, zlib, geoip }:
 
 buildGoPackage rec {
-  name = "mirrorbits-${version}";
+  pname = "mirrorbits";
   version = "0.4";
   rev = "v${version}";
 
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index a7fb0b3b3a77926aad99ceaa6f03ffc9c1f1969f..1afe1e8b9462d51aafe0a4e680293ca3b0361476 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "airsonic-${version}";
+  pname = "airsonic";
   version = "10.4.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
index 50e754791e6d6cec866baee9c198e7e38a5112fb..be5188f177ac11eb5f110c4a25e2f83e02eb7b11 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "subsonic-${version}";
+  pname = "subsonic";
   version = "6.1.5";
 
   src = fetchurl {
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
   # for a directory to be created in the unpack phase.
   unpackPhase = ''
     runHook preUnpack
-    mkdir ${name}
-    tar -C ${name} -xzf $src
+    mkdir ${pname}-${version}
+    tar -C ${pname}-${version} -xzf $src
     runHook postUnpack
   '';
   installPhase = ''
     runHook preInstall
     mkdir $out
-    cp -r ${name}/* $out
+    cp -r ${pname}-${version}/* $out
     runHook postInstall
   '';
 
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index f15b7ca2e8216a73b4003466d4f65d28118df573..0ab921a6f6f8c091a39fc55953d4eed5510a9b99 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "taskserver-${version}";
+  pname = "taskserver";
   version = "1.1.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index c8eb07319245e3f37d40cd3dd41ce2ba06e2183c..957bb59b12144c289da879d33d10f523747d273f 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "bosun-${version}";
+  pname = "bosun";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index d6f3e18e49bc1be97af76d2df04154f3bfa789e8..029d87009560fb1e2e8268fda10782a5ff998cf6 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cadvisor-${version}";
+  pname = "cadvisor";
   version = "0.34.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index a888549bb6aa99918fc3f229fa95ce816651f9ab..707d0129f70b307eb0e7d279c4ee1bea9d6ec297 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul-alerts-${version}";
+  pname = "consul-alerts";
   version = "0.5.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix
index efa62e261b7475036c6d881a40b482f5f1bc68da..e5f30f4e614666901c16a81e96a2237b33e2102d 100644
--- a/pkgs/servers/monitoring/facette/default.nix
+++ b/pkgs/servers/monitoring/facette/default.nix
@@ -2,7 +2,7 @@
 , go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }:
 
 stdenv.mkDerivation rec {
-  name = "facette-${version}";
+  pname = "facette";
   version = "0.4.1";
   src = fetchFromGitHub {
     owner = "facette";
diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix
index 1004947d5b122f8438e633d02255218f830416bf..502ff10b0929aeda6028466f9db1c7b4334a2a2d 100644
--- a/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/pkgs/servers/monitoring/grafana-reporter/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "reporter-${version}";
+  pname = "reporter";
   version = "2.1.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 910c89157793ec3fcbca76eec9bc2afc0de32562..557a4b4842db000ccf2e3204d6cd4744be087877 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,9 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
+  pname = "grafana";
   version = "6.3.4";
-  name = "grafana-${version}";
+
   goPackagePath = "github.com/grafana/grafana";
 
   excludedPackages = [ "release_publisher" ];
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 969a58aff85d9381167ce22ca7ce3cbf2f140c19..f33a418fe5ceab7d4a5cde8bfa4f1ccb0e82e3dc 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "kapacitor-${version}";
+  pname = "kapacitor";
   version = "1.5.1";
 
   goPackagePath = "github.com/influxdata/kapacitor";
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index af5f2880a0f89784ad5c7e84cd2019657bfe186c..cc67bdfa56db6063774712ba4380fa49f3f855d4 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -2,7 +2,7 @@
 , doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }:
 
 stdenv.mkDerivation rec {
-  name = "lcdproc-${version}";
+  pname = "lcdproc";
   version = "0.5.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 97ddba0ff7380bc0bec7d8d1dae152aebb2d02cc..35de5f231b4750543eaafe3cc9d0451416b06009 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "0.3.0";
-  name = "grafana-loki-${version}";
+  pname = "grafana-loki";
   goPackagePath = "github.com/grafana/loki";
 
   doCheck = true;
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 45e380379d2f4bc69e33cde3462ab99bc9fef3ca..5459d58ceb9f87d738b3e6fdacbf5f5dd239acac 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
-  name = "longview-${version}";
+  pname = "longview";
 
   src = fetchFromGitHub {
     owner = "linode";
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index 5044aef2bb53379d79d903e186d285b986d4abca..31a6501ea3a555533d3ee5afa4bd749000c4ac0c 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, gotools, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "mtail-${version}";
+  pname = "mtail";
   version = "3.0.0-rc4";
   goPackagePath = "github.com/google/mtail";
 
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 34beada87e82b6a444ca02f2d0c185dc25881639..183cc3a2b955f8f5a3f052e7037f6d7aefaee03c 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.49";
-  name = "munin-${version}";
+  pname = "munin";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 92713a43ea22b336a71f111297b4c3206dec860e..475d79a090afa0d84d31835f4bbc3dc50acdabae 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "nagios-${version}";
+  pname = "nagios";
   version = "4.4.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57";
   };
 
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index cdfd8ab9beeb6bc67dfabcbabcb5e2944cb03e9d..35d02a5f9e2c70b756c0c74268ddc65bcfbaf6d1 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "check_ssl_cert-${version}";
+  pname = "check_ssl_cert";
   version = "1.80.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 401f9ffc406646464464e2df97aefb5af3cc621b..2dc1bdf9681c46598f86087d9f3562feb92cf67c 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "newrelic-sysmond-${version}";
+  pname = "newrelic-sysmond";
   version = "2.3.0.132";
 
   src = fetchurl {
diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix
index 9f03c9ea96f61badb55a6f6b727f8aa551c19a1e..79303849156a572c028d5748fbe82eee865b869d 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/pkgs/servers/monitoring/plugins/uptime.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "check-uptime-${version}";
+  pname = "check-uptime";
   version = "20161112";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index acdb3423107dc01ed05d6eb3966d12adcee7f82d..f1dbf0e51445e6304de640c5fbaa24df75bb245e 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,7 +1,7 @@
 { stdenv, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "alertmanager-${version}";
+  pname = "alertmanager";
   version = "0.18.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index db58c7e14e5f6ee8441040f1025ede503b96db45..07c8a14ce0b32e26b5d7c53c86bdfbb0db77fbe2 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "bind_exporter-${version}";
+  pname = "bind_exporter";
   version = "20161221-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba";
 
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 9803ba09e16aabb2c6e861e56e01399f00c98bf3..970f49713a3b81e010f115c883565e946bb12c94 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "blackbox_exporter-${version}";
+  pname = "blackbox_exporter";
   version = "0.14.0";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 0d6fbac60e5d88c3cb0f4147109961818cfff087..ce4bacfc9b7c2745ad6ea99ba043ee7fc955e10e 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "collectd-exporter-${version}";
+  pname = "collectd-exporter";
   version = "0.3.1";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
index 47abcb33ee795c2f2c06218c2eef3a54a8d4fc28..aaee2e8d770d05578f33443d564c5face35a4a14 100644
--- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul_exporter-${version}";
+  pname = "consul_exporter";
   version = "0.3.0";
 
   goPackagePath = "github.com/prometheus/consul_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index 4e32630ae227190ff016838213c674d7bb0dec3f..d1cb5dcec9cb7c49df0b78d2be7a86afdb5ff7a6 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dnsmasq_exporter-${version}";
+  pname = "dnsmasq_exporter";
   version = "0.1.0";
 
   goPackagePath = "github.com/google/dnsmasq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
index 6b9b2f6b799f6bcad23c7e4b7b0cc30611ec25bc..479ff174d1142f0b5b89e8b89903fc3a7cd8b7d8 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "dovecot_exporter-${version}";
+  pname = "dovecot_exporter";
   version = "0.1.3";
 
   goPackagePath = "github.com/kumina/dovecot_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 071035b2a4ac6905fd6c3e32d7606811c66bfe6d..95b0db7dbc6080d5157a542f08c7f33e4d3c168e 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "fritzbox-exporter-${version}";
+  pname = "fritzbox-exporter";
   version = "v1.0-32-g90fc0c5";
   rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871";
 
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index b2a0e387589135ec144e6f52eaa0585de9f8d5dd..4a84db38f78d962c306fcb8f872a3dba01717a35 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "haproxy_exporter-${version}";
+  pname = "haproxy_exporter";
   version = "0.8.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index aeb7b7445a5d2f20d2d83d8247798440629808a3..f126b8a7da1c280312bd01ee9271ee5bf653cd4a 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -2,7 +2,7 @@
 { buildGoPackage, fetchFromGitHub, fetchpatch, lib }:
 
 buildGoPackage rec {
-  name = "prometheus-json-exporter-${version}";
+  pname = "prometheus-json-exporter";
   version = "unstable-2017-10-06";
 
   goPackagePath = "github.com/kawamuray/prometheus-json-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index 85720108def89cbb74cef777c019a66680b675fe..947dfc2b70c3e6ecc7a72a1dbe9729582859f888 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mailexporter-${version}";
+  pname = "mailexporter";
   version = "2019-07-14";
 
   goPackagePath = "github.com/cherti/mailexporter";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index ade9bb87d993399b26f007fc91c964f2e696d4d2..04fbc7fbed93c884ac85b64ac7672ca32449d829 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mesos_exporter-${version}";
+  pname = "mesos_exporter";
   version = "0.1.0";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 8b6c54d41f91b56dd6662b1b9fb6ec8882c77547..7d46077380274e1a69a3e6a496c084fe61bd005c 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
-  name = "minio-exporter-${version}";
+  pname = "minio-exporter";
   version = "0.2.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index 6108e0d9de3989b9cdebd558889ec41fb8684062..f5c438a87dc118589f003ca249ed8e15a33a0c65 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mysqld_exporter-${version}";
+  pname = "mysqld_exporter";
   version = "0.11.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 9de720306d8ddc9c7faa4f42c5ddcc97a89889ff..cc527c29ac215d1adf66745752c5ae25b48b8a90 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nginx_exporter-${version}";
+  pname = "nginx_exporter";
   version = "0.4.2";
 
   goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index fd90e4c39bb1a09dd000700d103dbda15dfd7322..857a7667c13fb5f64186169dd05f9cf0e99dd761 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "node_exporter-${version}";
+  pname = "node_exporter";
   version = "0.18.1";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
index 36009c421ef55f13ce49f21d263932db32f7db70..5d62ff8c50f993b9cf57a93f07d269e571e6e45f 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "openvpn_exporter-unstable-${version}";
+  pname = "openvpn_exporter-unstable";
   version = "2017-05-15";
   rev = "a2a179a222144fa9a10030367045f075375a2803";
 
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 9a34f0c948d1006f089a37ce7a085cf3a368f45b..8202a8c8c29f3d3ebdb4549cb814ca9b07233a4b 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "postfix_exporter-${version}";
+  pname = "postfix_exporter";
   version = "0.1.2";
 
   goPackagePath = "github.com/kumina/postfix_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index 0887d971ddf7ab1701b0c15e15eefdffc6fa88e3..abc7db8086bb3e071622ef3db4b45bce774a8319 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "postgres_exporter-${version}";
+  pname = "postgres_exporter";
   version = "0.5.1";
 
   goPackagePath = "github.com/wrouesnel/postgres_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 5e4ebb581400b9a559b279b8d8d1b9cfc83f03c5..efe146c843fbd07e23f0f0a0c94f16b1ac17754b 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "prom2json-${version}";
+  pname = "prom2json";
   version = "0.1.0";
   rev = "${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 1c00f734c19e3558e0fec831a437516e123e4db9..48afc610c615bc1d8e010a30e8bdd7453ea0e44c 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,7 +1,7 @@
 { stdenv, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "pushgateway-${version}";
+  pname = "pushgateway";
   version = "0.8.0";
   rev = "v${version}";
 
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index 34120ad3fdaee9f6a6bb748433e50feb38507ebf..331503dfe7d4090eb221df8dadac710b738fc682 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "rabbitmq_exporter-${version}";
+  pname = "rabbitmq_exporter";
   version = "0.25.2";
 
   goPackagePath = "github.com/kbudde/rabbitmq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index be8fbd3d85cb32ec44d1438a655b96acabf112b1..cbafabb18b52e8b7d5ccf645bcaba5f230fd74ba 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, net_snmp }:
 
 buildGoPackage rec {
-  name = "snmp_exporter-${version}";
+  pname = "snmp_exporter";
   version = "0.13.0";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index 792e0b33aee1cdf8195250cf219651a716064bdf..f4aa8344f7779562f63fa1dca0d2f9ebbb9dbcb3 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "statsd_exporter-${version}";
+  pname = "statsd_exporter";
   version = "0.9.0";
   rev = version;
 
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 0c5cc62676594893964d2a9c54ad818d27babca5..07b5055831e7b5460f94844d0882ef369d0d80d1 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "surfboard_exporter-${version}";
+  pname = "surfboard_exporter";
   version = "2.0.0";
 
   goPackagePath = "github.com/ipstatic/surfboard_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 1cf4c022e8faaf1cc1120fcbe8a6fe4643d08130..5682c3ccd2a079a26d75eaa803e839c7df30a040 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "unifi-exporter-${version}";
+  pname = "unifi-exporter";
   version = "0.4.0+git1";
   rev = "9a4e69fdea91dd0033bda4842998d751b40a6130";
 
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index b7221a9d83611fb908738af37dec161cb17d7ca0..d5272e9b08a27feb748420b615b05d68544a6102 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "riemann-${version}";
+  pname = "riemann";
   version = "0.3.3";
 
   src = fetchurl {
-    url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
+    url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
     sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
   };
 
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix
index ab8365c23f8188b7c731ac08b6a86fdf4dc57b4d..eb98e45c36c3e2d936c722814d76576071d1f270 100644
--- a/pkgs/servers/monitoring/seyren/default.nix
+++ b/pkgs/servers/monitoring/seyren/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "seyren-${version}";
+  pname = "seyren";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index ee3b9d818ce1a0dfc7dba6e8ece34e710783ba90..dfe2bdb71b28c314c2733ea94d89b184a9e5c506 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "telegraf-${version}";
+  pname = "telegraf";
   version = "1.10.2";
 
   goPackagePath = "github.com/influxdata/telegraf";
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix
index 1de1edfa8e11bdfa3ffabce92a5f17d2b0887212..c1f4746fadfeb9c43ae21a20ccb06592de0d2e68 100644
--- a/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/pkgs/servers/monitoring/uchiwa/default.nix
@@ -11,7 +11,8 @@ let
   };
 
   backend = buildGoPackage {
-    name = "uchiwa-backend-${version}";
+    pname = "uchiwa-backend";
+    inherit version;
     goPackagePath = "github.com/${owner}/${repo}";
     inherit src;
     postInstall = ''
@@ -27,7 +28,8 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "uchiwa-${version}";
+  pname = "uchiwa";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix
index 4c3479d8662eacfe2c27c418fb99473ff5f75a56..fe90d4d6408b5b72b2f8d84950195e90bb237feb 100644
--- a/pkgs/servers/monitoring/zipkin/default.nix
+++ b/pkgs/servers/monitoring/zipkin/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, makeWrapper, jre}:
 stdenv.mkDerivation rec {
   version = "1.28.1";
-  name = "zipkin-server-${version}";
+  pname = "zipkin-server";
   src = fetchurl {
     url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar";
     sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa";
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index d8aed78e28aed0f2deb0b53c98f3cb8d8788d436..76b00b4cb29c94d31304a7939f54844955cbc65e 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.16";
-  name = "libmpdclient-${version}";
+  pname = "libmpdclient";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 740fd4739ab79f8ff9a445d69e488e89694c477e..7fcb5f945791be6795ced42b9e048e5479be52fd 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -39,7 +39,7 @@ let
   minor = "23";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-${version}";
+  pname = "mpd";
   version = "${major}${if minor == "" then "" else "." + minor}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 06cef9cefab7b16942b0b2ea161a108b4170b096..3357f7a16c120d5a1867c4d683803dd325549271 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -3,7 +3,7 @@
 , systemd ? null, withSystemd ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "mosquitto-${version}";
+  pname = "mosquitto";
   version = "1.6.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix
index cc73b2e1f6f2957ee8382f226d8904a76bbdae8f..079c877ab7a3f3b7271653ed28a240c4bdf318bd 100644
--- a/pkgs/servers/nats-streaming-server/default.nix
+++ b/pkgs/servers/nats-streaming-server/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "nats-streaming-server-${version}";
+  pname = "nats-streaming-server";
   version = "0.11.2";
   rev = "v${version}";
 
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index ac5e5cff94b39eaa1a17f10d88d244e7e8613f2a..69b1f28d2d687583721dbfa6d07a50bc1fe0f9b7 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nextcloud-${version}";
+  pname = "nextcloud";
   version = "16.0.4";
 
   src = fetchurl {
-    url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
+    url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
     sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0";
   };
 
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index d7c36b0cb416557363300e45492c14e13c7baa58..a89604c4e7cda864b64c0b07e20a3573c36fa109 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, stdenv }:
 
 buildGoPackage rec {
-  name = "nginx-sso-${version}";
+  pname = "nginx-sso";
   version = "0.16.1";
   rev = "v${version}";
 
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index c5290709b6253671956b79956f13002b476a24d0..ccd8a9b02377ef6ebd722587948f1ec2a2c06851 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aerospike-server-${version}";
+  pname = "aerospike-server";
   version = "4.2.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 05f572c8caaa404b0126020e47ba1fec8b6e397a..fd0a97d029d5f1598dcf8cb964dc4ac588540611 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -15,12 +15,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cassandra-${version}";
+  pname = "cassandra";
   inherit version;
 
   src = fetchurl {
     inherit sha256;
-    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
+    url = "mirror://apache/cassandra/${version}/apache-${pname}-${version}-bin.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper coreutils ];
@@ -30,16 +30,16 @@ stdenv.mkDerivation rec {
     mv * $out
 
     # Clean up documentation.
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
     mv $out/CHANGES.txt \
        $out/LICENSE.txt \
        $out/NEWS.txt \
        $out/NOTICE.txt \
        $out/javadoc \
-       $out/share/doc/${name}
+       $out/share/doc/${pname}-${version}
 
     if [[ -d $out/doc ]]; then
-      mv "$out/doc/"* $out/share/doc/${name}
+      mv "$out/doc/"* $out/share/doc/${pname}-${version}
       rmdir $out/doc
     fi
 
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index c06b84324191c9e3a55e31af8d6edf6885b6b5dc..bc1aee8a6876ab5d5d1ca58727c201cca7be9c0b 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -15,7 +15,7 @@ in
 
 stdenv.mkDerivation rec {
 
-  name = "EventStore-${version}";
+  pname = "EventStore";
   version = "5.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 842c988d9b3355a39951279f4b7e872d8122f59e..2864449267a685fcc37246fdc4b2294f2ca3851b 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -21,7 +21,8 @@ let version = "3.4.10";
     ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
 
 in stdenv.mkDerivation rec {
-  name = "mongodb-${version}";
+  pname = "mongodb";
+  inherit version;
 
   src = fetchurl {
     url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 9b173e538d346ffb55d5efc56c01404e7f829134..f471017a3367ee07085f7891d4c52f3d6ee82bda 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "neo4j-${version}";
+  pname = "neo4j";
   version = "3.5.8";
 
   src = fetchurl {
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 118edb60156d23b96ec501fb000a037371297324..9b785917bfbe38053926830af9a42a5dff12ab08 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "5.0.5";
-  name = "redis-${version}";
+  pname = "redis";
 
   src = fetchurl {
-    url = "http://download.redis.io/releases/${name}.tar.gz";
+    url = "http://download.redis.io/releases/${pname}-${version}.tar.gz";
     sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91";
   };
 
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index a1a9072f5cabbf9e902c8ad7f8f7d8307ddcd5f7..63c1b3b5fd7719f893fdcf3282f0b65beb3f2050 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rethinkdb-${version}";
+  pname = "rethinkdb";
   version = "2.3.6";
 
   src = fetchurl {
-    url = "https://download.rethinkdb.com/dist/${name}.tgz";
+    url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz";
     sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4";
   };
 
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index d48587c924e78f086833184450fa66e6545c41f6..19352984712a1f578e92002e98af013eac0a4e3e 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nsq-${version}";
+  pname = "nsq";
   version = "0.3.5";
   rev = "v${version}";
 
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 22f09994ebf0d97fd82a056f0122b33bd65ed67b..6fbabc3d0030ad229d61976b2027d9ed32e0f6f3 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
@@ -7,7 +7,7 @@
 with (import ./srcs.nix { inherit fetchurl; });
 
 stdenv.mkDerivation rec {
-  name = "openafs-${version}";
+  pname = "openafs";
   inherit version srcs;
 
   nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index c77bef6ad24e86e1b6762d14df9db6bc16f94969..23e1cfae47ce03b42f90f45eb3aade6a1ab16598 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -8,7 +8,7 @@
 with (import ./srcs.nix { inherit fetchurl; });
 
 stdenv.mkDerivation rec {
-  name = "openafs-${version}";
+  pname = "openafs";
   inherit version srcs;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8eca1fb7790b24ed325aab021fcac2c3a3563ba9..c0018529ea8bf2d2c4a2571655057f23688f5438 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}:
 
 stdenv.mkDerivation rec {
-  name = "osrm-backend-${version}";
+  pname = "osrm-backend";
   version = "5.22.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index 1f58c309aa5e59dc46dc22db7dccdba16753c253..67e125d7a8cc3e5590e3433c3fb7c874195bbf25 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "p910nd-${version}";
+  pname = "p910nd";
   version = "0.97";
 
   src = fetchurl {
     sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa";
-    url = "mirror://sourceforge/p910nd/${name}.tar.bz2";
+    url = "mirror://sourceforge/p910nd/${pname}-${version}.tar.bz2";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 36b4bd96fbde033326ba7b1416371d27c84c565d..cbe0dae3e14a093784dedeec541afc515da0e9f0 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -10,7 +10,6 @@
 stdenv.mkDerivation rec {
   version = "1.16.5.1554-1e5ff713d";
   pname = "plexmediaserver";
-  name = "${pname}-${version}";
 
   # Fetch the source
   src = fetchurl {
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix
index a7a0791b8520794633b0a65f26a1b67d63631f49..a6b65cde89f9ffaf0492a3253be8677e662b3244 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/pkgs/servers/polipo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "polipo-${version}";
+  pname = "polipo";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz";
+    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz";
     sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2";
   };
 
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix
index 6aaaf95fae164e2f5db0f5b0f475e0a523d71f17..86a96dde5406290c66c7e20cb76fcf9644f12d65 100644
--- a/pkgs/servers/ps3netsrv/default.nix
+++ b/pkgs/servers/ps3netsrv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "ps3netsrv-${version}";
+  pname = "ps3netsrv";
   version = "1.1.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index 1d8f0c36caecef8d74b58f641432b571d66ddae6..fc130965cf10d26e3a13fad9de68637ac1f49b72 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -2,11 +2,11 @@
   pkgconfig, c-ares }:
 
 stdenv.mkDerivation rec {
-  name = "quagga-${version}";
+  pname = "quagga";
   version = "1.2.4";
 
   src = fetchurl {
-    url = "mirror://savannah/quagga/${name}.tar.gz";
+    url = "mirror://savannah/quagga/${pname}-${version}.tar.gz";
     sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73";
   };
 
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index a293643a6f6d5113920fde4cd42715808f2a7436..854f73be187188a332a9fd81b6a104d2f4b9570d 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "radarr-${version}";
+  pname = "radarr";
   version = "0.2.0.1358";
 
   src = fetchurl {
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${name}}
-    cp -r * $out/share/${name}/.
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}/.
 
     makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
-      --add-flags "$out/share/${name}/Radarr.exe" \
+      --add-flags "$out/share/${pname}-${version}/Radarr.exe" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
           curl sqlite libmediainfo ]}
   '';
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
index 13db868845a005594f295a19040bf8074acc2b08..bfc681c921b9d1ce5bfa44d7c53d590e89905506 100644
--- a/pkgs/servers/radicale/1.x.nix
+++ b/pkgs/servers/radicale/1.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "radicale-${version}";
+  pname = "radicale";
   version = "1.1.6";
 
   src = fetchurl {
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 3dcb6605a61eb244c9956357f581a207948ad99f..4000c25aceaee4452d184759edc4c3e16654d284 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -100,7 +100,7 @@ let
     fetchSubmodules = false;
   };
 in stdenv.mkDerivation rec {
-  name = "rippled-${version}";
+  pname = "rippled";
   version = "1.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index fc28f621959bd0bae8e86523f0b5585984a7329a..c8fd5c059a88afba4bdba4227f2678ba61bfa6a1 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -2,7 +2,7 @@
 , useSystemd ? true, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "rpcbind-${version}";
+  pname = "rpcbind";
   version = "1.2.5";
 
   src = fetchgit {
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index b2e40a8ede0ebeed441d0853c723e38cfcdbd6f4..4d8ead30add6ed7d1d810e621512cb2d1b73d541 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -31,12 +31,12 @@
 #
 # Good luck.
 stdenv.mkDerivation rec {
-  name = "rt-${version}";
+  pname = "rt";
 
   version = "4.4.4";
 
   src = fetchurl {
-    url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
+    url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz";
     sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl";
   };
 
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 364fcb118ce4ea1f1c8d985863bbac274f461a5c..57c774ebcb05a6ab5a56c1c6e752f6e6fdba327e 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -6,7 +6,6 @@ let
 in stdenv.mkDerivation rec {
   version = "2.3.9";
   pname = "sabnzbd";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2a4093d412ff7f54007bf76f331b604a5630fcf0..4ec00506b3385c41273dfc5d67a7909f545d4947 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-${version}";
+  pname = "samba";
   version = "4.10.6";
 
   src = fetchurl {
-    url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
+    url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
     sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy";
   };
 
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 6142d751dab1ffbe5bb55c4af1843b652058abef..c64687054ab5141cdaca2866c28dc2a1c64f3205 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -5,10 +5,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = elk5Version;
-  name = "elasticsearch-${version}";
+  pname = "elasticsearch";
 
   src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
+    url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
     sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb";
   };
 
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index b296fb3b425cfd21caec8876235fd5482e0a6ae7..9fd49e96fa2971a244c795a102d8368722e83855 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
 
-  name    = "groonga-${version}";
+  pname = "groonga";
   version = "9.0.6";
 
   src = fetchurl {
-    url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
+    url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
     sha256 = "0d1p8v7qd97h3znp84a1w40hbg834n3wxp6gaa8mbnff16s18kl7";
   };
 
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 7ba23f61fedb0113efa577354c1ea02e082c26b6..1238778658a44714e501034ec5cd08ca753f1e8d 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sphinxsearch-${version}";
+  pname = "sphinxsearch";
+  inherit version;
   src = mainSrc;
 
   configureFlags = [
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 4c5f71cb37d66b74639acb43c4d46ce88a8e7f07..585fc2b73ef9c3f96f5c906ef65821bd2d0913e7 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "serf-${version}";
+  pname = "serf";
   version = "0.8.1";
   rev = "v${version}";
 
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
index 2ab3bf666857181b3aec497a41fed086d6c7cbc4..03d86c209f07d7ef530ece6cb593a57c83c05e9c 100644
--- a/pkgs/servers/serviio/default.nix
+++ b/pkgs/servers/serviio/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "serviio-${version}";
+  pname = "serviio";
   version = "2.0";
 
   src = fetchurl {
-    url = "http://download.serviio.org/releases/${name}-linux.tar.gz";
+    url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz";
     sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng";
   };
 
diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
index e5312b92902ec2333fc59a0e1bd674c217b05654..1c726c477648d1251bc4334f65c067c89ae3d2bd 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/servers/shairplay/default.nix
@@ -2,7 +2,7 @@
 , avahi, libao }:
 
 stdenv.mkDerivation rec {
-  name = "shairplay-unstable-${version}";
+  pname = "shairplay-unstable";
   version = "2018-08-24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 639fa322525b57e96efcda83d0501e06c888b6d1..40b88c34e8d6f7e31fb04e428b86f93a4362f474 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.3.2";
-  name = "shairport-sync-${version}";
+  pname = "shairport-sync";
 
   src = fetchFromGitHub {
     sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w";
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 70bf5c32b3d429c42eb4884bd33541cdd17c7fdf..af1992fc869903d1938807bcd249299a82482f2d 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.20";
-  name = "shellinabox-${version}";
+  pname = "shellinabox";
 
   src = fetchFromGitHub {
     owner = "shellinabox";
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix
index 083a224d15582b3ba30c6677d7bd46782c222151..3ac32509ba3b4d9caf4c3b22784bb88d4ec8246a 100644
--- a/pkgs/servers/simplehttp2server/default.nix
+++ b/pkgs/servers/simplehttp2server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "simplehttp2server-${version}";
+  pname = "simplehttp2server";
   version = "3.1.3";
 
   goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server";
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index a8a00f37f3fbe220bb1bc6c833a7be1f3546d6f7..12a52c2641d5124bc43c49c21636011aed66921a 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }:
 
 stdenv.mkDerivation rec {
-  name = "sks-${version}";
+  pname = "sks";
   version = "1.1.6";
 
   src = fetchFromBitbucket {
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 82d79785b11ceff894fef41ee2d0a23fa6b6ae8c..340ef36ac5934c7c5a945984bddff7e368526810 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "skydns-${version}";
+  pname = "skydns";
   version = "2.5.3a";
   rev = "${version}";
   
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 3409fc00066fb9570f0534f1a9b83aa5ef7877cc..730d1bbdddce114d873a9b51a11a87e63acdbd3a 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "smcroute-${version}";
+  pname = "smcroute";
   version = "2.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
index 7eaa5b3e8a05ccce083705c93c2c7d767f90ea32..2b21bef7d6f6597ce7e607fe08ffe03d65b1b3b8 100644
--- a/pkgs/servers/softether/4.25.nix
+++ b/pkgs/servers/softether/4.25.nix
@@ -14,7 +14,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "softether-${version}";
+  pname = "softether";
   version = "4.25";
   build = "9656";
   compiledDate = "2018.01.15";
diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix
index e26e8f057b6d6f8c218370a474bce09965b50809..1d80752a41a56f84164a63fb1ac771b672b197a4 100644
--- a/pkgs/servers/softether/4.29.nix
+++ b/pkgs/servers/softether/4.29.nix
@@ -3,7 +3,7 @@
 , dataDir ? "/var/lib/softether" }:
 
 stdenv.mkDerivation rec {
-  name = "softether-${version}";
+  pname = "softether";
   version = "4.29";
   build = "9680";
 
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 116d687ad26976ce92f7886f7e992eec523709d8..7b80b021bde7e6c5461a1151686a7a3be0678a9d 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
-  name = "sonarr-${version}";
+  pname = "sonarr";
   version = "2.0.0.5338";
 
   src = fetchurl {
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 22ec301bceda808d85dcb813d7dd8be70d7ae9c2..a34b7f03be889966e59b911a2b28827dd203f876 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -12,7 +12,7 @@ let
 
 in
 buildGoPackage rec {
-  name = "cockroach-${version}";
+  pname = "cockroach";
   version = "19.1.1";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7d34dd8d63bee48ebf671741d89ec13f5e2b48bd..ac14015c4cf3e755716864f4a7f7cb0bbff4e505 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -218,7 +218,7 @@ server = stdenv.mkDerivation (common // {
 });
 
 connector-c = stdenv.mkDerivation rec {
-  name = "mariadb-connector-c-${version}";
+  pname = "mariadb-connector-c";
   version = "2.3.7";
 
   src = fetchurl {
@@ -259,7 +259,7 @@ connector-c = stdenv.mkDerivation rec {
 };
 
 galera = stdenv.mkDerivation rec {
-  name = "mariadb-galera-${version}";
+  pname = "mariadb-galera";
   version = "25.3.26";
 
   src = fetchFromGitHub {
@@ -286,7 +286,7 @@ galera = stdenv.mkDerivation rec {
 
   installPhase = ''
     # copied with modifications from scripts/packages/freebsd.sh
-    GALERA_LICENSE_DIR="$share/licenses/${name}"
+    GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
     install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
     install -m 555 "garb/garbd"                       "$out/bin/garbd"
     install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 287054a750b40b999c15b2b391ca05c0d4f0bbc9..0770191c1b9f0636db145e698a75ba81648aff92 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -6,7 +6,8 @@ let
   version = "11.33.3";
 in stdenv.mkDerivation rec {
 
-  name = "monetdb-${version}";
+  pname = "monetdb";
+  inherit version;
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix
index a50d623acbce750658f43c15090385de191032b3..062de0c2368c9105646eaf0cea5309cffcd820d0 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "oracle-xe-${version}";
+  pname = "oracle-xe";
   version = "11.2.0";
 
   src = requireFile {
-    name = "${name}-1.0.x86_64.rpm";
+    name = "${pname}-${version}-1.0.x86_64.rpm";
     sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6";
 
     url = "http://www.oracle.com/technetwork/"
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   unpackCmd = ''
-    (mkdir -p "${name}" && cd "${name}" &&
+    (mkdir -p "${pname}-${version}" && cd "${pname}-${version}" &&
       ${rpmextract}/bin/rpmextract "$curSrc")
   '';
 
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
index c77330bd2ace725238580135c0a8ea63c480dae3..7f8f0786e038b2a133780925ce6688cfa6e6ffd2 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:
 
 stdenv.mkDerivation rec {
-  name = "percona-server-${version}";
+  pname = "percona-server";
   version = "5.6.43-84.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index dcaa8d5e1fad3671a435bd973b23cd60355448b1..30be61a805a7ee2fda278e01b76ea43562b8608c 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "pgbouncer-${version}";
+  pname = "pgbouncer";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
+    url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
     sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q";
   };
 
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index ba75bd28bccc85e6ef467d7d7c7a488473037afe..32c30836f6dc5bce96cd93057533ba200afd72f1 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -3,11 +3,10 @@
 stdenv.mkDerivation rec {
   pname = "pgpool-II";
   version = "4.0.6";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
     sha256 = "0blmbqczyrgzykby2z3xzmhzd8kgij9izxv50n5cjn5azf7dn8g5";
   };
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 7e536e22d947238fbe8e1c864f90bc05ff8a9ca4..5dcbe5106d65c443b97c12b6e937b28520533516 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -20,11 +20,11 @@ let
     icuEnabled = atLeast "10";
 
   in stdenv.mkDerivation rec {
-    name = "postgresql-${version}";
+    pname = "postgresql";
     inherit version;
 
     src = fetchurl {
-      url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+      url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";
       inherit sha256;
     };
 
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 2866c94d3d7fe39cacd604ff2270154840e667af..8e30683737db191b155e519412e3e225a5c74243 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "cstore_fdw-${version}";
+  pname = "cstore_fdw";
   version = "1.6.2";
 
   nativeBuildInputs = [ protobufc ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 040ff8b80fe73bdeb38a8afcc3dff81f2ae3b2e5..9a61e3c835dad0ee9ec9a846d0bfe872f7919b78 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "pg_hll-${version}";
+  pname = "pg_hll";
   version = "2.12";
 
   buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 381a174838e5854b8a88736f78aa659072ce3584..7b64de381f3eb341ea3ad88f3e42625acec41b9d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 stdenv.mkDerivation rec {
-  name = "pg_repack-${version}";
+  pname = "pg_repack";
   version = "1.4.4";
 
   buildInputs = [ postgresql openssl zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index b9015be781e933138a347e120c1396da3f9247dd..c368929db5dc987259dd26dd2e55ce8e7c0e425a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "pg_topn-${version}";
+  pname = "pg_topn";
   version = "2.2.2";
 
   buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index c68ba9b17288364b0fb3f78b656bd179783708d9..ac79c1b3b3815be80d1f77a910131395228e1860 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name    = "pgjwt-${version}";
+  pname = "pgjwt";
   version = "unstable-2017-04-24";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 7dd6a5882b2591abe4ef314372faaef863105a24..804356e9f6be6b7fee997a3353bfc8eb8087bfdd 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }:
 
 stdenv.mkDerivation rec {
-  name = "pgtap-${version}";
+  pname = "pgtap";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 63b8a39b0e272867cbbd48586ea40c267dc84b1b..33d050497da5fb11efaa28d79d452ba80f6e400f 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -13,7 +13,7 @@
 , libiconv
 }:
 stdenv.mkDerivation rec {
-  name = "postgis-${version}";
+  pname = "postgis";
   version = "2.5.2";
 
   outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 77da47b00e0db668c9981464be35d80732623a1b..5f99599582061bf6bc4fc90f99e403a3ed1a0784 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -7,7 +7,7 @@
 # }
 
 stdenv.mkDerivation rec {
-  name = "timescaledb-${version}";
+  pname = "timescaledb";
   version = "1.4.1";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 7be23003b584708c9a8905c08cf53edb46ea8501..9e3fe74aa6ce0cffd48ead9871149586f2a495ec 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "tsearch-extras-${version}";
+  pname = "tsearch-extras";
   version = "0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix
index 4e40d876152695cf8e800ec99979cb4db4636393..f5444bb06836807f2cdb101d4168abf9e82fc71a 100644
--- a/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "sqlite-jdbc";
-  name = "${pname}-${version}";
   version = "3.25.2";
 
   src = fetchMavenArtifact {
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar"
+    install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index 45540955759207b1fcc79dd5abe162bfd92f6b7a..f7b4dd84d3290530837f6e0f6a68b6aecfe97809 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "sslh-${version}";
+  pname = "sslh";
   version = "1.20";
 
   src = fetchurl {
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index d074ddf4d72e786fffdd36eb0a2ca9def1532749..67d441e76c7433d3e6cc9beb2b5bb01b73f01036 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "2.1.33";
   pname = "Tautulli";
-  name = "${pname}-${version}";
 
   pythonPath = [ python.pkgs.setuptools ];
   buildInputs = [ python.pkgs.setuptools ];
diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix
index 967eea25d3fb1240363abdf9e9a11ef61a6aea72..ac3dccdab738ffc7ef29192d077cdbb831e7ce73 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/pkgs/servers/tegola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "tegola-${version}";
+  pname = "tegola";
   version = "0.8.1";
   rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1";
 
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index e645ef2dc3545fced2faae1efed1cd563b92bba5..121983e70315ea24689a376946f3b5dd70a5ee90 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, zip, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "teleport-${version}";
+  pname = "teleport";
   version = "4.0.2";
 
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index f793f05fef427c920a0f3cc7ed270cbf2cb570c8..1707eb403b703ffa59f5a34de3be4e531fb83a0e 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}:
 
 buildGoPackage rec {
-  name = "traefik-${version}";
+  pname = "traefik";
   version = "1.7.14";
 
   goPackagePath = "github.com/containous/traefik";
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 48cf589e55d18565d7ddce98923af4b50cce3676..84b7b325b46f24033a687856e092323b6e906079 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "trezord-go-${version}";
+  pname = "trezord-go";
   version = "2.0.27";
 
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index ce8947bcdda6d134a5e19d0b2389a8b591b3f116..c1694316f3edae04ea8d9f1ce44df065d3ebf5f5 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tt-rss-${version}";
+  pname = "tt-rss";
   version = "2019-01-29";
   rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac";
 
diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
index 6fad061ce99611443df87fdbe962f4919d86d89e..0600640155be80d2812f2ff60e1344ec5ca5092a 100644
--- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
+++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "tt-rss-plugin-auth-ldap-${version}";
+  pname = "tt-rss-plugin-auth-ldap";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
index 27416537e3316466eba5985cd6143f7d43165a15..7ddc3abb0b4ee1c77378344f9eab0507e42b55dd 100644
--- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
+++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "tt-rss-plugin-ff-instagram-${version}";
+  pname = "tt-rss-plugin-ff-instagram";
   version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
index 702b95b3f0e3a14c6a9d875d61442df9112c7b63..7c3d6a5b57e213593506fb54d29cc51b39b3c83f 100644
--- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
-  name = "tt-rss-plugin-tumblr-gdpr-${version}";
+  pname = "tt-rss-plugin-tumblr-gdpr";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix
index d0b279eb859b7c10d10aa3266fa2e8262a3db3f8..c35667546c6609594ef1faf1888aeba7175e5961 100644
--- a/pkgs/servers/tt-rss/theme-feedly/default.nix
+++ b/pkgs/servers/tt-rss/theme-feedly/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
-  name = "tt-rss-theme-feedly-${version}";
+  pname = "tt-rss-theme-feedly";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index e05d9e919d177fa5ae5700e9d0395484af9d7a92..c996d7c0c8b4781cf6ab086acedf553edc4c7d33 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -6,7 +6,8 @@ let
   version = "4.2.8";
 
 in stdenv.mkDerivation rec {
-  name = "tvheadend-${version}";
+  pname = "tvheadend";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "tvheadend";
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index 9e9816c941d98f4f5b172e2a35b938d23f9a76cb..12f2a08c7f487ebc4d9b96f7d1937708e2814b55 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }:
 
 stdenv.mkDerivation rec {
-  name = "udpt-${version}";
+  pname = "udpt";
   version = "2017-09-27";
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index ba628360aaa78f05af9c9cb107573d3f5149d26f..0dfec772a18847c542c052e87054a6f0e2da62b4 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "uftp-${version}";
+  pname = "uftp";
   version = "4.10";
 
   src = fetchurl {
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 52866784faa9aa3091310945c3211bb64f2679ba..6483973546c63a3fcb2ad23ff53976790436213a 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -4,7 +4,7 @@
 assert tlsSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "uhub-${version}";
+  pname = "uhub";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 9bccd5b99fb0f605359756ee8b3c6e09a313fb76..3fb2817277aa1e8cc7f6abf4f027217b853fb8c9 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ums-${version}";
+  pname = "ums";
   version = "6.2.2";
   
   src = fetchurl {
-    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
+    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz";
     sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
-    name = "${name}.tgz";
+    name = "${pname}-${version}.tgz";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 5a04d2317f418e7d4cf68cfb74047d32082ee3b6..eb7a072799dccf1d7520b45885fd95f335f3d9d9 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -3,7 +3,8 @@
 let
   generic = { version, sha256, suffix ? "" }:
   stdenv.mkDerivation rec {
-    name = "unifi-controller-${version}";
+    pname = "unifi-controller";
+    inherit version;
 
     src = fetchurl {
       url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb";
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 6f5f7170dbd9c599b15fe2ed3815428f91032431..85fa6cd80063442bcdaf588549c7bedf6234c3ed 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -48,11 +48,11 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
 in
 
 stdenv.mkDerivation rec {
-  name = "uwsgi-${version}";
+  pname = "uwsgi";
   version = "2.0.18";
 
   src = fetchurl {
-    url = "https://projects.unbit.it/downloads/${name}.tar.gz";
+    url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
     sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9";
   };
 
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index c9f0f2b84bbe72abede62b0a2c54498a858ef12b..8a63ed3ea7f1ab4a3db8ff9d233a3d50743bf2fb 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -4,10 +4,11 @@
 let
   common = { version, sha256, python, extraNativeBuildInputs ? [] }:
     stdenv.mkDerivation rec {
-      name = "varnish-${version}";
+      pname = "varnish";
+      inherit version;
 
       src = fetchurl {
-        url = "https://varnish-cache.org/_downloads/${name}.tgz";
+        url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz";
         inherit sha256;
       };
 
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
index e4dd9b0f2dc7cdd59de9d9ced32f3ce29bd01483..3d43862cbe0eb824c7bfa6f82dbec60c2c448181 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "morty-${version}";
+  pname = "morty";
   version = "0.2.0";
 
   goPackagePath = "github.com/asciimoo/morty";
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index a53c726587f2322a0e727e37671c207bb0b3ec82..e3adeb0fe660ca8bcc21f20e2eae042e5d06ef1e 100644
--- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pgpkeyserver-lite-${version}";
+  pname = "pgpkeyserver-lite";
   version = "2017-07-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix
index 946606e37013f6bff8432415aef38e4d6cb2547d..5c105e85a872984cca9f91179f3ddb9133488f44 100644
--- a/pkgs/servers/web-apps/restya-board/default.nix
+++ b/pkgs/servers/web-apps/restya-board/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "rstya-board-${version}";
+  pname = "rstya-board";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 615efa3b36720f76aa779e5f60a73fef6faf9a65..f6000fc42117741596e369c33da6d184c36b81ba 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "selfoss-${version}";
+  pname = "selfoss";
   version = "2.18";
 
   src = fetchurl {
-    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip";
+    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip";
     sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b";
   };
 
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 0ec31e7dc4fa2e1453de754074216d673f16245d..f5bce90c2341695148e0c4719ded46661080a482 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "shaarli-${version}";
+  pname = "shaarli";
   version = "0.11.1";
 
   src = fetchurl {
diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
index 5fd941e9467ced480b1918d20ec603f84979d676..ef0a4331d41dd01e3a9ed6610be4b4dce58d7d86 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shaarli-material-${version}";
+  pname = "shaarli-material";
   version = "0.10.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix
index 0c51b6b13cddb07e506a8a4f2a3feb80aa541a83..4be14b37bd2bd6815acb3134124ddc4026f40f27 100644
--- a/pkgs/servers/web-apps/virtlyst/default.nix
+++ b/pkgs/servers/web-apps/virtlyst/default.nix
@@ -2,7 +2,7 @@
 , qtbase, libvirt, cutelyst, grantlee }:
 
 stdenv.mkDerivation rec {
-  name = "virtlyst-${version}";
+  pname = "virtlyst";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index eafe916d02cada9192c8bd04df3ecb718099634d..a105531ff4e6b1f9c808ca304b4998d88b460267 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wallabag-${version}";
+  pname = "wallabag";
   version = "2.3.8";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix
index 92350595dd8583d28b323970b3a8cb5d2db95b1f..84904d48b1ee4b3ace16c73e767037c37dbc4b47 100644
--- a/pkgs/servers/x11/quartz-wm/default.nix
+++ b/pkgs/servers/x11/quartz-wm/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.3.1";
 in stdenv.mkDerivation {
-  name = "quartz-wm-${version}";
+  pname = "quartz-wm";
+  inherit version;
   src = fetchurl {
     url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz";
     sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9";
diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index 0a008227b9fb87a308da003bd1719e2d46fe8060..af526730ca97aa4a975b34be4b196ed9b2a652f4 100644
--- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "xcb-util-xrm-${version}";
+  pname = "xcb-util-xrm";
 
   src = fetchurl {
-    url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h";
   };
 
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index b0d3dccf30f245f102686943e78775d25f7c4424..c25c4baf13b80f8f0ce5923c048859f5b62c6b41 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -2,7 +2,7 @@
   libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } :
 
 stdenv.mkDerivation rec {
-  name = "biboumi-${version}";
+  pname = "biboumi";
   version = "8.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 7e092c523493dd4f0bb2b74768d717c81f5739ee..335de9ea153a79838347dfe2a60f3043110f2bcd 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -45,7 +45,8 @@ in stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
 
   deps = stdenv.mkDerivation {
-    name = "ejabberd-deps-${version}";
+    pname = "ejabberd-deps";
+    inherit version;
 
     inherit src;
 
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index 0e6fcd5e9896b17df788bef1b0db00d85104843e..ab377e3d53b13e0dd9f2efc4627c0944357ecf8b 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "openfire-${version}";
+  pname = "openfire";
   version  = "3_6_3";
 
   src = fetchurl {
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 928c48329656e1c8ab82bbf97dcf074897d516c7..7bf21cbf22f2ff56718dcf1899bc907b049e87e9 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -15,10 +15,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.11.2"; # also update communityModules
-  name = "prosody-${version}";
+  pname = "prosody";
 
   src = fetchurl {
-    url = "https://prosody.im/downloads/source/${name}.tar.gz";
+    url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
     sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9";
   };
 
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 8df8499d11eb64c1637759bbf239d7c0e763a504..f5bdfd9fe853038b5c9662292ad2b44e963725e2 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "pyIRCt-${version}";
+  pname = "pyIRCt";
   version = "0.4";
 
   src = fetchurl {
@@ -19,18 +19,18 @@ stdenv.mkDerivation rec {
   # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${pname}-${version}
     sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
-    cp * $out/share/${name}
+    cp * $out/share/${pname}-${version}
     cat > $out/bin/pyIRCt <<EOF
       #!${runtimeShell}
-      cd $out/share/${name}
+      cd $out/share/${pname}-${version}
       ./irc.py \"$@\"
     EOF
-    chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
+    chmod a+rx  $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index 76861ab842b549e87924288bab16c22f4f68d779..719acfd3a66e68f9c1138a0acb1f1a758ec3c1bb 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "pyMAILt-${version}";
+  pname = "pyMAILt";
   version = "20090101";
 
   src = fetchcvs {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   /* doConfigure should be removed if not needed */
   installPhase = ''
     cd mail-transport
-    mkdir -p $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${pname}-${version}
     sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
     cp * $out/share/$name
     cat > $out/bin/pyMAILt <<EOF
       #!${runtimeShell}
-      cd $out/share/${name}
+      cd $out/share/${pname}-${version}
       ./mail.py \"$@\"
     EOF
-    chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
+    chmod a+rx  $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 996bd6a8fb6ed5b3810d0c070cf0e84ce6d55492..6e6875c3550c95d1e054f6e682b34009cad4cccc 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -77,7 +77,7 @@ let
   perlBin = "${perl}/bin/perl";
 
 in stdenv.mkDerivation rec {
-  name = "zoneminder-${version}";
+  pname = "zoneminder";
   version = "1.32.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 5bacaf2982e9e88e9398caeac65bae6d05906ea9..44b96d4209a6c6894deb6525f6240a1d37c6db43 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "zookeeper-${version}";
+  pname = "zookeeper";
   version = "3.4.13";
 
   src = fetchurl {
-    url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
+    url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    cp -R conf docs lib ${name}.jar $out
+    cp -R conf docs lib ${pname}-${version}.jar $out
     mkdir -p $out/bin
     cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
     patchShebangs $out/bin
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
     chmod -x $out/bin/zkEnv.sh
 
     mkdir -p $out/share/zooinspector
-    cp -r contrib/ZooInspector/{${name}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
+    cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
 
-    classpath="$out/${name}.jar:$out/share/zooinspector/${name}-ZooInspector.jar"
+    classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar"
     for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
       classpath="$classpath:$jar"
     done
diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix
index 21f40858ea28caa3d7cd143307e6eb99b951f353..d2b7a4929e1c3babbccdc9ff7a0e2b7124fcf1b2 100644
--- a/pkgs/shells/any-nix-shell/default.nix
+++ b/pkgs/shells/any-nix-shell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "any-nix-shell-${version}";
+  pname = "any-nix-shell";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index b5f600da8f7e902d3dfd1674d900a78206910d7b..0476cbd1f3f7a016b5a9ba0a59be44281425313e 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bash-completion-${version}";
+  pname = "bash-completion";
   version = "2.8";
 
   src = fetchurl {
-    url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/scop/bash-completion/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
   };
 
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index 5ac117cf1e5e706d46399f6443a6e08d08d3225a..affbd2199586362f86c31ba4c5e510cf6b57f832 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.7";
-  name = "nix-bash-completions-${version}";
+  pname = "nix-bash-completions";
 
   src = fetchFromGitHub {
     owner = "hedning";
diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix
index c3c2da329a9bd2a9380cbbfa4e8295631004dade..4fd88d3261b32c8fcda28895accce81bc52761a8 100644
--- a/pkgs/shells/dgsh/default.nix
+++ b/pkgs/shells/dgsh/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dgsh-unstable-${version}";
+  pname = "dgsh-unstable";
   version = "2017-02-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 789ddaf4d9bbf29bf7932582544602e428cca038..446f28ba65271dc565fab2e8fa723b4b8fb4dccb 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -5,7 +5,8 @@ let
 in
 stdenv.mkDerivation {
 
-  name = "es-${version}";
+  pname = "es";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index df8b5d824f1e214792f8001a0c7b1254330e89ac..1ef3c4b6fd9ace69876095c8df142b69cc6ce858 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -88,7 +88,7 @@ let
   '';
 
   fish = stdenv.mkDerivation rec {
-    name = "fish-${version}";
+    pname = "fish";
     version = "3.0.2";
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
@@ -96,7 +96,7 @@ let
     src = fetchurl {
       # There are differences between the release tarball and the tarball github packages from the tag
       # Hence we cannot use fetchFromGithub
-      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz";
+      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
       sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
     };
 
diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
index 445e961c649996af8d441b56a08a8e56b5be3e6c..b2aecdf6c14e8f8409aad3a1a7b65df1a7a20bb7 100644
--- a/pkgs/shells/fish/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish/fish-foreign-env/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnused, bash, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "fish-foreign-env-${version}";
+  pname = "fish-foreign-env";
   version = "git-20170324";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix
index d16704b71d5ed0d671e5dd51025b59aaaa381bc7..74e70feaa8d71aec56b236fe52420551a11dc15f 100644
--- a/pkgs/shells/ksh/default.nix
+++ b/pkgs/shells/ksh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "ksh-${version}";
+  pname = "ksh";
   version = "93v";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 2115e17c332b97df1957314fe83b5d581a561970..9b48c5c68a1c9248bd487cef7b0569e01e7e7ac1 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mksh-${version}";
+  pname = "mksh";
   version = "57";
 
   src = fetchurl {
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index 2e200a74f7b489413cce0dc4c3a0538b9e724093..09a54c8a3b88f837cbca79c943d097e37e46f8d6 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "oh-${version}";
+  pname = "oh";
   version = "20160522-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
 
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index 3a6eb6378f0a276191f904b7d02499bac8e75e57..a7fe9634fee4adf2a44fdcbd38f4a8c3a7cd886e 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
                        (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]);
 in
 stdenv.mkDerivation rec {
-  name = "powershell-${version}";
+  pname = "powershell";
   version = "6.2.2";
 
   src = fetchzip {
diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix
index 298c4a1c32f4d89a686589f268e29b4de1634ad0..a8a7d4f6e7775026916a79446fc6e58732883e2b 100644
--- a/pkgs/shells/rc/default.nix
+++ b/pkgs/shells/rc/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rc-${version}";
+  pname = "rc";
   version = "1.7.4";
 
   src = fetchurl {
diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index d061c888f60aa9055161c08f56f266cfb8481ceb..ecefbff7d22ef56549b83b655a5dec52f18a1d18 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -5,11 +5,11 @@
 { stdenv, fetchurl, openssh, rsync, cvs }:
 
 stdenv.mkDerivation rec {
-  name = "rssh-${version}";
+  pname = "rssh";
   version = "2.3.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rssh/rssh/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz";
     sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9";
   };
 
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 43dd8a40480cadcb911cfb2b86b9676c04f1e552..f13919e52e7cf2cf3e5bcc1d3214ce1843e70805 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -2,14 +2,14 @@
 , ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "tcsh-${version}";
+  pname = "tcsh";
   version = "6.21.00";
 
   src = fetchurl {
     urls = [
-      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz"
-      "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz"
-      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
+      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
+      "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
+      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz"
     ];
     sha256 = "0wp9cqkzdj5ahfyg9bn5z1wnyblqyv9vz4sc5aqmj7rp91a34f64";
   };
diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix
index cf22207ef09c8831cfb10da1ba94970c6019f346..c754d7bbe580811014fcb80780448abcbe130062 100644
--- a/pkgs/shells/zsh/antigen/default.nix
+++ b/pkgs/shells/zsh/antigen/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.3";
-  name = "antigen-${version}";
+  pname = "antigen";
 
   src = fetchurl {
     url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh";
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index e9458520bb49e91d8e3abedfc6d3be28cde00dc2..0a26b8a7821076308f43c641a464dab8e73bd670 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -10,7 +10,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "zsh-${version}";
+  pname = "zsh";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix
index b9047a93a41ff4cf4dd54948636a2d1d196ab0f2..ed46a21325c5ca2a697c3a43fc17bb3395983d50 100644
--- a/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/pkgs/shells/zsh/gradle-completion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gradle-completion-${version}";
+  pname = "gradle-completion";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index 0051df7073ba86220e0456c42347264bd92e5968..2d7dd4f24aa0f41c43315b6c89ab908a1c78b133 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "grml-zsh-config-${version}";
+  pname = "grml-zsh-config";
   version = "0.16.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 0a5c3ef666e2d1c2548652b7595eb32ff1ed5649..3ce32a5e43625f3973f42423083008e4c571eb18 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nix-zsh-completions-${version}";
+  pname = "nix-zsh-completions";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "spwhitt";
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6afe6d286eede4b72c2d86601ff12a32c6c1920c..61e60e97edd80315847102802a43d4ca3f6146e1 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "2019-08-07";
-  name = "oh-my-zsh-${version}";
+  pname = "oh-my-zsh";
   rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb";
 
   src = fetchgit { inherit rev;
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index 28b116523ac01d33a0b9a49c8360341f262555fd..4e089dd4d73c0c56cadb28e0310a326b908cc01a 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec{
-  name = "spaceship-prompt-${version}";
+  pname = "spaceship-prompt";
   version = "3.7.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 6af1869da7eee4ef59be4558acf50f676b0dda36..4e00fee3d27ffb42e96442b415500d6f173962d3 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -3,7 +3,7 @@
 # To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option
 
 stdenv.mkDerivation rec {
-  name = "zsh-autosuggestions-${version}";
+  pname = "zsh-autosuggestions";
   version = "0.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index c81c1ea46c5f37b2fff0ec0368c4a692ff28201d..3e403b62322262d7e5a602cd823c064b33b9ddc7 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-04-30";
-  name = "zsh-command-time-${version}";
+  pname = "zsh-command-time";
 
   src = fetchFromGitHub {
     owner = "popstas";
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index 726f2b7ad73d3c863b3092a9b5918bf09bd26065..2ed4301e55ab4f7a18f5dbaf07dbbf3135326e92 100644
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "zsh-completions-${version}";
+  pname = "zsh-completions";
   version = "0.30.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
index 42de7d48d831863950f8028246e8241293996ae5..b752165466701b539bbdd47c551c58e452027df3 100644
--- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix
+++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "zsh-history-substring-search-${version}";
+  pname = "zsh-history-substring-search";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 30c45ea3c9bff3b4100b37eda4015871332bbbc6..00e7612b17be33278d00d686b27e79ba13caae27 100644
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
@@ -4,7 +4,7 @@
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`
 
 stdenv.mkDerivation rec {
-  name = "powerlevel9k-${version}";
+  pname = "powerlevel9k";
   version = "2017-11-10";
   src = fetchFromGitHub {
     owner = "bhilburn";
diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
index b7b44098fd7a7aad607279d6589a74712bb47218..741587ef960fa3b8ef7b082e6cd0691540ebb8b5 100644
--- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.6.0";
-  name = "zsh-syntax-highlighting-${version}";
+  pname = "zsh-syntax-highlighting";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index c9bf7141804c3bf15e32a73d5845d3d7431b5a08..db17788cea005152e6a1c640a45a18bcdffa3cf3 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
-  name = "autocutsel-${version}";
+  pname = "autocutsel";
  
   src = fetchurl {
-    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
   };
  
diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index 488c97ad36b52c0e7c6d7265f04f554e99327436..66d845b0587fad4cb77e9567f264112a75fa18c4 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "bgs-${version}";
+  pname = "bgs";
   version = "0.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 0d764a4cbd108557c271673774f0bf8d7c64682e..f5a8fd24f5e69f0a2079e1be3620321508f097c7 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -56,10 +56,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "bumblebee-${version}";
+  pname = "bumblebee";
+  inherit version;
 
   src = fetchurl {
-    url = "https://bumblebee-project.org/${name}.tar.gz";
+    url = "https://bumblebee-project.org/${pname}-${version}.tar.gz";
     sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h";
   };
 
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 173963135f873716399c90f4991f6907b585201f..5327e0f8c8f9f3a38da811b65c556ae51c30eba9 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, perl, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
-  name = "ckbcomp-${version}";
+  pname = "ckbcomp";
   version = "1.193";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix
index 1d119220e5851ad4dd44439858ae16ed2aa38810..7c1457d3e2ae2708e09b069a1b5823fda832a4fc 100644
--- a/pkgs/tools/X11/dispad/default.nix
+++ b/pkgs/tools/X11/dispad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libX11, libXi, libconfuse }:
 
 stdenv.mkDerivation rec {
-  name = "dispad-${version}";
+  pname = "dispad";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix
index 28f7edcfd043e35e4ebe125ddb5523c780297a5e..f15d099016a59ed122f56e7f507a8258a82cbc02 100644
--- a/pkgs/tools/X11/dragon-drop/default.nix
+++ b/pkgs/tools/X11/dragon-drop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gtk, pkgconfig, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "dragon-drop-${version}";
+  pname = "dragon-drop";
   version = "1.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
index 3283cea1db5225132709e7b982680505547e9208..d6c86d60bc1e9a1f5a67236e54f6570e903ff9c3 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "ffcast-${version}";
+  pname = "ffcast";
   version = "2.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index c750a5ce1c66b86708ea549b758e8a9bba15dc19..01d82b4a112c7a52acd5f1ec7f087544f7a092c5 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,7 +1,7 @@
 { stdenv, xorg, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-sct-${version}";
+  pname = "go-sct";
   version = "20180605-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4";
 
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 1a7fc91311e5d3d66e8b492a20320792cd176aa3..f917bda6f71be1cceb465c9d955b5606f27fa2c7 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "0.5.1";
-  name = "grobi-${version}";
+  pname = "grobi";
 
   goPackagePath = "github.com/fd0/grobi";
 
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index cf2227403b013c67a56ce2d892cc3b1922011547..239dfa0963b2801c0dec918159db636ec097052c 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "hsetroot-${version}";
+  pname = "hsetroot";
   version = "1.0.2";
 
   # The primary download site seems to no longer exist; use Gentoo's mirror for now.
diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/tools/X11/jumpapp/default.nix
index 5d3810c7d64d4f02fea3eb07b86a8fcf550e52b4..38de9e9f80b6edb75045612c2f38a0ffc41ef27b 100644
--- a/pkgs/tools/X11/jumpapp/default.nix
+++ b/pkgs/tools/X11/jumpapp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, perl, pandoc, fetchFromGitHub, xdotool, wmctrl, xprop, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "jumpapp-${version}";
+  pname = "jumpapp";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index eda5703d6a862607776107f7653a1aa4032c4a05..95aa15840da629965ea4c2cb36f5d7215e73e092 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -3,10 +3,11 @@
 let version = "1.6.1";
 in
 stdenv.mkDerivation rec {
-  name = "nitrogen-${version}";
+  pname = "nitrogen";
+  inherit version;
 
   src = fetchurl {
-    url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
+    url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz";
     sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
   };
 
diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/tools/X11/numlockx/default.nix
index 2c4807e4661fb17ee63c9e3afd7f7289127a1904..b59e9dc30ac86e543ab15a6c8d29291fa8419220 100644
--- a/pkgs/tools/X11/numlockx/default.nix
+++ b/pkgs/tools/X11/numlockx/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, libX11, libXext, autoconf }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "1.2";
   pname = "numlockx";
 
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index b0ef813b455a962c8422422f55a87dc62fc6a35b..c2bcfe788e64519f4727deb14cf63ac8c5c90b34 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo,
   libpng, libtool, libxml2, pkgconfig, which, xorg }:
 stdenv.mkDerivation rec {
-  name = "nx-libs-${version}";
+  pname = "nx-libs";
   version = "3.5.99.21";
   src = fetchFromGitHub {
     owner = "ArcticaProject";
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 2e02338631b4ab3d93b35e694d85b8642d34be6f..6b1b353b09bea01edf8d9e5584abb1f8636b488f 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -2,7 +2,7 @@
   imlib2, libstartup_notification, makeWrapper, libSM }:
 
 stdenv.mkDerivation rec {
-  name = "obconf-${version}";
+  pname = "obconf";
   version = "2.0.4";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
index 33470beca2dec449b5378dc759061ecd2e7ac261..ad2ee549a6d72dd677c7d14b2a011d9e896bf9da 100644
--- a/pkgs/tools/X11/oblogout/default.nix
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "oblogout-unstable-${version}";
+  pname = "oblogout-unstable";
   version = "2009-11-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix
index ea661b0f8c7b877f77efa7891631c0be3cc3a92a..ae4dc08770ddc92c01eddfc40b375333eda65bfd 100644
--- a/pkgs/tools/X11/run-scaled/default.nix
+++ b/pkgs/tools/X11/run-scaled/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "git-2018-06-03";
-  name = "run-scaled-${version}";
+  pname = "run-scaled";
 
   src = fetchFromGitHub {
     owner  = "kaueraal";
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix
index 1323da585c89477bfacccf27a08191b8522b4100..479617b6b93ab4b3ce61d1feb6a665e7b1c3c73e 100644
--- a/pkgs/tools/X11/runningx/default.nix
+++ b/pkgs/tools/X11/runningx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "runningx-${version}";
+  pname = "runningx";
   version = "1.0";
   
   src = fetchurl {
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 92f24f2b4aa4401162eee936f23cdef49f41fcc4..8b4a1e19572ae3dffc834c8d4e5e0fe284ce6342 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "screen-message-${version}";
+  pname = "screen-message";
   version = "0.25";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index b8714fc9ecafdb549a5bf830e78b2d35976b5d00..bb113c90849c97ba5bfa7d6c9b1bafc544647939 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -6,7 +6,7 @@ assert enableXinerama -> libXinerama != null;
 
 stdenv.mkDerivation rec {
   version = "2.0.2";
-  name = "setroot-${version}";
+  pname = "setroot";
 
   src = fetchFromGitHub {
     owner = "ttzhou";
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix
index 16462f5243b75667bcf25494037bf3c04811a57a..4fd9678733dd3d7f9c8e02fd9245fbfaaa989d95 100644
--- a/pkgs/tools/X11/skippy-xd/default.nix
+++ b/pkgs/tools/X11/skippy-xd/default.nix
@@ -9,7 +9,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "git-2015-03-01";
-  name = "skippy-xd-${version}";
+  pname = "skippy-xd";
   inherit buildInputs;
   src = fetchgit {
     url = "https://github.com/richardgv/skippy-xd/";
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix
index 2b58dd6c9115417900a2b21c3c776504785b8c1a..30f99cd40f29e654449ab535f39fe92bc4e42531 100644
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/pkgs/tools/X11/sselp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.2";
-  name = "sselp-${version}";
+  pname = "sselp";
  
   src = fetchurl {
-    url = "https://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
     sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
   };
  
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 47b54bec312c9036b9fbf5948e726d06e4ce69ff..92afa30e6168921b198c222c039c8f5b2e2cf3df 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }:
 
 stdenv.mkDerivation rec {
-  name = "virtualgl-lib-${version}";
+  pname = "virtualgl-lib";
   version = "2.6.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
index a5a75c9df4f53e204531921636c57a70afd062de..f906a6d403e666c5ad4ec9c0069705c18f5cd630 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromGitHub, libX11}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "wayv";
   version = "0.3";
 
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index cd9d6aecdefb6e2345866a05e2c3481ed8a97eb7..e8b2be4b7837e5f655b8dfaf2843b299b243c112 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -3,12 +3,12 @@
 
 let
   base = pythonPackages.buildPythonApplication rec {
-    name = "winswitch-${version}";
+    pname = "winswitch";
     namePrefix = "";
     version = "0.12.23";
 
     src = fetchurl {
-      url = "http://winswitch.org/src/${name}.src.tar.bz2";
+      url = "http://winswitch.org/src/${pname}-${version}.src.tar.bz2";
       sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9";
     };
 
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix
index 4200293ed080e7b5be0951edef56dc5bc53d86dd..fe5c70f6ce23af3b61be837f53280fe0e1b4684a 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/pkgs/tools/X11/wmutils-core/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "wmutils-core-${version}";
+  pname = "wmutils-core";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix
index c01aa8dc75fa0b077c7cd1e6a5be08688947f41f..c1230303862358397b3802bda211b4f0a4a2cdcd 100644
--- a/pkgs/tools/X11/wmutils-opt/default.nix
+++ b/pkgs/tools/X11/wmutils-opt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "wmutils-opt-${version}";
+  pname = "wmutils-opt";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 169f420357e620069b2c90a6c77f15c5f0fffa77..acf0fc9aabfda46f4450759a8f0246d6ac12c7c5 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -3,7 +3,7 @@
   autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "x11vnc-${version}";
+  pname = "x11vnc";
   version = "0.9.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
index 5a08cf5c817e374181325a639b577075ed090788..d52698b0ed7eebc72c1dca4b98ee8ee3f289f8f4 100644
--- a/pkgs/tools/X11/xannotate/default.nix
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromBitbucket, libX11}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "xannotate";
   version = "20150301";
   
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix
index 79ef4cb56dcbc3797bf0afb1f613fcabde069f5d..a648eefcdde172cb6df4b242d7070cc3c827647f 100644
--- a/pkgs/tools/X11/xautomation/default.nix
+++ b/pkgs/tools/X11/xautomation/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.09"; in
 stdenv.mkDerivation {
-  name = "xautomation-${version}";
+  pname = "xautomation";
+  inherit version;
   src = fetchurl {
     url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz";
     sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix
index 142d7d17fe77632ac57701b48dd440818a287cb1..8e838bfe9065effc863b12261536a8beb3a3b30b 100644
--- a/pkgs/tools/X11/xbanish/default.nix
+++ b/pkgs/tools/X11/xbanish/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "1.6";
   pname = "xbanish";
-  name = "${pname}-${version}";
 
   buildInputs = [
     libX11 libXi libXt libXfixes libXext
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix
index 987293878d82ad9416360b1f20f492e4e5b82aea..bb83effe6011626c792fe5b33f7b40005a884136 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/pkgs/tools/X11/xbindkeys-config/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
-  name = "xbindkeys-config-${version}";
+  pname = "xbindkeys-config";
   version = "0.1.3";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 4e4e49bd9468560cd940bddfb3368b6bbecd6f69..23e0ce63e5b496a3994021a5f1f5c23f60382f4c 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.8.6"; in
 stdenv.mkDerivation {
-  name = "xbindkeys-${version}";
+  pname = "xbindkeys";
+  inherit version;
   src = fetchurl {
     url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
     sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix
index 1d42f791fb5c05cacdfcf122e72facf175ab1660..c36334d478dfbdafbf382a0ad46fab0ff08eccba 100644
--- a/pkgs/tools/X11/xcwd/default.nix
+++ b/pkgs/tools/X11/xcwd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-09-30";
-  name = "xcwd-${version}";
+  pname = "xcwd";
 
   src = fetchFromGitHub {
     owner   = "schischi";
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 44016b801e5d12331e3b967a5844695c163b501e..f1e6e28627c7d175fc28bfab889c20d11e72183e 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -16,11 +16,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "xdg-utils-${version}";
+  pname = "xdg-utils";
   version = "1.1.3";
 
   src = fetchurl {
-    url = "https://portland.freedesktop.org/download/${name}.tar.gz";
+    url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz";
     sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p";
   };
 
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix
index bb6abfa9b586f644a553dab7c3371cdcee502a15..d20714befba172c280469a00e98f86d92eaf1d04 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/pkgs/tools/X11/xdotool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
 
 stdenv.mkDerivation rec {
-  name = "xdotool-${version}";
+  pname = "xdotool";
   version = "3.20160805.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
index 43b46fcb8d7b744148d1ed0509e076cba6a8ace5..9aee0d778c46ed7e3a9371b4fdb002d84ec8b907 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "xinput_calibrator";
   version = "0.7.5";
-  name = "${pname}-${version}";
   src = fetchurl {
     url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";
     sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix
index c49a3dedb126445e28651dd38a6ebf52a705f040..a837e73983f909ada20a59ff0a7d1093364831d3 100644
--- a/pkgs/tools/X11/xkb-switch/default.nix
+++ b/pkgs/tools/X11/xkb-switch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  name = "xkb-switch-${version}";
+  pname = "xkb-switch";
   version = "1.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix
index a58d16ab82e8cf0ae75074a7eae8c7a635633603..3bd9f525683521e4571e710e66d4f1d135090b5e 100644
--- a/pkgs/tools/X11/xloadimage/default.nix
+++ b/pkgs/tools/X11/xloadimage/default.nix
@@ -21,7 +21,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "4.1";
-  name = "xloadimage-${version}";
+  pname = "xloadimage";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz";
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index fd944f400446ea68f35a9fec4af907235e1ffd42..13a18efccba6b0b52d4fd3b59537a9a7a0419a56 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
 
 stdenv.mkDerivation rec {
-  name = "xmacro-${version}";
+  pname = "xmacro";
   version = "0.4.6";
 
   src = fetchurl {
-    url = "http://download.sarine.nl/xmacro/${name}.tar.gz";
+    url = "http://download.sarine.nl/xmacro/${pname}-${version}.tar.gz";
     sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61";
   };
 
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index a84f101cdf7bd133091c1b82be147fec2fa3254c..58569dcd59cff589fd60d4375a24c8c752e63744 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.19";
-  name = "xnee-${version}";
+  pname = "xnee";
 
   src = fetchurl {
-    url = "mirror://gnu/xnee/${name}.tar.gz";
+    url = "mirror://gnu/xnee/${pname}-${version}.tar.gz";
     sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j";
   };
 
diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix
index 8acabeef218819a1a7716721263563579877c338..5dfe74fd37345bd5e39db283f6b8268f107ed3c5 100644
--- a/pkgs/tools/X11/xosview2/default.nix
+++ b/pkgs/tools/X11/xosview2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xosview2-${version}";
+  pname = "xosview2";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xosview/${name}.tar.gz";
+    url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz";
     sha256 = "1drp0n6qjbxyc0104a3aw2g94rh5p218wmrqwxh3kwwm7pmr9xip";
   };
 
diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 435f2b2e9801224f9a309cdae9f3a0dd6fbec200..dfac2cf88a5569b659c6090377f8d5a5677cb440 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,6 +1,6 @@
 { stdenv, xorg, fetchgit }:
 stdenv.mkDerivation rec {
-  name = "xpointerbarrier-${version}";
+  pname = "xpointerbarrier";
   version = "18.06";
   src = fetchgit {
     url = "https://www.uninformativ.de/git/xpointerbarrier.git";
diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix
index d6fab2b19103ab910292691508e86a591ae603ec..770024aa4ba5ae6084093ea2f21dae0c9fc36844 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXinerama }:
 
 stdenv.mkDerivation  rec {
-  name = "libfakeXinerama-${version}";
+  pname = "libfakeXinerama";
   version = "0.1.0";
 
   src = fetchurl {
-    url = "https://www.xpra.org/src/${name}.tar.bz2";
+    url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2";
     sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx";
   };
 
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix
index e54ced714e765e5bc95323c4e14b558da4f8ed01..b528078870a5c1374c009886c129b0285058d175 100644
--- a/pkgs/tools/X11/xrectsel/default.nix
+++ b/pkgs/tools/X11/xrectsel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xrectsel-${version}";
+  pname = "xrectsel";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
index 4f9b7bcb42e9e77a78a70a6c29fe909ade5e3221..70b471c795ef5ed4b9f0ae3787ab9bb0137bb723 100644
--- a/pkgs/tools/X11/xrestop/default.nix
+++ b/pkgs/tools/X11/xrestop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xorg, pkgconfig, ncurses }:
 stdenv.mkDerivation rec {
 
-  name = "xrestop-${version}";
+  pname = "xrestop";
   version = "0.4";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index a7a7c2b6c0d58688a2caf19bca718f73b7453be9..8766e3c0d54dbb484212cce50423ca892e0a7cf7 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -3,7 +3,7 @@
 , pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }:
 
 stdenv.mkDerivation rec {
-  name = "xsecurelock-${version}";
+  pname = "xsecurelock";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 2f84711e61c4237aa2368e89cc69aeaa8b3eb483..bee6cdb748f10e9e49d05b2b091aec3c9120b70c 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xsettingsd-${version}";
+  pname = "xsettingsd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 368012b468f3e0795921cd16dc6fb325a8387ee7..5f789a0151f4d8ad83e3115842a8e65d1d6dc4e8 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,7 +2,7 @@
 , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }:
 
 stdenv.mkDerivation rec {
-  name = "xvkbd-${version}";
+  pname = "xvkbd";
   version = "3.9";
   src = fetchurl {
     url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index b6b87fffb47bbb1f4615bb95a6a20445ae3f4bc8..7b30e5c581558b6e176022e8153c93c8e369f039 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
-  name = "xwinmosaic-${version}";
+  pname = "xwinmosaic";
 
   src = fetchgit {
     url = "https://github.com/soulthreads/xwinmosaic/";
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix
index dbbdb0c04e91171e023c3f1bb9e439e2142941b3..b9d48f5457499b455a0dfad200e5105150e3b728 100644
--- a/pkgs/tools/X11/xwinwrap/default.nix
+++ b/pkgs/tools/X11/xwinwrap/default.nix
@@ -4,7 +4,8 @@ let
   version = "4";
 in
 stdenv.mkDerivation {
-  name = "xwinwrap-${version}";
+  pname = "xwinwrap";
+  inherit version;
 
   src = fetchbzr {
     url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel;
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index 827a19d4bed74cf8bdc6fdcfc12766a8c1e28218..6e89421d390be079a50f16029e75790c07c22b12 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
 stdenv.mkDerivation rec {
-  name = "acme.sh-${version}";
+  pname = "acme.sh";
   version = "2.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix
index 7ece3acbd6794704bd1a4e43ab5941b5a738c9bd..5522fd7a68beb6bb4b4346351c260810b3fb732b 100644
--- a/pkgs/tools/admin/adtool/default.nix
+++ b/pkgs/tools/admin/adtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openldap }:
 
 stdenv.mkDerivation rec {
-  name = "adtool-${version}";
+  pname = "adtool";
   version = "1.3.3";
 
   src = fetchurl {
-    url = "https://gp2x.org/adtool/${name}.tar.gz";
+    url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz";
     sha256  = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n";
   };
 
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
index 02386a135f11ae8569c47e00a0e93d87aad5a212..b3e688c681d94fe80dca0c44bc2c7f7a51b68325 100644
--- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
+++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, lib, ... }:
 
 buildGoPackage rec {
-  name = "amazon-ecr-credential-helper-${version}";
+  pname = "amazon-ecr-credential-helper";
   version = "0.3.0";
 
   goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix
index 37bf0e6c45d36fbba98a9622ab223a72d13f891a..dff37520797650682dd6abecbc6a9316596634e2 100644
--- a/pkgs/tools/admin/aws-env/default.nix
+++ b/pkgs/tools/admin/aws-env/default.nix
@@ -3,7 +3,6 @@
 buildGoPackage rec {
   pname = "aws-env";
   version = "0.4";
-  name = "${pname}-${version}";
   rev = "v${version}";
 
   goPackagePath = "github.com/Droplr/aws-env";
diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix
index e03e7f34535150dc6addd7d3518f4ef6cadb545f..70f1c64c7f272480b2814e3ea01bffdab1fb3d9b 100644
--- a/pkgs/tools/admin/aws-rotate-key/default.nix
+++ b/pkgs/tools/admin/aws-rotate-key/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "aws-rotate-key-${version}";
+  pname = "aws-rotate-key";
   version = "1.0.4";
 
   goPackagePath = "github.com/Fullscreen/aws-rotate-key";
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 03b0ff5c00164a506c5a570bd9e74d18855f0b9b..ddecd15b6ade8efd2037473a21209c500304dd03 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,6 +1,5 @@
 { buildGoPackage, lib, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "${pname}-${version}";
   pname = "aws-vault";
   version = "4.5.1";
 
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index b07db447262703941a3b381ba69332b16f2490b7..33526ba11dfc7113d8c55b2c3b694e7b7e2c7833 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too
+  version = "1.16.215"; # N.B: if you change this, change botocore to a matching version too
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92";
+    sha256 = "13r32z8iyza4gvpf81l6l2ywv37yxi4bb08ry7cli5m6ny9xqlq8";
   };
 
   # No tests included
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
index 8b6395d85d0446e3d94db12f6030f3d6fba445dc..f97a6e5df8910ac2bafa512c595ad976a3dd89ea 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bluemix-cli-${version}";
+  pname = "bluemix-cli";
   version = "0.8.0";
 
   src =
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 3ac9e3c0e94628b3653fbb3799a5a53a073bef56..e4b27d98dff9ee54e8585bbf5b336437eb118d68 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "bubblewrap-${version}";
+  pname = "bubblewrap";
   version = "0.3.3";
 
   src = fetchurl {
-    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966";
   };
 
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index e6ce5d077984bdeab5fdbcd9a60b232e65a2657e..61f284cf85f172aa10180de26d4ab8b2b9fe534c 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -2,7 +2,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "cli53-${version}";
+  pname = "cli53";
   version = "0.8.12";
 
   goPackagePath = "github.com/barnybug/cli53";
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
index 71bef38054419e5fe659166b45038318bf1edc2b..a71958f8a09971105d3c01d268a81ab70f596a8c 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "docker-credential-gcr-${version}";
+  pname = "docker-credential-gcr";
   version = "1.4.3";
 
   goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix
index 3dbc8eea87b1a9d438ce746e6699b4091d4dde23..afb044ad583af02a9eae0cf3bd44e701143d8a40 100644
--- a/pkgs/tools/admin/fastlane/default.nix
+++ b/pkgs/tools/admin/fastlane/default.nix
@@ -1,14 +1,13 @@
 { stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fastlane";
   version = (import ./gemset.nix).fastlane.version;
 
   nativeBuildInputs = [ makeWrapper ];
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
     inherit pname ruby;
     gemdir = ./.;
   };
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 91f233df81d2c5546f3e7aff42ff3b6a0d5f4d41..b35fe709f95a6a203c073dea7bda4206d772128c 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -29,10 +29,10 @@ let
   }.${system};
 
 in stdenv.mkDerivation rec {
-  name = "google-cloud-sdk-${version}";
+  pname = "google-cloud-sdk";
   version = "255.0.0";
 
-  src = fetchurl (sources name stdenv.hostPlatform.system);
+  src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 
   buildInputs = [ python makeWrapper ];
 
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index d4ee4d61293267cd7436b4445254eac35ce2be5d..e09cd2f52853ce0a4a9679779c1eb34418b6ce5e 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "iamy-${version}";
+  pname = "iamy";
   version = "2.3.2";
 
   goPackagePath = "github.com/99designs/iamy";
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index ebdf6b17ed66c82810d05ea0740de868882b0e2f..2df63ea1e15a7f5d8f85e5f50f4fa44f57c06996 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -20,7 +20,7 @@ let
 
 in stdenv.mkDerivation rec {
   inherit version;
-  name = "pulumi-${version}";
+  pname = "pulumi";
 
   src = fetchurl pulumiArchPackage.${stdenv.hostPlatform.system};
 
diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
index b246c7712ec9b0a57b89e967c811d5e6ca9ddbf9..3365d87bba4a1d21d9e1b3ac5e0d70872ab764e5 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec{
-  name = "scaleway-cli-${version}";
+  pname = "scaleway-cli";
   version = "1.17";
 
   goPackagePath = "github.com/scaleway/scaleway-cli";
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix
index f8e893078157c472895342d51ca091972dd73df8..e6a83c397c5724962c843d8db5a6a32ced6db618 100644
--- a/pkgs/tools/admin/ssl-cert-check/default.nix
+++ b/pkgs/tools/admin/ssl-cert-check/default.nix
@@ -13,7 +13,6 @@
 
 stdenv.mkDerivation rec {
   pname = "ssl-cert-check";
-  name = "${pname}-${version}";
   version = "3.31";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 37a0f47c7afe1b867d7e067617f8e09f3fdff021..5a964a7fe70d82703b126d6bf14585fd83caa410 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.9.0";
-  name = "tigervnc-${version}";
+  pname = "tigervnc";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix
index 0d983ad98ea1c9cccb4ea765f043664d6a8c7b28..538464499fa6ae87ad3ace21d72d4723156b949d 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/pkgs/tools/admin/vncdo/default.nix
@@ -4,7 +4,6 @@
 pythonPackages.buildPythonPackage rec {
   pname = "vncdo";
   version = "0.11.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "sibson";
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix
index 0014febf40e437926c4254f3fff18d5e0d84d0d5..13da95a28b5dc3ba057f75fe6197077a8f028d09 100644
--- a/pkgs/tools/archivers/afio/default.nix
+++ b/pkgs/tools/archivers/afio/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.5.2";
-  name = "afio-${version}";
+  pname = "afio";
 
   src = fetchurl {
-    url = "http://members.chello.nl/~k.holtman/${name}.tgz";
+    url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz";
     sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66";
   };
 
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
index cb73233dcb4602b028a1c7ea0af09c26cfb4ab2a..3f958f7f958d5d48721eb0f18808efd69b764258 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -6,7 +6,8 @@ let
   version = "0.8.5";
 
 in stdenv.mkDerivation {
-  name = "fsarchiver-${version}";
+  pname = "fsarchiver";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "fdupoux";
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index c2e7f75fc7fc7c0a361026bb39e8f58f86bb4608..caf507670f4f7d82af346e72838cd02009d90fd6 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, acl }:
 
 stdenv.mkDerivation rec {
-  name = "gnutar-${version}";
+  pname = "gnutar";
   version = "1.32";
 
   src = fetchurl {
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 3b212b186aac10074be7e9f26f60f1a62b130403..465bc474a9e524b8c0c5c804225a8fc23973dd30 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "p7zip-${version}";
+  pname = "p7zip";
   version = "16.02";
 
   src = fetchurl {
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix
index f99ee963dbe6c0392b8876e695020dcdf73bf3b0..b9eaf3dba65ee42e647c62b475718de234e6293d 100644
--- a/pkgs/tools/archivers/runzip/default.nix
+++ b/pkgs/tools/archivers/runzip/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "runzip-${version}";
+  pname = "runzip";
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libzip ];
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix
index d5349900756903cacaa3ac17334830be1b26ca04..48e5cc6c4361822b85abdc6f392e137f38bf9f02 100644
--- a/pkgs/tools/archivers/s-tar/default.nix
+++ b/pkgs/tools/archivers/s-tar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "s-tar-${version}";
+  pname = "s-tar";
   version = "1.6";
   src = fetchurl {
     url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2";
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index 217a8ab35a9e0ab514e9648372fca32945a2baa7..61e60996e75902079b98062ed67c46325a33ece7 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unarj-${version}";
+  pname = "unarj";
   version = "2.65";
 
   src = fetchurl {
     sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
-    url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
+    url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz";
   };
 
   preInstall = ''
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
index 89bb816aa579ab549e2d157db1e3438fed8c2b2b..9d072c9bb19209e4253a5c0e25e07622a652f343 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
-  name = "undmg-${version}";
+  pname = "undmg";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index b9c549d670bfabeb246880219f3a6242cf047e7f..e1cac4fc61f79d42d8a82a1aab315b105e595cee 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -8,7 +8,7 @@ let
   runtime_bins =  [ file unzip gzip ] ++ extraBackends;
 
 in stdenv.mkDerivation rec {
-  name = "unp-${version}";
+  pname = "unp";
   version = "2.0-pre7";
   buildInputs = [ perl makeWrapper ];
 
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 2a51e4d7bc90464f47b9edc82cd7757426fc8232..07f62fa02ad4b7025c7b0fd1680194ea829defe9 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unrar-${version}";
+  pname = "unrar";
   version = "5.7.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix
index 3febb557bf8b1992748fadabd817a5893bdce22d..cfab2443032bd15edfba09816dd055375f381162 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/pkgs/tools/archivers/unshield/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "unshield-${version}";
+  pname = "unshield";
   version = "1.4.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
index 3c52e1944d8f684c1d3fa71fc99ade7b7741ee04..9d58bf5c2f897bd7487d02db4f12e203ccaf2b72 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   version = "1.13.1";
-  name = "wimlib-${version}";
+  pname = "wimlib";
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ openssl fuse libxml2 ntfs3g ];
 
   src = fetchurl {
-    url = "https://wimlib.net/downloads/${name}.tar.gz";
+    url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz";
     sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27";
   };
 
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
index 07e76ea7f62adbe921a81f27f21ae2cbb6e0fce1..ff98e96655fa6199c40045ee04e64585ef845e28 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/pkgs/tools/archivers/xarchive/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.8-6";
-  name = "xarchive-${version}";
+  pname = "xarchive";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xarchive/${name}.tar.gz";
+    url = "mirror://sourceforge/xarchive/${pname}-${version}.tar.gz";
     sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4";
   };
 
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 9860c2b34bd425c1df32153b0ad08f179cea0874..07684155a7e864c9ae72c63fb387b085c47a0b94 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.4.14";
-  name = "xarchiver-${version}";
+  pname = "xarchiver";
 
   src = fetchFromGitHub {
     owner = "ib";
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index c99221b36ba100bb5b6488afa6e45211c1437f9d..09c4e914bd884c8c989ab76e3221932b78dd887f 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "zpaq-${version}";
+  pname = "zpaq";
   version = "7.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 6c587f5cc5c683b5b253d1e75f8e5ca518c1ae48..39ad4626f3eb3c3a4b0ab71ef6ee969f3bf29d1b 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
 
 stdenv.mkDerivation rec {
-  name = "abcm2ps-${version}";
+  pname = "abcm2ps";
   version = "8.14.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 4bb9dd8857431a9d799fc43c74a46a0c14fc174c..773b09958ea7d4989fb09bcf816821697f04ff7c 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "abcMIDI-${version}";
+  pname = "abcMIDI";
   version = "2019.08.11";
 
   src = fetchzip {
-    url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
+    url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
     sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1";
   };
 
diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix
index 502859cd52d394eb891a577d8c1eb80e20dcc001..4590a0dfbc30a25146a926973c6b7c57751d1ebb 100644
--- a/pkgs/tools/audio/accuraterip-checksum/default.nix
+++ b/pkgs/tools/audio/accuraterip-checksum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "accuraterip-checksum-${version}";
+  pname = "accuraterip-checksum";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 4c28c4f3458f2db9dcde6c817974c2e726923d2f..acd205a30de1a49c91ab2f22eeb5e3f184c913eb 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  name = "acoustid-fingerprinter-${version}";
+  pname = "acoustid-fingerprinter";
   version = "0.6";
 
   src = fetchurl {
     url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
-        + "${name}.tar.gz";
+        + "${pname}-${version}.tar.gz";
     sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
   };
 
diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix
index 825e1a0cc07293d10ab65293a5acc24e80ff8c1e..21adf3b972a5f48cdd97c06ecd559f52db7b5bd6 100644
--- a/pkgs/tools/audio/aucdtect/default.nix
+++ b/pkgs/tools/audio/aucdtect/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "aucdtext-${version}";
+  pname = "aucdtext";
   version = "0.8-2";
 
   src = fetchurl {
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 38902f234a2b98d826adbe9d3ad16575989535d2..75d8975ab32c8aa6902bdd11f20b230656dfa86b 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, beets, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "beets-alternatives-${version}";
+  pname = "beets-alternatives";
   version = "0.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index 3cfb9a05b2dcf0fef39245e2e00adf934aa78295..c5f7bcd5a71d83dc2455ec48d28e40a5b2e26eda 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "darkice-${version}";
+  pname = "darkice";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix
index 169f419cd672ca715713939c65705a5bdac3d5ad..d6c988ef0bedcf2dab85ed137e1c782f645ed35a 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/pkgs/tools/audio/dir2opus/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.12.2"; in
 stdenv.mkDerivation rec {
-  name = "dir2opus-${version}";
+  pname = "dir2opus";
+  inherit version;
 
   pythonPath = [ mutagen ];
   buildInputs = [ wrapPython ];
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d";
   };
 
diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix
index 6524bedf93923503d45ba7be87ab63e7a9fc4fb3..fbf90d2211c4b3eb87bf729b06feb15e53cfc6be 100644
--- a/pkgs/tools/audio/ezstream/default.nix
+++ b/pkgs/tools/audio/ezstream/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ezstream-${version}";
+  pname = "ezstream";
   version = "0.6.0";
 
   src = fetchurl {
-    url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz";
+    url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz";
     sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9";
   };
 
diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index 23a33122c9fb34849508d5332cfb286be5c9a8cd..665e2da3329cb2195b120be4da257e302659d47f 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.10";
-  name = "glyr-${version}";
+  pname = "glyr";
 
   src = fetchFromGitHub {
     owner = "sahib";
diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix
index 08bd864792bbc051dc18fd3766311c68931bf36b..bfb4f81c8166e7146140972861c7626fffd386b9 100644
--- a/pkgs/tools/audio/mpdas/default.nix
+++ b/pkgs/tools/audio/mpdas/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }:
 
 stdenv.mkDerivation rec {
-  name = "mpdas-${version}";
+  pname = "mpdas";
   version = "0.4.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index 5b5a0d9c0e0a320c2879438fa95d8a8b770f3c7c..3b59d5aceb056ef9fadcdeffbd9104b6fc3df432 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -8,7 +8,7 @@ let
   };
 in stdenv.mkDerivation rec {
   version = "20161228";
-  name    = "mpdcron-${version}";
+  pname = "mpdcron";
 
   src = fetchFromGitHub {
     owner = "alip";
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 4b72ed3bfd3053a8ee3ae0734b5c13e99af62400..d13dfbe8f43d91b0d8106e70f958ba61f820ad3c 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -4,7 +4,6 @@
 
 stdenv.mkDerivation rec {
   pname = "mpDris2";
-  name = "${pname}-${version}";
   version = "0.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index c0f0aa1bf938bbe91f63407f7df61e73391dd266..782ea314359d9fdbf6213decb77c1a8f09ea809f 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pasystray-${version}";
+  pname = "pasystray";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk";
   };
 
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index cda89302abdd062347dd680a7d7c342f4a777c5a..8a8cd258145582c30a79013d79ee969484166e06 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }:
 
 stdenv.mkDerivation rec {
-  name = "playerctl-${version}";
+  pname = "playerctl";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 9906fa449dda3c374d450e9aabc61e7742e6fbb2..5b27a00a9556181ea0447505395d5dc6514bcb29 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "pnmixer-${version}";
+  pname = "pnmixer";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index d86a0b09c269fc74c5970a30e07b9ec062cd2f92..bdc431bcb9285c028b3292fe4540b337d190b427 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 mkDerivation {
-  name = "qastools-${version}";
+  pname = "qastools";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
index a4dd7197be0f1f59e09cbe8c74a6f7389e035566..d72cb85643735940b30225a00566789e52790c71 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/pkgs/tools/audio/trx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
 
 stdenv.mkDerivation rec {
-  name = "trx-unstable-${version}";
+  pname = "trx-unstable";
   version = "2018-01-23";
 
   src = fetchgit {
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index ed9558762502d02bb5a084b967f1734aa739fc2d..36afd11aa2c390256ffbe074b7fa6c593370a312 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -1,7 +1,7 @@
 { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "volumeicon-${version}";
+  pname = "volumeicon";
   version = "0.5.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index ad0001f22e17a1ec4fda018723360a531c365b31..ce77ebe8c1ae2edee9a38fb83d441425b71f70ac 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -11,14 +11,14 @@ let
   withGlusterfs = "\${with_glusterfs_directory}";
 in
 stdenv.mkDerivation rec {
-  name = "bareos-${version}";
+  pname = "bareos";
   version = "17.2.7";
 
   src = fetchFromGitHub {
     owner = "bareos";
     repo = "bareos";
     rev = "Release/${version}";
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz";
   };
 
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 91809af415a351c898e3492abd734a6b4c3d054f..963d7945b89d5ecb0c7f7f959eae49e1113415b5 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -2,11 +2,11 @@
 , utillinux, asciidoc, asciidoctor, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "btrbk-${version}";
+  pname = "btrbk";
   version = "0.28.3";
 
   src = fetchurl {
-    url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
+    url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
     sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz";
   };
 
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index bf10f556b6bbee2e8c1d95be6e27f1179eb101fd..8f4cd60e1ee05b5643318f7a0abf3075d8c204c6 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -10,7 +10,8 @@ let version = "0.29.2"; in
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "bup-${version}";
+  pname = "bup";
+  inherit version;
 
   src = fetchFromGitHub {
     repo = "bup";
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 8aa2d015205ed1acb12ceaebaf55d35978cfcb60..5c0be4a2de7d03910289a7d3b3b32ec00d98dd90 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -2,7 +2,7 @@
 , acl, librsync, ncurses, openssl, zlib, uthash }:
 
 stdenv.mkDerivation rec {
-  name = "burp-${version}";
+  pname = "burp";
   version = "2.2.18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index 3ab1eba5b6f02c3a27113e2744ad05a266fcb963..736a3122a6f0ae9aa4d17b8b14d2da00d22787f8 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4";
-  name = "chunksync-${version}";
+  pname = "chunksync";
 
   src = fetchurl {
     url = "https://chunksync.florz.de/chunksync_${version}.tar.gz";
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index ac01dc6022b89ca311505a001be4f7bb94ea3f6f..352f320dadf151027e11734bcbbebd5b4593cec7 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.6.5";
-  name = "dar-${version}";
+  pname = "dar";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dar/${name}.tar.gz";
+    url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
     sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd";
   };
 
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 3a5ffc30f8f2a8fffaee10b1c9d2cb3b1bd64cc4..97d876da1279645478019157c5b1026527cef2b9 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -1,8 +1,6 @@
 { buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }:
 
 buildGoPackage rec {
-
-  name = "${pname}-${version}";
   pname = "diskrsync";
   version = "unstable-2018-02-03";
 
diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix
index c774711b874c906fe4ee5cde4b3ce86cf70691e3..be039fa47c091d27ec9b28dd330b4665ddfc15e8 100644
--- a/pkgs/tools/backup/duplicati/default.nix
+++ b/pkgs/tools/backup/duplicati/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, mono, sqlite, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "duplicati-${version}";
+  pname = "duplicati";
   version = "2.0.4.5";
   channel = "beta";
   build_date = "2018-11-28";
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${name}}
-    cp -r * $out/share/${name}
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
-      --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \
+      --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
           sqlite ]}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
-      --add-flags "$out/share/${name}/Duplicati.Server.exe" \
+      --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
           sqlite ]}
   '';
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index d476b797f38e2eac2cb732bfb40270225a4945ac..3e4375cb76c67b26bf1636e4d90ab3e47d86b49c 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "duply-${version}";
+  pname = "duply";
   version = "2.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix
index ceb6feae3962e1839d057145e71775515de9f4ec..412c9696d02aaafdf2bc57be27c5615c0c4337f6 100644
--- a/pkgs/tools/backup/easysnap/default.nix
+++ b/pkgs/tools/backup/easysnap/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, zfs }:
 
 stdenv.mkDerivation rec {
-  name = "easysnap-${version}";
+  pname = "easysnap";
   version = "unstable-2019-02-17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix
index 224b8b12906e23a03c3600dcab948af9a578e320..739f14ca1a6188b4ac92547b81e184829690e512 100644
--- a/pkgs/tools/backup/flockit/default.nix
+++ b/pkgs/tools/backup/flockit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "flockit-${version}";
+  pname = "flockit";
   version = "2012-08-11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 6d761354b6af6b14176637c620001d6246ed7ddc..6fe614195a4b92df8613495ee857ea06450608d2 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.49.2";
-  name = "httrack-${version}";
+  pname = "httrack";
 
   src = fetchurl {
     url = "https://mirror.httrack.com/httrack-${version}.tar.gz";
diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
index e29acc6f3c85f03bbddaee39da46f2ad7f133fba..8cf3eb29462c66fc413b22202d0a86b3df3b0c79 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -2,11 +2,11 @@
 , httrack, qtbase, qtmultimedia }:
 
 stdenv.mkDerivation rec {
-  name = "httraqt-${version}";
+  pname = "httraqt";
   version = "1.4.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/httraqt/${name}.tar.gz";
+    url = "mirror://sourceforge/httraqt/${pname}-${version}.tar.gz";
     sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b";
   };
 
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index e87878551254bdd144eb1825d54d3245abea2cef..5538b45c5f1b7269e1cd5af5d883ccf4636387b1 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.5";
-  name = "mydumper-${version}";
+  pname = "mydumper";
 
   src = fetchFromGitHub {
     owner  = "maxbube";
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index 279652b0cd0b47b39163afaaa6b8a2861bec0480..e07eb33abb587818e8eb1f0d7a4a6b3360f41b86 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.8.1";
-  name = "ori-${version}";
+  pname = "ori";
 
   src = fetchurl {
     url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz";
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index 021f783e0fdd99808b74801a204a2930723f4044..fa4346c8cccce5da89d2d87af139f49aaeef41b8 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "partclone-${version}";
+  pname = "partclone";
   version = "0.3.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index 712d0af29a95d55c796db5ed6256e84ff64639eb..98eae9cc67024251312dc1e77bf010da5e6375c6 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "percona-xtrabackup-${version}";
+  pname = "percona-xtrabackup";
   version = "2.4.12";
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = "percona-xtrabackup";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan";
   };
 
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix
index 33e3c77db887a89e19d32c8504730054549d49bd..56f9c4f9dafe87bfc9f52d0dfd1250aa5b3d645e 100644
--- a/pkgs/tools/backup/rdup/default.nix
+++ b/pkgs/tools/backup/rdup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "rdup-${version}";
+  pname = "rdup";
   version = "1.1.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index da44e389bdd51f97c2db3f2798f1d35992bb0088..b78fc9b61f741259016d783c183e366d69d969f8 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "restic-${version}";
+  pname = "restic";
   version = "0.9.5";
 
   goPackagePath = "github.com/restic/restic";
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index d9f889897aa2403d49cf5b9acce8cb5011cec6eb..c7f12cb751b235b84bbf7bf3b71b9dab86e636c7 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "restic-rest-server-${version}";
+  pname = "restic-rest-server";
   version = "0.9.7";
 
   goPackagePath = "github.com/restic/rest-server";
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index 96bbea4791e8f967a13bb63318e2f34f3c8bc120..4c13c831ba94caec5e51a1f78ddc38f6837a7473 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, coreutils, gnused, gawk, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rsbep-${version}";
+  pname = "rsbep";
   version = "0.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 7324f75d95fa4eb5792cbfa96decd1be31016841..a0f568b16b3e0eac401103a92252a6bcab15baa5 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   version = "3.5";
 
-  name = "store-backup-${version}";
+  pname = "store-backup";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 3767a377cfcf4a94b142bf632c6a2658ba04eb75..d24da778dcdb47de00088a5734cc06488060864c 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -7,7 +7,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "tarsnap-${version}";
+  pname = "tarsnap";
   version = "1.0.39";
 
   src = fetchurl {
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index 42a3f51ee609cc68a704b0e4ea65f81fa052073f..9c7cb0a83fd6d45912652ebb487cd2496ec2368f 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "wal-e-${version}";
+  pname = "wal-e";
   version = "0.6.10";
 
   namePrefix = "";
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index ce9237a7c6bc9e9ed19f3b83b1a6785c454da735..70cc8a425c1641f3c64c9a1c0102852c1af5f21b 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, brotli }:
 
 buildGoPackage rec {
-  name = "wal-g-${version}";
+  pname = "wal-g";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index c9fb1c54726080b7a846afca2019561abc908914..928ba9842b256469fac8aedcb29283fec0c88c6a 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
 stdenv.mkDerivation rec {
-  name = "zbackup-${version}";
+  pname = "zbackup";
   version = "1.4.4";
   src = fetchurl {
     url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz";
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 05792ecbb128444571ae0ebb844877d071e6c515..973e92176443cd5e2d5545f40354cb86ce1430b4 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -24,7 +24,8 @@ let
   checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
 in
 stdenv.mkDerivation rec {
-  name = "znapzend-${version}";
+  pname = "znapzend";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "oetiker";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 84a2375302f70ebb76da5e84ceae3fcb634bd11e..b28e50d54b077668561735e41d918fbf7f91fb76 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -8,11 +8,11 @@ let
   binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
 
 in stdenv.mkDerivation rec {
-  name = "blueman-${version}";
+  pname = "blueman";
   version = "2.0.8";
 
   src = fetchurl {
-    url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4";
   };
 
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index f13db4572e08a4e6c58093e3ac4ce2566ceedad5..097b7ae00d780be4755de0d22933c51cb0814759 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "bluez-alsa-${version}";
+  pname = "bluez-alsa";
   version = "1.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 0cdcd4c58df4a670e53d4207d5c9f9a8c0efc729..4ddc75542945ebbea5b40a2fe8fb8f60abcbc432 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "refind-${version}";
+  pname = "refind";
   version = "0.11.4";
   srcName = "refind-src-${version}";
 
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 63a429e50de81c60453b3608214ca3dea211ee43..ccf632dfe5a50f13fd7a5aa4e01ab5736783fe9a 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -3,13 +3,13 @@
 , vorbis-tools, xorriso }:
 
 stdenv.mkDerivation rec {
-  name = "bashburn-${version}";
+  pname = "bashburn";
   version = "3.1.0";
 
   src = fetchurl {
     sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp";
     url = "http://bashburn.dose.se/index.php?s=file_download&id=25";
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   nativeBuildInputs = [ utillinux ];
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index aa47edcb96c4e73096e2976d4f5f17078719d1c2..b4f0d1039edc66323d1a008729108b1e51f5c5f1 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bchunk-${version}";
+  pname = "bchunk";
   version = "1.2.2";
 
   src = fetchurl {
-    url = "http://he.fi/bchunk/${name}.tar.gz";
+    url = "http://he.fi/bchunk/${pname}-${version}.tar.gz";
     sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 402073ff5241bbc5164139be750dec4a387a84e8..a9f5b321d3d7e775ec5c3382033e1145fdb77c3b 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -9,10 +9,10 @@ let
 
 in stdenv.mkDerivation rec {
   version = "${major}.${minor}";
-  name = "brasero-${version}";
+  pname = "brasero";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz";
+    url = "http://download.gnome.org/sources/brasero/${major}/${pname}-${version}.tar.xz";
     sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
   };
 
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
index a65f2d47d8f8b61210336338e05da1c14e209c29..00a1864b03577e58de9827eb5d85c58d08fd08fa 100644
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cdi2iso-${version}";
+  pname = "cdi2iso";
   version = "0.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz";
+    url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz";
     sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
   };
 
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix
index 888711a85014306e8c68856d6b0f98da499a7e4f..d617a9a6c542ea3130b7d963172cf204cbdd9ee0 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name = "cdimgtools-${version}";
+  pname = "cdimgtools";
   version = "0.3";
 
   src = fetchFromRepoOrCz {
diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix
index 6523c8a0cf3f9621738d2e8e8c740e71f2c11ff6..970b32eb08fbc0aa181dbd3da0fd61863faa9943 100644
--- a/pkgs/tools/cd-dvd/cue2pops/default.nix
+++ b/pkgs/tools/cd-dvd/cue2pops/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cue2pops-${version}";
+  pname = "cue2pops";
   version = "git-2018-01-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix
index 99908f06b10177f851c78d6825953d2b01f4bcdc..2cb90129ed9a3dd5d8aa2e6178fe038494b85722 100644
--- a/pkgs/tools/cd-dvd/dvd-vr/default.nix
+++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dvd-vr-${version}";
+  pname = "dvd-vr";
   version = "0.9.7";
   src = fetchurl {
     url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz";
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 82f1842e963e224ad44f7b97cf0bdabf01a852ea..6a4161ba1faa79eafef86e7998a8d4fab2c0d860 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dvdisaster-${version}";
+  pname = "dvdisaster";
   version = "0.79.5";
 
   src = fetchurl {
-    url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
+    url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
   };
 
diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix
index ec814d97bde04015bac0ccfd37f3feb31237a3dc..922ab39063a0fc74a41a10587516f1cd2eb65112 100644
--- a/pkgs/tools/cd-dvd/ecm-tools/default.nix
+++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ecm-tools-${version}";
+  pname = "ecm-tools";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 56ec8e19f54e0485ef89f084d507c1d153f59b4a..09fbc8b38c87395982e30b5b28fece21a9cbdd42 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.17";
 in
 stdenv.mkDerivation {
-  name = "lsdvd-${version}";
+  pname = "lsdvd";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz";
     sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x";
diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix
index f33ba31beee84139d925c77ada63ff8529090c95..dbad9d362478f1e33fab56eeab1bb2cda939cfa5 100644
--- a/pkgs/tools/cd-dvd/mdf2iso/default.nix
+++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit}:
 
 stdenv.mkDerivation rec {
-  name = "mdf2iso-${version}";
+  pname = "mdf2iso";
   version = "0.3.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix
index 0a9d61e9da8eeafd2c84c93101e5151a7e22d87a..357992d7291688d31c355a051fb3e017dd7f0afc 100644
--- a/pkgs/tools/cd-dvd/mkcue/default.nix
+++ b/pkgs/tools/cd-dvd/mkcue/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mkcue-${version}";
+  pname = "mkcue";
   version = "1";
 
   src = fetchurl {
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix
index 98853d1ba61a01c46d7817347fbcaffb572c975b..43ed7ea7d38952629bd398ba427664672729115c 100644
--- a/pkgs/tools/cd-dvd/nrg2iso/default.nix
+++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "nrg2iso-${version}";
+  pname = "nrg2iso";
   version = "0.4";
 
   src = fetchurl {
-    url = "http://gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz";
+    url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz";
     sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115";
   };
 
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 502937dd565b77be0cc5fbc169929f41a6d68941..9495f8dac9968f6dc5a7615c9d96abef3dd4e533 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -2,7 +2,7 @@
 , p7zip, mtools, syslinux }:
 
 stdenv.mkDerivation rec {
-  name = "unetbootin-${version}";
+  pname = "unetbootin";
   version = "661";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 4f288b9e56f8ea819bc308b407a37d4569b1c57c..8bee8059fe2734e60cc0251f5da1c7b69e1592bc 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "advancecomp-${version}";
+  pname = "advancecomp";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index a3987085c8e3c05952744a03bc92b10baeff033a..33b6f12cd46c686efc320a3c3190aaf78444c437 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -3,7 +3,7 @@
 # ?TODO: there's also python lib in there
 
 stdenv.mkDerivation rec {
-  name = "brotli-${version}";
+  pname = "brotli";
   version = "1.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix
index 4c88e58e6c109721d018286a9b22eaeaeb13b35e..c1ddb242dad0f0d7a10fb55674880aa451d2f66e 100644
--- a/pkgs/tools/compression/bsc/default.nix
+++ b/pkgs/tools/compression/bsc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openmp ? null }:
 
 stdenv.mkDerivation rec {
-  name = "bsc-${version}";
+  pname = "bsc";
   version = "3.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 617d86e7f1e3acb1a703b87921347230bdc63f01..a5b527d70b7fd119b7cb93bcf1219207d966ca80 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name    = "bsdiff-${version}";
+  pname = "bsdiff";
   version = "4.3";
 
   src = fetchurl {
-    url    = "https://www.daemonology.net/bsdiff/${name}.tar.gz";
+    url    = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz";
     sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
   };
 
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index a0ec6c07055b839d96216e7f20caa9115cf091ed..a440c08bd1bbdd75652308d88f37298bb6e1b191 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bzip2-${version}";
+  pname = "bzip2";
   version = "1.0.6.0.1";
 
   /* We use versions patched to use autotools style properly,
       saving lots of trouble. */
   src = fetchurl {
     urls = map
-      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz")
+      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.tar.gz")
       [
         "http://ftp.uni-kl.de/pub/linux/suse"
         "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse"
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index c9ec557ab1f4b67a65fca25f41cec7be5ec35690..19bc2fdc17693a5864fb9e46fe1af65445cfc14b 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -12,7 +12,7 @@ let
   ++ [ bzip2 xz lzip ]);
 
 in pythonPackages.buildPythonApplication rec {
-  name = "dtrx-${version}";
+  pname = "dtrx";
   version = "7.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index bd4d85e90e3613791c2326d8d2161a54c315186f..e6409f051227c60c52760ecc8715edafc66effa9 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
-  name = "gzip-${version}";
+  pname = "gzip";
   version = "1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/gzip/${name}.tar.xz";
+    url = "mirror://gnu/gzip/${pname}-${version}.tar.xz";
     sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4";
   };
 
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index 083a71f6a756ffdc9ae71376c8351009e1124e2d..2c6765b2e837212637221d29017534b66ad42d14 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.631";
-  name = "lrzip-${version}";
+  pname = "lrzip";
 
   src = fetchurl {
-    url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
+    url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2";
     sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d";
   };
 
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index 0bf1558079800220fd9a7dc586d1a1764d9325ab..ef185f706dce9d4e34c15278faadb56138c7c357 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lzfse-${version}";
+  pname = "lzfse";
   version = "2017-03-08";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index dfd91bf37d3485e1893c0504a25351296116120b..4ec40deab6c3aa54e60296f64fc262f776c9d145 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "lzip-${version}";
+  pname = "lzip";
   version = "1.21";
 
   nativeBuildInputs = [ texinfo ];
 
   src = fetchurl {
-    url = "mirror://savannah/lzip/${name}.tar.gz";
+    url = "mirror://savannah/lzip/${pname}-${version}.tar.gz";
     sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4";
   };
 
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix
index 9b9de8d8302faff6f3945458227724f85a0d53a5..28c7c1d69f709a08bdb6e461d26a485a7e360968 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, python3, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "mozlz4a";
   version = "2018-08-23";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix
index 1d5cd85a62e6d2fae1b95809d1a0dd4019e12d71..94ca5eb58b1fe171af9f670673a32ff8284d9a47 100644
--- a/pkgs/tools/compression/pbzip2/default.nix
+++ b/pkgs/tools/compression/pbzip2/default.nix
@@ -4,10 +4,11 @@ let major = "1.1";
     version = "${major}.13";
 in
 stdenv.mkDerivation rec {
-  name = "pbzip2-${version}";
+  pname = "pbzip2";
+  inherit version;
 
   src = fetchurl {
-    url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg";
   };
 
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix
index bbba21f2b34d836cf68881d87323d618416b2f6a..13e5882788d183a83ae41e5d362533810d800506 100644
--- a/pkgs/tools/compression/pbzx/default.nix
+++ b/pkgs/tools/compression/pbzx/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "pbzx";
   version = "1.0.2";
-  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "NiklasRosenstein";
     repo = "pbzx";
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 60023d028a9fcc63396dd3b9e2006adb093e7178..7f9c7cb777365c2e661ce198984c2bf62122e9f9 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ucl, zlib, perl }:
 
 stdenv.mkDerivation rec {
-  name = "upx-${version}";
+  pname = "upx";
   version = "3.95";
   src = fetchurl {
-    url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz";
+    url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz";
     sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv";
   };
 
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
index a794296bfd95ee8c049135798cc6c13823e8ff71..691f3a8ee5d8dbfaf4d8b67c3fa28001728bb8c9 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/pkgs/tools/compression/xar/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.1";
-  name    = "xar-${version}";
+  pname = "xar";
 
   src = fetchurl {
-    url    = "https://github.com/downloads/mackyle/xar/${name}.tar.gz";
+    url    = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz";
     sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
   };
 
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 32de493ec77d9c639466c92188b5d0fd825b3dcf..034cdb7d94ecea8fa936343eea58fe33d98fdd94 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -9,7 +9,7 @@ let
     then "--with-${name}"
     else "--without-${name}";
 in stdenv.mkDerivation rec {
-  name = "xdelta-${version}";
+  pname = "xdelta";
   version = "3.0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index c870e501209bcefe2292eb9ead9e693dd3fe2dd3..bf2601dd37385741396a522c58de8a74d480e83c 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -9,7 +9,7 @@ let
     then "--with-${name}"
     else "--without-${name}";
 in stdenv.mkDerivation rec {
-  name = "xdelta-${version}";
+  pname = "xdelta";
   version = "3.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 06c7e6439a9fc271f3708f2e343bc23fafac951c..accead9db0bcd6d08c59e0a8a6300a0acd33e6d4 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "zopfli-${version}";
+  pname = "zopfli";
   version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zopfli";
-    rev = name;
-    name = "${name}-src";
+    rev = "${pname}-${version}";
+    name = "${pname}-${version}-src";
     sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y";
   };
 
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix
index 74ba47ceee1a74e875b1c67425a84b8f8adeef18..137b00802dfd5bf699c2915e79b7e65fa059c59d 100644
--- a/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/pkgs/tools/filesystems/afpfs-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "afpfs-ng-${version}";
+  pname = "afpfs-ng";
   version = "0.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 35e26828176d682886714bd3af1ce77209022340..b95a9ad68a82431ababec95a94e2c3549b982ec1 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, fuse, xz }:
 
 stdenv.mkDerivation rec {
-  name = "avfs-${version}";
+  pname = "avfs";
   version = "1.1.1";
   src = fetchurl {
-    url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8";
   };
 
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix
index cd0f3ea23229e59f745e498d15e9e840dd3cee8a..d449bf1266a0e2fc2a4f9531f0495568bcf2f0c6 100644
--- a/pkgs/tools/filesystems/bashmount/default.nix
+++ b/pkgs/tools/filesystems/bashmount/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
-  name = "bashmount-${version}";
+  pname = "bashmount";
   version = "3.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index efd48fb87fe7b99f31a6bd93578e584f19bc8abe..d3e790a3cf134bf306961b534814f807a32f773d 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, utillinux, bash }:
 
 stdenv.mkDerivation rec {
-  name = "bcache-tools-${version}";
+  pname = "bcache-tools";
   version = "1.0.7";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
     sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
   };
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index f12e8af84b88921cca5ec76be72a1ab401669ee5..842ef6712ac9ed646a0a7e1685d26fefc7c1c2be 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -6,7 +6,7 @@ let
   sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
 
   bees = stdenv.mkDerivation rec {
-    name = "bees-${version}";
+    pname = "bees";
     inherit version;
 
     src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 6a9d17772c88313c4e25b88b1b0450a85059760c..a8849e6af22b3899bde372afee4158fc786dd40c 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.14.1";
-  name    = "bindfs-${version}";
+  pname = "bindfs";
 
   src = fetchurl {
-    url    = "https://bindfs.org/downloads/${name}.tar.gz";
+    url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
     sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl";
   };
 
diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix
index b5694535e94690f64c59621d222fb2b20544ace8..067f200e201e42ef96185045bf5abcd9012d4eb1 100644
--- a/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/pkgs/tools/filesystems/blobfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "blobfuse-${version}";
+  pname = "blobfuse";
   version = "1.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index 9c9dbede83f47a6d326ab8c3298e4bf1caef1a74..a0983004fccdf70a99398db56f3ab5163cab4796 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -22,7 +22,7 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "boxfs-${version}";
+  pname = "boxfs";
   version = "2-20150109";
 
   src = srcs.boxfs2;
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 2ef70ca78479d1dd4f8ee7fcba1d458557a67182..f5588cc51abce0dd900b601ac1bcdc22779b12d6 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "btrfs-progs-${version}";
+  pname = "btrfs-progs";
   version = "5.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 6ecc65149c49672148dcc4dd85f866b59a95fdba..e8a4917be99f55a3d379313961b3eb4aee36df39 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -96,7 +96,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name="ceph-${version}";
+  pname = "ceph";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix
index 47428e7f52e4b369af744343e9e2949943e9cc32..6c0a6c2870311ea39b348b09b2a995933393cc60 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/pkgs/tools/filesystems/chunkfs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7";
-  name = "chunkfs-${version}";
+  pname = "chunkfs";
 
   src = fetchurl {
     url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz";
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
index 8af745ed436e167e89283dc2879a47f935699cd3..00ef368ad3dae66155e48e9249b2ae1c2563b8ee 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, lvm2 }:
 
 buildGoPackage rec {
-  name = "convoy-${version}";
+  pname = "convoy";
   version = "0.5.0";
 
   goPackagePath = "github.com/rancher/convoy";
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index 71e27c94dbdbce884b2bf2e3d91486f0b13d50b7..67016af8c0d38aaea72b891b66b71db955e145b6 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cryfs-${version}";
+  pname = "cryfs";
   version = "0.9.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 4952036a860b6f80685d042e1cca9f73e9c47e96..4d40d61b57012f7c217200be4abd11eb39c1fd22 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
 
 stdenv.mkDerivation rec {
-  name = "darling-dmg-${version}";
+  pname = "darling-dmg";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 2e4ea88df7f49bdf9512b345ffd254c996bc4ce4..e6c4474765c3751c34677938c3eda58e7f7fcdbd 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -7,7 +7,8 @@ let
   version = "0.7.1";
 in
 stdenv.mkDerivation rec {
-  name = "dislocker-${version}";
+  pname = "dislocker";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "aorimn";
diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index b8028741d57fe7ef6d64c1886f2e69ba41dce1fa..5137719790afdb9f3917181e723fce00eba5675f 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "disorderfs-${version}";
+  pname = "disorderfs";
   version = "0.5.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix
index e8deeaf4b47055afa1ae7ba06c4ffd4c7f64472c..e3c8c2944fbae3b7c8dc7cec134e4a2f4fcad52a 100644
--- a/pkgs/tools/filesystems/djmount/default.nix
+++ b/pkgs/tools/filesystems/djmount/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "djmount-${version}";
+  pname = "djmount";
   version = "0.71";
   src = fetchurl {
-    url = "mirror://sourceforge/djmount/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/djmount/${version}/${pname}-${version}.tar.gz";
     sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa";
   };
 
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 82f64362fadfd503b51b88320a0a0da7c913b2db..369d2e74f301502b4e55f2ca83622dd0fd4f7e0d 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-${version}";
+  pname = "dosfstools";
   version = "4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index e1b11a3705534ad6dd6732c1b879ea48c9d86eff..a61c3c80e6d2f477569a73cb5329f9d87b62e485 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "duff-${version}";
+  pname = "duff";
   # The last release (0.5.2) is more than 2 years old and lacks features like -D,
   # limiting its usefulness. Upstream appears comatose if not dead.
   version = "2014-07-03";
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 208cbb83209cc10ae3fd8b450592ef2f2f1ba652..0950445bd3ec9008cd2ebaf1160f54b966b2c73e 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "duperemove-${version}";
+  pname = "duperemove";
   version = "0.11.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix
index dcaad81a5a3ff442d559960d5d2d28f067b68856..14f6afa99f0cd597a6aefcca4cfb216a71e92761 100644
--- a/pkgs/tools/filesystems/e2tools/default.nix
+++ b/pkgs/tools/filesystems/e2tools/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "e2tools";
   version = "0.0.16";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz";
+    url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz";
     sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f";
   };
 
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 1a9951a33fd74631dffed53cd48bc83ec517c7f1..19767b7013ae26eb6e8e0d48f4475614f2a53bce 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "encfs-${version}";
+  pname = "encfs";
   version = "1.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
index 97a96651a68e74142257af771051462465bb3518..24db663aee02ca4af7bc0541cb70b78e2885a8b6 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "exfat-${version}";
+  pname = "exfat";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
index 0211ab63b3e964f53d8888e6a7fa5c26e54de4ff..40159b5fb6e6dc1d8c3dd36de0fb3f17233e2f51 100644
--- a/pkgs/tools/filesystems/ext4magic/default.nix
+++ b/pkgs/tools/filesystems/ext4magic/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
-  name = "ext4magic-${version}";
+  pname = "ext4magic";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ext4magic/${name}.tar.gz";
+    url = "mirror://sourceforge/ext4magic/${pname}-${version}.tar.gz";
     sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115";
   };
 
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index e0c5ea3def4e764d90aedfb36577729f039b6794..274126e1a7186f6825d0981a8359fccfd1575772 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.4";
-  name = "extundelete-${version}";
+  pname = "extundelete";
 
   src = fetchurl {
     url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2";
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 90bb443dfdd28bd086bc8625446fd1c4ff9af9b8..d7fa971c9878debb520980f07fa09dd4b913a8b1 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "f2fs-tools-${version}";
+  pname = "f2fs-tools";
   version = "1.11.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index 598263c8895e58d2c62ae7b14219e54afd348524..d2887582938887ee64122299d8fe49971728176b 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -3,7 +3,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "f3";
   version = "7.2";
 
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index 7bb5dd415a6a8e25d4f4a318242e9a968dbe4de6..a00104510bf204952ba0183ced71297c2cf84958 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "1.0.2";
-  name = "fatresize-${version}";
+  pname = "fatresize";
 
   src = fetchurl {
     url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix
index 18d9097dacbcb4a1ed498bfabf02e26e8d6edd0d..aee053ad13559a24ef9502ba341b56a556034fe1 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/pkgs/tools/filesystems/fatsort/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5.0.456";
-  name = "fatsort-${version}";
+  pname = "fatsort";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fatsort/${name}.tar.xz";
+    url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz";
     sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8";
   };
 
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index 82e2b404b82acdea03c37aabe171b51d0e8dff24..a8eb1118f4d367149e8bb2f2f14f60a136fa77bc 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fuse-7z-ng";
   version = "git-2014-06-08";
 
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index ccc5f1f2d4a885609623537fc410567318564e20..fe46fccf271ac0d0c0ce601e5b3a1535912738a7 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,7 +2,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gcsfuse-${version}";
+  pname = "gcsfuse";
   version = "0.23.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
index 581970e34fa743638ef1d6469c88283f99a7c15d..e905222ad45e88ddcc7a2ad5548387a7141b2f2c 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libconfuse, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "genimage-${version}";
+  pname = "genimage";
   version = "9";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix
index 6a3e280aae3685ab96434d0af9c00f3865bd1096..1e6c73f725a8cf3f240d8bf6161517406e47e8da 100644
--- a/pkgs/tools/filesystems/genromfs/default.nix
+++ b/pkgs/tools/filesystems/genromfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.2";
-  name = "genromfs-${version}";
+  pname = "genromfs";
 
   src = fetchurl {
-    url = "mirror://sourceforge/romfs/genromfs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/romfs/genromfs/${version}/${pname}-${version}.tar.gz";
     sha256 = "0q6rpq7cmclmb4ayfyknvzbqysxs4fy8aiahlax1sb2p6k3pzwrh";
   };
 
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 72e43725ef59c16b7dc152cc6a2e7bdcca058048..605e341c4d77533cf8d755e73f1f33a1e992f0c2 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,7 +1,7 @@
 { pkgconfig, libusb1, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "go-mtpfs-${version}";
+  pname = "go-mtpfs";
   version = "2018-02-09";
   rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
 
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
index ca2d0a627ab8f4dce104b575494c2f5de8c838b7..59b4785888b277839b2ebd99e16db0a1c6d021c5 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "gpart-${version}";
+  pname = "gpart";
   version = "0.3";
 
   # GitHub repository 'collating patches for gpart from all distributions':
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
index 4f7c2248a8edb40a970f2f3701fb2353915b6dc1..59ee358e028a234e522c3b11d8e32133c35b9750 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
-  name = "grive2-${version}";
+  pname = "grive2";
 
   src = fetchFromGitHub {
     owner = "vitalif";
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index 4594aa9370ca420062a1077e61527437055215e2..9b1c2b66e7aae2b708ecf5d86fe4b7888384fd9c 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
 
 stdenv.mkDerivation rec {
-  name = "hubicfuse-${version}";
+  pname = "hubicfuse";
   version = "3.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix
index 083bae24d601da5ddf69d63cf8d17aa778b9ed30..aef6087d3f283198d64dd802b8865a9248960c60 100644
--- a/pkgs/tools/filesystems/ifuse/default.nix
+++ b/pkgs/tools/filesystems/ifuse/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "ifuse";
   version = "2018-10-08";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 6044806a34b739eb2f925c753af527c0008fd53c..58963753a51ad46a86dc47e2b6af1322fed0c089 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.5"; in
 stdenv.mkDerivation {
-  name = "jmtpfs-${version}";
+  pname = "jmtpfs";
+  inherit version;
 
   src = fetchFromGitHub {
     sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index f6637b621b8e5e2cb61dff73ef4d0452fc233cbc..6a9d68291f2cdb9a060a705bcdea2bd4f08a0c2b 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -28,7 +28,7 @@ let
     sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
   };
 in stdenv.mkDerivation rec {
-  name = "lizardfs-${version}";
+  pname = "lizardfs";
   version = "3.12.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix
index 15bb390e3648dbe552cb9abff24045f2cd815aa6..4d90e189b950d84e2a79aeef7d2e47069ec35acb 100644
--- a/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/pkgs/tools/filesystems/mhddfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fuse, pkgconfig, attr, uthash }:
 
 stdenv.mkDerivation rec {
-  name = "mhddfs-${version}";
+  pname = "mhddfs";
   version = "0.1.39";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
index 48f13925ab08d408412eef8911bdb9a84f30bf2a..6733b3df45eae616b1a36c030a8939e1b5ef28ef 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -4,7 +4,7 @@
 # overriding the same-named attributes. See ./presets.nix for examples.
 
 stdenv.mkDerivation rec {
-  name = "mkspiffs-${version}";
+  pname = "mkspiffs";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index cc8ca84112487d2514346b3cbc24799f0a2ecd35..b453067eaef8a3e2f08ef5cb65d51d489180c7b0 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "mp3fs-${version}";
+  pname = "mp3fs";
   version = "0.91";
 
   src = fetchurl {
-    url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4";
   };
 
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index d0ceaf94a75f0bfa1eb0523fb0d0a63a7be15eb1..c4910b166de7c2d4ddaba586b13864937b8a60a4 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libuuid, lzo, zlib, acl }:
 
 stdenv.mkDerivation rec {
-  name = "mtd-utils-${version}";
+  pname = "mtd-utils";
   version = "1.5.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 24aab7dc6dd4cdf00e7cd5d80c243ba7554a0b58..48a72c5dd625d5f122643dc40ce1d5a87ee7d1d5 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -8,12 +8,12 @@
 assert useNixUdev -> systemd != null;
 
 buildPythonApplication rec {
-  name = "blivet-${version}";
+  pname = "blivet";
   version = "0.17-1";
 
   src = fetchurl {
     url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
-        + "${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2";
     sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
index 881301ed38e56b5b1adcffce387067824b74a20a..408d02bced74d3c4bc2ebdeb24a8d2daa587081d 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python, lvm2, dmraid }:
 
 stdenv.mkDerivation rec {
-  name = "pyblock-${version}";
+  pname = "pyblock";
   version = "0.53";
   md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
 
   src = fetchurl rec {
     url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
-        + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
     sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index ce1d0bf28a16542208ec9c8866a49800fd7907ab..ffe31b464b8ab9277019b67129843233f5d21147 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -1,13 +1,13 @@
 { stdenv, python, buildPythonApplication, fetchurl, urlgrabber }:
 
 buildPythonApplication rec {
-  name = "pykickstart-${version}";
+  pname = "pykickstart";
   version = "1.99.39";
   md5_path = "d249f60aa89b1b4facd63f776925116d";
 
   src = fetchurl rec {
     url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
-        + "${name}.tar.gz/${md5_path}/${name}.tar.gz";
+        + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
     sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index fd6c5b913093d5eb9d570c4390d93aa6a9e553a3..e0947b01f51bbd8f6cbd68b16f13b5e0d3aee7a2 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
 
 buildPythonApplication rec {
-  name = "pyparted-${version}";
+  pname = "pyparted";
   version = "3.10";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz";
+    url = "https://fedorahosted.org/releases/p/y/pyparted/${pname}-${version}.tar.gz";
     sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv";
   };
 
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index ce00367c771c79d229808105502e9dfde1be2113..8f59ff809a833367a83bd2a6293be41b854c2694 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonApplication, blivet }:
 
 buildPythonApplication rec {
-  name = "nixpart-${version}";
+  pname = "nixpart";
   version = "1.0.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index c919bfade3acbc9033df20e189857412125d88b9..3660649553d504de67a7ec9b4830f928520caa4e 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   pname = "ntfs3g";
   version = "2017.3.23";
-  name = "${pname}-${version}";
 
   outputs = [ "out" "dev" "man" "doc" ];
 
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix
index 2457ac59a213d4827f1bd3df29eeb9fcaf996176..424f84ec34f9b9c8e5bce1d65695035b4ffaa0b9 100644
--- a/pkgs/tools/filesystems/rdfind/default.nix
+++ b/pkgs/tools/filesystems/rdfind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nettle }:
 
 stdenv.mkDerivation rec {
-  name = "rdfind-${version}";
+  pname = "rdfind";
   version = "1.4.1";
 
   src = fetchurl {
-    url = "https://rdfind.pauldreik.se/${name}.tar.gz";
+    url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
     sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih";
   };
 
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix
index 967a8ee43bef3aa933fc2dce4c08f0b6af5c0fad..c9af30f873b47d20a8a71ebd43b836f8d1a8eda9 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -2,10 +2,11 @@
 
 let version = "1.2.1"; in
 stdenv.mkDerivation rec {
-  name = "reiser4progs-${version}";
+  pname = "reiser4progs";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz";
+    url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz";
     sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7";
   };
 
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 345974bed58d2b9645c78cc299cfc9d8ec02dfb8..a89ea0657500ba2d6e0b557f73da7938f3d16a0e 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -2,10 +2,11 @@
 
 let version = "3.6.24"; in
 stdenv.mkDerivation rec {
-  name = "reiserfsprogs-${version}";
+  pname = "reiserfsprogs";
+  inherit version;
 
   src = fetchurl {
-    url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz";
+    url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz";
     sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
   };
 
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 8fb002b2d7fdf981173f31c6b622d2f6c93eb57a..73f88964f2c832e76f8a005e43efe216721bfa13 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -3,7 +3,7 @@
 , fuse, curl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "s3backer-${version}";
+  pname = "s3backer";
   version = "1.5.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 816c09161dcfda8868b0b579a54ff8eaab056bcb..3fc082dad4625bc56cc1563b79f45bde32661725 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "s3fs-fuse-${version}";
+  pname = "s3fs-fuse";
   version = "1.85";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index a21aacb7e6b84b32b2077960171181218830ec4f..c5a5af212d9099fc7fbbfed84f212c003a71beca 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -3,7 +3,7 @@
 , fuse }:
 
 stdenv.mkDerivation rec {
-  name = "securefs-${version}";
+  pname = "securefs";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix
index 94c45ec4689a540aaf40f01b482fd1450ceba447..997aa321afa36fbff72be4954fef3ef2c108a940 100644
--- a/pkgs/tools/filesystems/simg2img/default.nix
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "simg2img-${version}";
+  pname = "simg2img";
   version = "1.1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 26cef4ac90f247cfc1d432888809d71866aff5ea..be46abb2694d93d4b393a39a1324ea9426b910bd 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }:
 
 stdenv.mkDerivation rec {
-  name = "smbnetfs-${version}";
+  pname = "smbnetfs";
   version = "0.6.1";
   src = fetchurl {
-    url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2";
     sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4";
   };
 
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index 725ff3e56dcd01868957ba9c37ebea0b33914555..b5ffdade98f819916cbb4d0025975516bd894ec1 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "snapraid-${version}";
+  pname = "snapraid";
   version = "11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 59a786116df62337868f5796bafcc681bf76c532..9a0073f939fb45d6a7c2e17879e471915a374881 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -7,7 +7,7 @@
 assert lz4Support -> (lz4 != null);
 
 stdenv.mkDerivation rec {
-  name = "squashfs-${version}";
+  pname = "squashfs";
   version = "4.4dev_20180612";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 40e350846c5fed29074333657ef9c5fb6cb4b5bf..abe89680102581841a22428bd4405828b70f7f8c 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
 
   pname = "squashfuse";
   version = "0.1.103";
-  name = "${pname}-${version}";
 
   meta = {
     description = "FUSE filesystem to mount squashfs archives";
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 73b7f51fd364ac47e73c97d9ddd22414912a75a4..4a1215397be67e3d7eb479cc06236e9676776809 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.5.2";
-  name = "sshfs-fuse-${version}";
+  pname = "sshfs-fuse";
 
   src = fetchFromGitHub {
     owner = "libfuse";
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index fd557a7ff5650ff7136fd79a0fd5096813d7df10..67e21ac4c2c48590841e065fa2c7273dde54e413 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fetchFromGitHub, go, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "tmsu-${version}";
+  pname = "tmsu";
   version = "0.7.4";
 
   go-sqlite3 = fetchgit {
diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix
index 65eafe76710df96c9d51bf2c36b4ef8f6a157cb9..62b4b9301397e17504dda15f4f72b63547dcad7b 100644
--- a/pkgs/tools/filesystems/u3-tool/default.nix
+++ b/pkgs/tools/filesystems/u3-tool/default.nix
@@ -3,12 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "u3-tool";
   version = "0.3";
-  name = "${pname}-${version}";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f";
   };
 
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix
index f17f9e0d2de5bb840ad6e408e98a216353526389..11ea490446d01960180e83adc60e18f0ef048df6 100644
--- a/pkgs/tools/filesystems/udftools/default.nix
+++ b/pkgs/tools/filesystems/udftools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "udftools-${version}";
+  pname = "udftools";
   version = "2.0";
   src = fetchFromGitHub {
     owner = "pali";
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index cfe3ff421fe4dbd654eeadb63d2681f97bfa4cd3..73272b83989ed1d565eb378d7ec4bf647ad8a515 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "unionfs-fuse-${version}";
+  pname = "unionfs-fuse";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 98cc327bc29ca00b86835f47725da55bcb504126..aa28ee625969b7c87731aea889ed14d76fae16bc 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -10,7 +10,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "xfsprogs-${version}";
+  pname = "xfsprogs";
   version = "4.19.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 4c0c2343dd2a1eb240eaaf49f5330861fffe1767..557367ea22cd5cb3da5eb598f6f14e74a986163b 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
   };
 
-  name = "XtreemFS-${version}";
+  pname = "XtreemFS";
   version = "1.5.1.81";
 
   buildInputs = [ which attr makeWrapper python ];
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 61fd5f26e30888d1905559b83f21ca7563ab6b46..041d9a4e3f8b41c080cb6dfef3455d0b6cee7db3 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -14,11 +14,11 @@ let
 in
 stdenv.mkDerivation rec {
 
-  name = "yandex-disk-${version}";
+  pname = "yandex-disk";
   version = "0.1.5.1039";
 
   src = fetchurl {
-    url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
+    url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm";
     sha256 = p.sha256;
   };
 
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index c311ac1af23181bec49536525c0e8abf7e495d70..734c8df9b6ae2d83f92cb1e446e62eac61c22105 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, e2fsprogs }:
 
 stdenv.mkDerivation rec {
-  name = "zerofree-${version}";
+  pname = "zerofree";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "https://frippery.org/uml/${name}.tgz";
+    url = "https://frippery.org/uml/${pname}-${version}.tgz";
     sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
   };
 
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index 518e92814a41b6219631d88c1831f9b171df975c..476d806531279822be05dd114693ee37bf6dfff0 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.3.6"; in
 stdenv.mkDerivation rec {
-  name = "zfstools-${version}";
+  pname = "zfstools";
+  inherit version;
 
   src = fetchFromGitHub {
     sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 0e182d3bd2eadcc65dc8896855fc9abe8517142d..0269df84634f421587bbccc02d43f3e44fa109de 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
 
 stdenv.mkDerivation rec {
-  name = "zkfuse-${version}";
+  pname = "zkfuse";
   inherit (zookeeper) version src;
 
   sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
index 72f1a4188075dd38b716cc133d084109473558b8..8768610872012d1a2bff72f0cbbf043b1457f6c9 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -9,7 +9,7 @@ let boost_static = boost165.override {
 };
 in stdenv.mkDerivation rec {
 
-  name = "appleseed-${version}";
+  pname = "appleseed";
   version = "2.0.5-beta";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 23a1f26db9763c54816a496e9634aae8b192255c..160b77229b3c35a65da1898fcae13f6384239a05 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.1.1";
  in
 stdenv.mkDerivation rec {
-  name = "argyllcms-${version}";
+  pname = "argyllcms";
+  inherit version;
 
   src = fetchzip {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index de09c2b278045354777973036483356da3e8ff26..179085e1fd6bd2ba2199841fed8f90d3902035c7 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "0.99";
   pname = "barcode";
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
   };
 
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
index ad72933cc7717660534089f07c428c32715fbbc7..b4f99a9192cdd72582c2469d8c0ebb3eeaf6d1dc 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "blockhash-${version}";
+  pname = "blockhash";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index 57a6c8c9673cdc513990e9714c859ce5a19c97f5..e57f80f738f349f7b582986b619edfa6040ec0ec 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -8,7 +8,8 @@ let
   sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
 
 in stdenv.mkDerivation {
-  name = "briss-${version}";
+  pname = "briss";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/briss/briss-${version}.tar.gz";
     inherit sha256;
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index c65d1302dcafdafe4ca47bb67703f47fb63e4712..2c96e872f4e63abc451a15ad0ab4b94e3b3d4b76 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpng, bison, flex, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  name = "cfdg-${version}";
+  pname = "cfdg";
   version = "3.0.9";
   src = fetchurl {
     sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp cfdg $out/bin/
 
-    mkdir -p $out/share/doc/${name}
-    cp *.txt $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
+    cp *.txt $out/share/doc/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix
index 12fc6934531a6cfa7e65f3a4712f15d3ea87f3a0..b1ce3082d25b9aa459a8720d8d70c9a92e41a234 100644
--- a/pkgs/tools/graphics/convchain/default.nix
+++ b/pkgs/tools/graphics/convchain/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "convchain-${version}";
+  pname = "convchain";
   version = "0.0pre20160901";
   src = fetchFromGitHub {
     owner = "mxgmn";
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 9fcb7ba404d0d1aff15ba80070a21a5fa16b734b..04b73995580bcc41c7725109b306076e5dc7b6be 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "cuneiform-${version}";
+  pname = "cuneiform";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
index 33e9486633726886b5c4d327461104c3a3f571c5..f21b84c152180cafad1f1c54ba606dc6e06d60fa 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dpic-${version}";
+  pname = "dpic";
   version = "2016.01.12";
 
   src = fetchurl {
-    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz";
+    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
     sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz";
   };
 
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 2ffe4eb7f809cfa3e18aa53319e12aea8665f60e..79c905756537bc33e7c37a334ca2a6017d96574f 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -3,11 +3,11 @@
 , help2man, pkgconfig, perl, texlive }:
 
 stdenv.mkDerivation rec {
-  name = "enblend-enfuse-${version}";
+  pname = "enblend-enfuse";
   version = "4.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/enblend/${name}.tar.gz";
+    url = "mirror://sourceforge/enblend/${pname}-${version}.tar.gz";
     sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
   };
 
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix
index 9735adca53dc3b2c4f1e7dd51d8dde93b32db40c..2ad52d2de4379c76245af224657a6aad2f771fd9 100644
--- a/pkgs/tools/graphics/epstool/default.nix
+++ b/pkgs/tools/graphics/epstool/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.08";
-  name = "epstool-${version}";
+  pname = "epstool";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz";
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix
index 02a3a70fe516feee181edbfd275169d0967d4417..aab2e111e85fc43f3085be95e6e537626426ca18 100644
--- a/pkgs/tools/graphics/facedetect/default.nix
+++ b/pkgs/tools/graphics/facedetect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 stdenv.mkDerivation rec {
-  name = "facedetect-${version}";
+  pname = "facedetect";
   version = "0.1";
 
   src = fetchFromGitHub {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -v -m644 -D README.rst $out/share/doc/${name}/README.rst
+    install -v -m644 -D README.rst $out/share/doc/${pname}-${version}/README.rst
     install -v -m755 -D facedetect $out/bin/facedetect
     wrapPythonPrograms
   '';
diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix
index 5d42482b30918522c427820b56d03498ce6b3cd5..17e1c710586bd0ead5946827fdbb66358904e1c1 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/default.nix
+++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix
@@ -2,7 +2,7 @@
   , python, numpy, scipy, h5py, scikitlearn, pillow
   }:
 stdenv.mkDerivation rec {
-  name = "fast-neural-doodle-${version}";
+  pname = "fast-neural-doodle";
   version = "0.0pre2016-07-01";
   buildInputs = [
     torch torch-hdf5 python numpy h5py scikitlearn scipy pillow
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index 7303f27fe111ce30bbfa9f48903837b1b7c9f857..296ba43a5ed7b821f95d8f41857e1fb154c940af 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -10,11 +10,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fim-${version}";
+  pname = "fim";
   version = "0.6";
 
   src = fetchurl {
-    url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz";
+    url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz";
     sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp";
   };
 
diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix
index e619a889219c0d1f66d7d0d65b82f2644e1e158a..e05f05a977bf92794bf5ccc2a0607b670c09951e 100644
--- a/pkgs/tools/graphics/flam3/default.nix
+++ b/pkgs/tools/graphics/flam3/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "flam3";
   version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix
index 0ed1855a338cef5d09695c2000f79a53361cf3d1..de02865c36e26c7664fba1c18c31e5f712e8324e 100644
--- a/pkgs/tools/graphics/ggobi/default.nix
+++ b/pkgs/tools/graphics/ggobi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.1.11";
-  name = "ggobi-${version}";
+  pname = "ggobi";
 
   src = fetchurl {
     url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2";
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix
index 52f5a099727403df2f8f83d2d61b18067d13a286..ae6291811a4ab9aec92395258c897574e91fcefc 100644
--- a/pkgs/tools/graphics/glee/default.nix
+++ b/pkgs/tools/graphics/glee/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchgit, cmake, libGLU_combined, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "glee";
   rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
   version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 1331e38aef7e31cbf696ea8f81f1643190325289..111a9b59afdacaba56a8ffd2e0ea2c01bc854ad5 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -2,7 +2,7 @@
   python27, wayland, udev, mesa, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "glmark2-${version}";
+  pname = "glmark2";
   version = "2017-09-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 1f8a98e0296b3f589a7ff8f23859ea443112bccb..0710f47cb5718990b5fc43ffa3657b13de7ab7cf 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libGL, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "glxinfo-${version}";
+  pname = "glxinfo";
   version = "8.4.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 51212a3ea946526e7a7df205506951f06d3e6c11..848d804bb38545976434bdb1eae70a975e8fc08d 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -13,7 +13,8 @@ let
     sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
   };
 in stdenv.mkDerivation rec {
-  name = "gmic-${version}";
+  pname = "gmic";
+  inherit version;
 
   outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
 
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 7ea73ab8db8dd5a71edb8cb2529bff4e688f510e..e5bdf6f31775dd0572217beb21f18f53da0d3307 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -7,7 +7,8 @@ let
   version = "2.3.6";
 
 in stdenv.mkDerivation rec {
-  name = "gmic_krita_qt-${version}";
+  pname = "gmic_krita_qt";
+  inherit version;
 
   gmic-community = fetchFromGitHub {
     owner = "dtschump";
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index db21df9b5d0dd3a838e4d9708471b8bf91c53e3d..6cdd6dd71c1dcda5f3e0176bd1788c44fa0a1f26 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -25,7 +25,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "graphviz-${version}";
+  pname = "graphviz";
+  inherit version;
 
   src = fetchFromGitLab {
     owner = "graphviz";
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
index 1d3a8b26aae8980811d2a14c11f95024e11dd993..4c251f21c71f2064ee7bf08ebfd62bf08a4d36ec 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gromit-mpx-${version}";
+  pname = "gromit-mpx";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix
index 11fad25b85aee0648b27ee33e9dd4f3c9c85351a..564685c1ceaf2f3f35b9d0a13d3103c56efe5d55 100644
--- a/pkgs/tools/graphics/ibniz/default.nix
+++ b/pkgs/tools/graphics/ibniz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "ibniz-${version}";
+  pname = "ibniz";
   version = "1.18";
 
   src = fetchurl {
-    url = "http://www.pelulamu.net/ibniz/${name}.tar.gz";
+    url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz";
     sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2";
   };
 
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index 8db5b6c7dea7088091437e398b00c50a038d2dfd..1099b11176c8685a7f82546e66eec391088bbc9b 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -3,7 +3,7 @@
 let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
 in stdenv.mkDerivation rec {
   version = "1.7.4";
-  name = "imgur-screenshot-${version}";
+  pname = "imgur-screenshot";
 
   src = fetchFromGitHub {
     owner = "jomo";
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index e4405455097d2474ded45d39748147d36ac6ef4a..a2592d5522b9a8172b4f11c5e537aa77c7048403 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "jhead-${version}";
+  pname = "jhead";
   version = "3.03";
 
   src = fetchurl {
-    url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
+    url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz";
     sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
   };
 
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
     mkdir -p \
       $out/bin \
       $out/man/man1 \
-      $out/share/doc/${name}
+      $out/share/doc/${pname}-${version}
 
     cp -v jhead $out/bin
     cp -v jhead.1 $out/man/man1
-    cp -v *.txt $out/share/doc/${name}
+    cp -v *.txt $out/share/doc/${pname}-${version}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix
index fec092db0c5247bdd996b4de7fb49c879a8eb8a2..b0836d670862ea6be4940be0ec68d2b91130550b 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/pkgs/tools/graphics/lepton/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "lepton-${version}";
+  pname = "lepton";
 
   src = fetchFromGitHub {
     repo = "lepton";
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index a3cefddeb413e4f8c80c4f19b5a1233867c3880c..1f1da8df3f2bb5f4a8fb4ed0f1aa677b6363e753 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -2,11 +2,11 @@
 , libGLU_combined, boost, glm, freetype }:
 
 stdenv.mkDerivation rec {
-  name = "logstalgia-${version}";
+  pname = "logstalgia";
   version = "1.1.2";
 
   src = fetchurl {
-    url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
   };
 
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index ffba2280e8a5fe67f3c733a095c6db71fdbf8dff..b65cbfca7bbe06964867bc407c28a52de82c99c7 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -14,7 +14,7 @@ let boost_static = boost165.override {
     };
 
 in stdenv.mkDerivation rec {
-  name = "luxcorerender-${version}";
+  pname = "luxcorerender";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 360a233e139fcdae2d521a13c054db014b642e6d..63758e23b15087e2e78c91896c16d1271a4427cc 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "maim-${version}";
+  pname = "maim";
   version = "5.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index 666cdae131e2fbb39244434ec5e74d8d3bee620c..832a48baab72d95c3c46ca3036feefbe93078bb9 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.20";
 in
 stdenv.mkDerivation {
-  name = "mscgen-${version}";
+  pname = "mscgen";
+  inherit version;
 
   src = fetchurl {
     url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix
index 99421cfde170ac63324391445412068f93240f00..a4706e95ceef5498f72b07b5a4a06acfa9982609 100644
--- a/pkgs/tools/graphics/neural-style/default.nix
+++ b/pkgs/tools/graphics/neural-style/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}:
 stdenv.mkDerivation rec {
-  name = "neural-style-${version}";
+  pname = "neural-style";
   version = "0.0pre2016.08.15";
   buildInputs = [torch loadcaffe];
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
index 42da24e323994c57efa19aac0ba5a4f56b190612..ebebe50875223c802a42807ca2dc50a17bc289d1 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "nifskope-${version}";
+  pname = "nifskope";
   version = "2.0.dev7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix
index bc14190707570d1c81ea63ab089ab439892972a1..c1138e5f45840080a7bbbc1342fd8aef8cb37b3d 100644
--- a/pkgs/tools/graphics/optar/default.nix
+++ b/pkgs/tools/graphics/optar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, imagemagick, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "optar-${version}";
+  pname = "optar";
   version = "20150210";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix
index 058900b8e237c17ddc4f4314831449c09633b689..46eb61d1cf75fdcdf8849881b319b8f5211108ea 100644
--- a/pkgs/tools/graphics/pdf2svg/default.nix
+++ b/pkgs/tools/graphics/pdf2svg/default.nix
@@ -2,7 +2,7 @@
 , cairo, gtk2, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "pdf2svg-${version}";
+  pname = "pdf2svg";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix
index 8428480ca037f2d5fdc527dab7ee0877c75742c6..7e02293631884f8cbd5a1e1b7f98eceabf379fb2 100644
--- a/pkgs/tools/graphics/pdftag/default.nix
+++ b/pkgs/tools/graphics/pdftag/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "pdftag";
-  name = "${pname}-${version}";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix
index d394a816a49d2a64f2cef69e709bdb42d656766b..dc5acc9433f6cd113e32450b04f429ba51464d98 100644
--- a/pkgs/tools/graphics/perceptualdiff/default.nix
+++ b/pkgs/tools/graphics/perceptualdiff/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "perceptualdiff";
-  name = "${pname}-${version}";
   version = "2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 77edcd3457804beec030490e0fb479e9d7f1e8e8..08c5f308f5c1975e7f4b55869f65f7064ff54ea1 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -4,12 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "pfstools";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${version}/${name}.tgz";
+    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz";
     sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six";
   };
 
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix
index c91c18e3f0b629eefc9dd480e1e78f21fb399e20..b65962ee7ba280cc697ca4e955017454ddf588c3 100644
--- a/pkgs/tools/graphics/pgf/default.nix
+++ b/pkgs/tools/graphics/pgf/default.nix
@@ -6,7 +6,8 @@ let
   version = "6.14.12";
 in
 stdenv.mkDerivation {
-  name = "pgf-${version}";
+  pname = "pgf";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 4e7d1e361f91c8ce2574b5e2a0c5f26f86d3eb30..b519733f964dcc5236621af5fd29762b58a49f67 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
 
 stdenv.mkDerivation rec {
-  name = "pngquant-${version}";
+  pname = "pngquant";
   version = "2.12.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index dc9d9630ae5aaa53e7e5fdf4b0a15b02e71e08d9..d2042540d7134663833e242ebd35b3d5b9631304 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "povray-${version}";
+  pname = "povray";
   version = "3.7.0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index 44444e6148aba58abc860898c02b30de681e105d..eec8c5158b438e02a962d17259ab8e7163b69092 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "qrcode-git-${version}";
+  pname = "qrcode-git";
   version = "20160804";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
index c27eacaec8a2b38fea1591ac955fbe5c8d4814a5..8628b72bbae28a91b6773d8230f0bb44348397ad 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "rocket-${version}";
+  pname = "rocket";
   version = "2018-06-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix
index fd538eec573d696e0a2603a498a7dd6398cf52de..e7d3b8151a445f6aeb0002d9309de3f55b15fdfe 100644
--- a/pkgs/tools/graphics/s2png/default.nix
+++ b/pkgs/tools/graphics/s2png/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "s2png-${version}";
+  pname = "s2png";
   version = "0.7.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 5dbbd20cd827236176f640398f5cb914e603bb77..fd26869d298be9b06ed7c8328ec82edab5fafc25 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -2,12 +2,12 @@
 , dbus, libconfuse, libjpeg, sane-backends, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "scanbd-${version}";
+  pname = "scanbd";
   version = "1.5.1";
 
   src = fetchurl {
     sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n";
-    url = "mirror://sourceforge/scanbd/${name}.tgz";
+    url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix
index 182ab5806d7bcdaabf0a0109802496ec9472193e..c7d2f49406b778c318d9463872b9419983eddb50 100644
--- a/pkgs/tools/graphics/sng/default.nix
+++ b/pkgs/tools/graphics/sng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpng, netpbm }:
 
 stdenv.mkDerivation rec {
-  name = "sng-${version}";
+  pname = "sng";
   version = "1.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix
index c1e6c2afecce6782cb4e676ca27b19c0f7ec611d..a3497aefe1022768d2edd1dd2b78753b0f18e211 100644
--- a/pkgs/tools/graphics/structure-synth/default.nix
+++ b/pkgs/tools/graphics/structure-synth/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "structure-synth-${version}";
+  pname = "structure-synth";
   version = "v1.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix
index 1c3c0f3b4515f57cc782e8967fd5d673cb927a40..8a64e25d879a5856315415f77f17546fe1731fea 100644
--- a/pkgs/tools/graphics/swfdec/default.nix
+++ b/pkgs/tools/graphics/swfdec/default.nix
@@ -4,7 +4,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "swfdec";
   version = "0.8.4";
 
diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix
index 0862293830d5283860e0d23b35e5bf2b16646744..693f116a6e80bbbf4c06c1db43ca1f03b789089c 100644
--- a/pkgs/tools/graphics/syntex/default.nix
+++ b/pkgs/tools/graphics/syntex/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "syntex-${version}";
+  pname = "syntex";
   version = "0.0pre20160915";
   src = fetchFromGitHub {
     owner = "mxgmn";
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 3769860d469b6604b3ad001d0b77f0eedddba6f0..42a86187a72d34e3a8c87af6e35b9e8713341470 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -4,7 +4,8 @@
 let
   version = "2018-04-19";
 in stdenv.mkDerivation rec {
-  name = "twilight-${version}";
+  pname = "twilight";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "tweakoz";
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix
index b58114a61a5d11f418459189d8f73f075c42eb0a..44a86e961ec8b8ce009e09ed80cd9e015aa319ce 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/pkgs/tools/graphics/unpaper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libav, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "unpaper-${version}";
+  pname = "unpaper";
   version = "6.1";
 
   src = fetchurl {
-    url = "https://www.flameeyes.eu/files/${name}.tar.xz";
+    url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz";
     sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
   };
 
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index db06c2a1588af58b359a70d7cdd45ef5b7cc51fd..ad352c04ad91affa8e9b429395a6f9fa3f5b20c6 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-${version}";
+  pname = "vips";
   version = "8.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index c02054cfbd60cae61abddf94d9bdbabf498f8dc3..9ea1c2d73438ea795e4a7b82573c1a1594439f76 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -2,8 +2,8 @@
   glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
-  name = "vulkan-tools-${version}";
-  version = "1.1.114.0";
+  pname = "vulkan-tools";
+  version = "1.1.106.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix
index 56fd53502444c55e1a7e80367f7fd7a7879fd36c..ba1044e3bb4008c45c1b377b0593fab137dfc444 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/pkgs/tools/graphics/wallutils/default.nix
@@ -3,7 +3,7 @@
 }:
 
 buildGoModule rec {
-  name = "wallutils-${version}";
+  pname = "wallutils";
   version = "5.8.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
index 20d07e52f6c74316fc98e6e3c58fd5903b646db8..65fe38937dfb7ce2a78c9d4884c2c7f43bcea94e 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "wavefunctioncollapse-${version}";
+  pname = "wavefunctioncollapse";
   version = "0.0pre20170130";
   src = fetchFromGitHub {
     owner = "mxgmn";
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 2882ae960de150f18f2e9c366b987cb7c3c7bae3..be4ba53319ae45b83c43ca60c4a27ab8a0d50061 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "welkin-${version}";
+  pname = "welkin";
   version = "1.1";
 
   src = fetchsvn {
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index ebd8953853c94ad560954dc4368aadc57fff0550..2aa6abcccfc4b1d0748f317540cfde0eef0721e5 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -4,7 +4,7 @@
 
 mkDerivation rec {
   version = "0.12.5";
-  name = "wkhtmltopdf-${version}";
+  pname = "wkhtmltopdf";
 
   src = fetchFromGitHub {
     owner  = "wkhtmltopdf";
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index 7321128a6b5aa685fc027ad4acb5e3701d317529..6dd0b206878400edc56aa2cc53d52d1160461a2a 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-    name = "yafaray-core-${version}";
+    pname = "yafaray-core";
     version = "3.3.0";
 
     src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix
index 8fbc09a6d82b8aef1db144446acc98ee91a32bbc..094ec2d5bc49295efb270710b100228cd20bc5a9 100644
--- a/pkgs/tools/graphics/yaxg/default.nix
+++ b/pkgs/tools/graphics/yaxg/default.nix
@@ -2,7 +2,7 @@
   maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
 
 stdenv.mkDerivation rec {
-  name = "yaxg-${version}";
+  pname = "yaxg";
   version = "unstable-2018-05-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix
index 3efb68e60d2b982c7c02dd287fa9c91ba6727e5f..97bbeb4d2d43a697f3c13b512e649996e603d7a3 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, jre }:
 stdenv.mkDerivation rec {
-  name = "zxing-${version}";
+  pname = "zxing";
   version = "3.1.0";
   # Maven builds are hard to get right
   core_jar = fetchurl {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index a3f12d648d5573890a89dbd13dcf1ff61f912623..d1e7f85f75f3a2d938694d7b3afb159b0c0fb7c8 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-anthy-${version}";
+  pname = "fcitx-anthy";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz";
     sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
index e2d58c564989a4bc54b9aab0c18bad37bf31dde8..d9b202f7ef15f93d6e1c63cb82991a89e3344dd3 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-chewing-${version}";
+  pname = "fcitx-chewing";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-chewing/${pname}-${version}.tar.xz";
     sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
index f7bb7126bef086250e750e66e20db2f67ca90b88..4c0a7f0b4109a584aa50c11b3b5ac1d9269a1d3e 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-cloudpinyin-${version}";
+  pname = "fcitx-cloudpinyin";
   version = "0.3.6";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz";
     sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
index 32c9ecff9bd81d229da37fae1c0941a25e979260..c9a40b84a6d9ef038cbd5b40f02d8b95b59d5ccb 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-hangul-${version}";
+  pname = "fcitx-hangul";
   version = "0.3.1";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-hangul/${pname}-${version}.tar.xz";
     sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index 5b55e0f047859fa6ce6d84229b1bffc009c2599b..9e0ef551d82c75c29876c3293189a879d818d95a 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-libpinyin-${version}";
+  pname = "fcitx-libpinyin";
   version = "0.5.3";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz";
     sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
index 292d2dbb57f5229df893ff712941a0a1ac55b58a..8b25b2846ff58af00a2cb5f7d08477b85452e073 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-m17n-${version}";
+  pname = "fcitx-m17n";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-m17n/${pname}-${version}.tar.xz";
     sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
index 2bd4bf1c878c8d8320776455ccbafd0070abfc68..095be7469cd803fdfb9c4c6db8b7802b0edf7960 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-rime-${version}";
+  pname = "fcitx-rime";
   version = "0.3.2";
 
   src = fetchurl {
-    url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz";
+    url = "https://download.fcitx-im.org/fcitx-rime/${pname}-${version}.tar.xz";
     sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
index c2e8837f5d13a34808ffd6a54a8be7e1f81e65cb..cf0a0f1fa17e9a4b011055f728887ff091b46f9d 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-skk-${version}";
+  pname = "fcitx-skk";
   version = "0.1.4";
   src = fetchFromGitHub {
     owner = "fcitx";
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
index 918edf0240a51758ccddb2d3de770f73b99ab8b8..833e417ae913a8fb267914b93adfbc9d7adce2b8 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-table-extra-${version}";
+  pname = "fcitx-table-extra";
   version = "0.3.8";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-table-extra/${pname}-${version}.tar.xz";
     sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
index 929cdb30b919e81af458d620928175446b2db7d1..ffee83875a17fb8354db135440555264aa28f6da 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-table-other-${version}";
+  pname = "fcitx-table-other";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-table-other/${pname}-${version}.tar.xz";
     sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
index ddfa41dda3188d61f5cb42e77e61348364262cb9..1deff93e2016ef817fb01d0c0eae31be96df858b 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-unikey-${version}";
+  pname = "fcitx-unikey";
   version = "0.2.5";
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-unikey/${name}.tar.xz";
+    url = "http://download.fcitx-im.org/fcitx-unikey/${pname}-${version}.tar.xz";
     sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index b32368c93d3ce043e0f95cf3001827f106494067..34dd3ac3509b9c7beeda7fd4615a53e08aec388c 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -36,7 +36,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "fcitx-${version}";
+  pname = "fcitx";
   version = "4.2.9.6";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 77ec251ec88163c023a16e39d17781dcea4e462c..d2f68fd5269e930cf2d8018f6e9869807dcd88e8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-anthy-${version}";
+  pname = "ibus-anthy";
   version = "1.5.11";
 
   meta = with stdenv.lib; {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index daebceaf88763f7c2d46d1c7184f58be3435778c..3b8b3489a1d256fd45e88d77d10c858bf982cac2 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-hangul-${version}";
+  pname = "ibus-hangul";
   version = "1.5.1";
 
   src = fetchurl {
-    url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
index 19d862e030850f5d04a0929b0e173cc8735d5023..589ddd09144f3a1903c3ce30106fa8ff6ba0e2af 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -7,10 +7,9 @@
 stdenv.mkDerivation rec {
   pname = "ibus-kkc";
   version = "1.5.22";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 3bdb69391cc42955002c1edfee5a79a59fd2fa6c..fc4677e06b06e33202d5c8d0bcf5ecca442b5a50 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-libpinyin-${version}";
+  pname = "ibus-libpinyin";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index a0d50cf9479002e2cad2b96a74add25bcfe4281d..01b227f6f1b4274dfb2d0853fb13ef524769bd51 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-m17n-${version}";
+  pname = "ibus-m17n";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index 368de091777ed0eb2f8ecbc99dee7789f5fc72e1..c3ee5eafd7befa32be8794ef111a5ff428a40a85 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -14,7 +14,7 @@ let
     sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n";
   };
 in stdenv.mkDerivation rec {
-  name = "ibus-table-chinese-${version}";
+  pname = "ibus-table-chinese";
   version = "1.8.2";
 
   srcs = [ src cmakeFedoraSrc ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index ff01c8419260aa1643945e05833427806610e8cb..5e839b354a3408d82a16b987645e5796e3b1b178 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-table-others-${version}";
+  pname = "ibus-table-others";
   version = "1.3.9";
 
   src = fetchurl {
-    url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index e31d1ddfaa80d97fe2afd2c061af84128e3278d1..107c8c60271ed6a342da51d48fa60994985aea18 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-uniemoji-${version}";
+  pname = "ibus-uniemoji";
   version = "0.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 07fa8d2beb56d4a8441cf6f44ff1f4d33daceec5..d36697221a4f8187d24be93daad8b92d0ac8512c 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -40,7 +40,7 @@ let
     '';
   };
   cldrEmojiAnnotation = stdenv.mkDerivation rec {
-    name = "cldr-emoji-annotation-${version}";
+    pname = "cldr-emoji-annotation";
     version = "31.90.0_1";
     src = fetchFromGitHub {
       owner = "fujiwarat";
@@ -80,7 +80,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ibus-${version}";
+  pname = "ibus";
   version = "1.5.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
index 8d02d4edde8e24b145efb0cb7be2482a8869aa43..85fccc46de08050dc6a479d67382f99f762b51d8 100644
--- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix
+++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-qt-${version}";
+  pname = "ibus-qt";
   version = "1.3.3";
 
   src = fetchurl {
-    url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz";
+    url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz";
     sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g";
   };
 
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
index bb179e18e07832798afb4611f457d4bca443e685..cd7d1cd8bbfc1be6bf8ad44303b977bed880c8a7 100644
--- a/pkgs/tools/inputmethods/keyfuzz/default.nix
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "keyfuzz-${version}";
+  pname = "keyfuzz";
   version = "0.2";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index 75670dfe9dfb5efb56bb075291f9b3129b6f030c..f4b2f7e94e74b38efafe11d7eeaf66ac3a2a8a3d 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
   pname = "libinput-gestures";
   version = "2.39";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "bulletmark";
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
index 33de43b6f5e5a027f6570ef24715105c42dd2874..68889d45df04e4feeca9b66ea66e754d8705779c 100644
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -7,10 +7,9 @@
 stdenv.mkDerivation rec {
   pname = "libkkc";
   version = "0.3.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
   };
 
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index cecacd4af95474ade3d312d3889e63ef47caa113..cf32e8d51ca30e8468bd441c1f8228a6384ddb83 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -28,7 +28,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "skk-dicts-unstable-${version}";
+  pname = "skk-dicts-unstable";
   version = "2017-10-26";
   srcs = [ small medium large edict assoc ];
   nativeBuildInputs = [ skktools ];
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix
index 8661da66b92acc7304c1d8c34ac7014bf309cd98..d4ef2e2422ec1d39a516a5f0905558faba72edb2 100644
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -9,7 +9,7 @@
 # - We for the moment do not package them to keep the dependencies slim.
 #   Probably, shall package the newer tools as skktools-extra in the future.
 stdenv.mkDerivation rec {
-  name = "skktools-${version}";
+  pname = "skktools";
   version = "1.3.3";
   src = fetchFromGitHub {
     owner = "skk-dev";
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index 55cf094558231be507ae90f8632925f0570410bd..02993b248ab708ead05236465388393026c50124 100644
--- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "tegaki-zinnia-japanese-${version}";
+  pname = "tegaki-zinnia-japanese";
   version = "0.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix
index 82dd387f536d7b67ca7ccfddc8950238ad883d0a..ff14a13da04f66e9db27010bda4e54a68f7aae46 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "touchegg-${version}";
+  pname = "touchegg";
   version = "1.1.1";
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz";
     sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
   };
 
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix
index ec8ac88455978c9cce26fd814b6e1b14349a9b54..a9e106f2c72041e4ccff01307575a4381b8ca498 100644
--- a/pkgs/tools/inputmethods/triggerhappy/default.nix
+++ b/pkgs/tools/inputmethods/triggerhappy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "triggerhappy-${version}";
+  pname = "triggerhappy";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 984eecf9e9d554b7b4b71da005282de3d376269e..7fe00bd4dfce35db1460af570f3262159233d5e4 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -39,7 +39,7 @@ assert withMisc -> libeb != null;
 
 stdenv.mkDerivation rec {
   version = "1.8.8";
-  name = "uim-${version}";
+  pname = "uim";
 
   src = fetchFromGitHub {
     owner = "uim";
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index 60f3a0feb55b02e58921da3d75308f8828ec86b8..ce87e1a71412e708914ffae4fdc1dabf8d499d0e 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "zinnia-${version}";
+  pname = "zinnia";
   version = "2016-08-28";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix
index ad129503de337a52a55a6729ec9780a814b8ae2c..a349a3f2fc0e9ad083bde33bb6a19a6a1b024343 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/pkgs/tools/misc/0x0/default.nix
@@ -1,7 +1,7 @@
 { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "0x0-${version}";
+  pname = "0x0";
   version = "2018-06-24";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 3c529f31f66e7b755d9388b074275a2b2b9ef7e7..75d8d71b89524e117b2508575e698989fa7b4b0f 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.14";
-  name = "aescrypt-${version}";
+  pname = "aescrypt";
 
   src = fetchurl {
-    url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz";
+    url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz";
     sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah";
   };
 
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix
index 8ee363ed91dcf92a80403865611f330ed024c5d4..7b869d66d1c3c913046ddd876f45004e036c7f02 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/pkgs/tools/misc/alarm-clock-applet/default.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.3.4";
-  name = "alarm-clock-applet-${version}";
+  pname = "alarm-clock-applet";
 
   src = fetchFromGitHub {
     owner = "joh";
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 62d46bba5b0db89a78f2c4710078416aa854e1fe..6ff0c7cd0d7dbd7d4b246f580c244746ce05f6af 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
 
 mkDerivation rec {
-  name = "antimicro-${version}";
+  pname = "antimicro";
   version = "2.23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 2dac9bd60c93b619e80b4b8779069b1fe3993d5e..55cfa09aa24fe8af08219e5faa6f28089c9ce4b7 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -22,7 +22,8 @@ let
 in
 
 buildGoPackage {
-  name = "aptly-${version}";
+  pname = "aptly";
+  inherit version;
 
   src = aptlySrc;
 
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 6b1512e854b04bd46df8895c9ad3c15406e20485..8b2a2a4b21500682d55c3bd29ddea7533303ab49 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -2,7 +2,7 @@
 , fetchgit
 }:
 stdenv.mkDerivation rec {
-  name = "argtable-${version}";
+  pname = "argtable";
   version = "3.0.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index dc51d04e4b5e966b15741bf51896aecc5245bfda..4f50e0f556b6ac939e88d24d3ce028b024e5e932 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "arp-scan-${version}";
+  pname = "arp-scan";
   version = "1.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 859112d29bc23583d000f4102223f541b692d4bd..b58f603ce594390317f63afac425be0241848f8c 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.9.4";
-  name = "aspcud-${version}";
+  pname = "aspcud";
 
   src = fetchzip {
     url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index ca4dde7a450ca49dbc77c9c295cdcd22abf239f1..8294e92d13f3d4e1516a616ca80ffb53226454a1 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, bash }:
 
 stdenv.mkDerivation rec {
-  name = "autojump-${version}";
+  pname = "autojump";
   version = "22.5.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix
index 3fd52051357028aef8a805cfea6d0846b37c40f4..3bfb2d656d90dd7c3c42d29aefce060ff2913b61 100644
--- a/pkgs/tools/misc/automirror/default.nix
+++ b/pkgs/tools/misc/automirror/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, git, ronn}:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "automirror";
   version = "49";
 
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 3b3a96e8b6e13009288f391b2ed12545d9add44a..fd9bbda699f15fd433e866ee23319d3d3fd50b13 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -9,7 +9,8 @@ let
   version = "1.8.1";
 in
   stdenv.mkDerivation {
-    name = "autorandr-${version}";
+    pname = "autorandr";
+    inherit version;
 
     buildInputs = [ python ];
 
diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix
index 75c7b258a449490f16f1aea27083d5face81a526..ee07221b75594e0b169ee3b116201529e3bd2303 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/pkgs/tools/misc/autorevision/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "autorevision-${version}";
+  pname = "autorevision";
   version = "1.21";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index 5ead0e1020cbf0e6e3241c256121d5ae501693a6..6f2afc888e843fa284429c6c0c813f82dd7bc856 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "azure-vhd-utils-${version}";
+  pname = "azure-vhd-utils";
   version = "20160614-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
 
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 4f90c0f03e9a8f849fb49d37de7811466c9d4eec..3b5e72c89f7f9bc568179161114d50424344e8df 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -10,11 +10,11 @@ let
     else throw "Unknown architecture";
 in
 stdenv.mkDerivation rec {
-  name = "bandwidth-${version}";
+  pname = "bandwidth";
   version = "1.5.1";
 
   src = fetchurl {
-    url = "https://zsmith.co/archives/${name}.tar.gz";
+    url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
     sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib";
   };
 
diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix
index ecff2459ef2634b22a175830386d2cfafd0af788..b0af13160d218a92738f76eb9f9de88b38ea9e7a 100644
--- a/pkgs/tools/misc/bbe/default.nix
+++ b/pkgs/tools/misc/bbe/default.nix
@@ -1,6 +1,6 @@
 { stdenv , fetchurl, autoreconfHook }:
 stdenv.mkDerivation rec {
-  name = "bbe-${version}";
+  pname = "bbe";
   version = "0.2.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 89d684614314d2d8c7498415316febe260b35bf5..c7a9af4abd1a7d0cc3276fc9104802d5e63283ef 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "bibtex2html-${version}";
+  pname = "bibtex2html";
   version = "1.99";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix
index 5e8a8c56b0a70e5ce53d691b6b3476589c375681..7664b96563b29b66e51ac57f4d8e43e6300cda88 100644
--- a/pkgs/tools/misc/bibtool/default.nix
+++ b/pkgs/tools/misc/bibtool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "bibtool-${version}";
+  pname = "bibtool";
   version = "2.67";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index d7cca2a77bdcd0447c1f82b046569abd4c008eda..d84c6ebaabc62949491e840275c53432f69976bd 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bibutils-${version}";
+  pname = "bibutils";
   version = "6.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix
index 4248dd6bd93c07b6379f84ed17c4cc3e6569fe91..8d587e34af4618ab384c821814a71a0c226a1bbb 100644
--- a/pkgs/tools/misc/blink1-tool/default.nix
+++ b/pkgs/tools/misc/blink1-tool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libusb1, pkgconfig, ... }:
 
 stdenv.mkDerivation rec {
-  name = "blink1-${version}";
+  pname = "blink1";
   version = "1.98a";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
index 8e3e08fb5e55d3679f689e714254829c29ea227d..655fd44c03997ae4868dd72a2b80de1b07036fc4 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/pkgs/tools/misc/blsd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }:
 
 buildGoPackage rec {
-  name = "blsd-${version}";
+  pname = "blsd";
   version = "2017-07-27";
 
   goPackagePath = "github.com/junegunn/blsd";
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index fc10538bbbbdac2ed74ee63265866efbfbb24e0e..e4664e34b964b8fe9e595a3f5202ed9658c1f7b3 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -2,7 +2,7 @@
 , libnl }:
 
 stdenv.mkDerivation rec {
-  name = "bmon-${version}";
+  pname = "bmon";
   version = "4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 90fc68dcc5cc21cd38c4b3151e716061a6d74e5f..b86bc38cb26706de83c70836d79731ed3caffb36 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -3,10 +3,11 @@
 let version = "0.8"; in
 
 stdenv.mkDerivation rec {
-  name = "buildtorrent-${version}";
+  pname = "buildtorrent";
+  inherit version;
 
   src = fetchurl {
-    url = "https://mathr.co.uk/blog/code/${name}.tar.gz";
+    url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
     sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
   };
 
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 61d0bf60a4d6d70c63e0aa59653e322df43e79b4..2c48f995ca2d764b4816ac6ceb61784f93c9338d 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -5,13 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "calamares";
   version = "3.2.11";
 
   # release including submodule
   src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw";
   };
 
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix
index a3b30423aa8f052e45316caed4bb695801b559ed..377297ee47992803650ac7c0a4711fbd19ebc1d9 100644
--- a/pkgs/tools/misc/capture/default.nix
+++ b/pkgs/tools/misc/capture/default.nix
@@ -1,7 +1,7 @@
 { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "capture-unstable-${version}";
+  pname = "capture-unstable";
   version = "2019-03-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix
index 4c54ab239d2925d083ea3bff1775b6d7b6fc53c6..f9740f223754ad06ff0403e944a45d159f92f5f1 100644
--- a/pkgs/tools/misc/chelf/default.nix
+++ b/pkgs/tools/misc/chelf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "chelf-${version}";
+  pname = "chelf";
   version = "0.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 4eb6f302f1b0fc00c5ba2e27f9e4eae9df0822eb..b6fffddeb53dd36affb861e6dfed8db99b867c82 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "chezmoi-${version}";
+  pname = "chezmoi";
   version = "1.5.5";
 
   goPackagePath = "github.com/twpayne/chezmoi";
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index 48ce782536f2eafc5968074a6977d3fedec0b173..a1b1b4eac2d5d6b2172a02c3b7c6f1078942a6e0 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cht.sh-${version}";
+  pname = "cht.sh";
   version = "unstable-2019-08-06";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index e913d517683975ccfe25210522c2cb29403f9e82..575cb686f9d463c843cbda919adda8ab9c9ef443 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -3,7 +3,7 @@
 
 mkDerivation rec {
   version = "0.3.2";
-  name = "ckb-next-${version}";
+  pname = "ckb-next";
 
   src = fetchFromGitHub {
     owner = "ckb-next";
diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index e4b3fab818b7bc0bdfcca6807ab2a265ba801a91..f71faf6ab749c950054526e7bbc24d9211121dbd 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "clac";
   version = "0.0.0.20170503";
 
diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix
index 135eda554b36a14739b7721723998bdb2706ec0f..31c35af81186b0ffb8ddf6362ff1334ce9919efd 100644
--- a/pkgs/tools/misc/clasp/default.nix
+++ b/pkgs/tools/misc/clasp/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "clasp-${version}";
+  pname = "clasp";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz";
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 54a6fac17a3c83466bd2c4f4826c42b68a689553..d5fd4e97df104daf8aad301b166854701107cde6 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "clex-${version}";
+  pname = "clex";
   version = "4.6.patch9";
 
   src = fetchurl {
     sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc";
-    url = "${meta.homepage}/download/${name}.tar.gz";
+    url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix
index 6bd0f8be2fa64232a4d2fbab7da47d8b5456633b..91c428def280cfbc970018fd7dd6fc0ba8ed5151 100644
--- a/pkgs/tools/misc/clipnotify/default.nix
+++ b/pkgs/tools/misc/clipnotify/default.nix
@@ -1,6 +1,6 @@
 { libX11, libXfixes, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "clipnotify-${version}";
+  pname = "clipnotify";
   version = "git-2018-02-20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index ed0239256cdf693997c5b3ced18a00f2cb01e655..d12f9f6c1f49897b453db3108ad7aaeef698bee9 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,7 +2,7 @@
  gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation  rec {
-  name = "clipster-${version}";
+  pname = "clipster";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 38041f0b32daba7658552a6ece74ded03ca5f5db..987d694a0a41309f2694041a53f18fb92e16dc91 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cloc-${version}";
+  pname = "cloc";
   version = "1.82";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index b9046bf19ca5a0e0553bff005d819982e592a197..bc23958b58157cab063d2d9b6db4563fb7082998 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "cloud-sql-proxy-${version}";
+  pname = "cloud-sql-proxy";
   version = "1.13";
 
   goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index bda8ebcf3b0e7170a83cdfa94dd1ac3770bc4079..5408c39920be8edc512fad448b1eb2b84c61f941 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   # NOTICE: if you bump this, make sure to run
   # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
   # growpart is needed in initrd in nixos/system/boot/grow-partition.nix
-  name = "cloud-utils-${version}";
+  pname = "cloud-utils";
   version = "0.30";
   src = fetchurl {
     url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz";
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 12821cf864c2e94fd27f2d597db1bb918c8adb89..41c80146e68fa0090f9073b608d9ea2a94b84511 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "colord-kde-${version}";
+  pname = "colord-kde";
   version = "0.5.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
+    url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index a7d230d8e8982dcb5c377224e947bba83630d826..1b3c5f169699e2ef3b19e8b1f14b757323132b7d 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1a-3";
-  name = "contacts-${version}";
+  pname = "contacts";
 
   src = fetchurl {
     url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz";
diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 6b5c9c51394490055ce1abd7eb74675510ad964c..fb44b051b7eecf0514445af1349854253a5e4d7b 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec{
   version = "3.03+dfsg2";
-  name = "cowsay-${version}";
+  pname = "cowsay";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz";
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 9a764c12941e3b22b58b403e6ed2bba13862fc87..547e2a1f059f10153b6e5f06a2f920e2643daae1 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cpulimit-${version}";
+  pname = "cpulimit";
   version = "2.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
+    url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz";
     sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
   };
 
diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index b4abb3097b983ee08024b32927f110150780c3cd..db0ab75d91668f26bc66fb360c6307f2e4dde2d6 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl, jansson, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cpuminer-${version}";
+  pname = "cpuminer";
   version = "2.5.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
+    url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz";
     sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa";
   };
 
diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix
index 696fbe8638327f85ad2e513c275e10a841ec56d2..a00f8d6654f55571dab264aa6feb57f605a89260 100644
--- a/pkgs/tools/misc/crex/default.nix
+++ b/pkgs/tools/misc/crex/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "crex";
   version = "0.2.5";
 
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
index 6bbf049d24459ab4cdf424a5de9af0e2574932c2..f1930c925ff435dd8784589062a51b2106ecbe92 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/pkgs/tools/misc/cunit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
 
 stdenv.mkDerivation rec {
-  name = "CUnit-${version}";
+  pname = "CUnit";
   version = "2.1-3";
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [autoconf automake libtool];
 
   src = fetchurl {
-    url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2";
     sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm";
   };
 
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index 94f36adcf9b07c780d967f9cb6785be259b84166..83010477c50daaab086164afe150dc918ac1f1d0 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "cutecom-${version}";
+  pname = "cutecom";
   version = "0.50.0";
   src = fetchFromGitHub {
     owner = "neundorf";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 5a82c7660890cf7233318acb02ad65ca1c32444b..f45889e78d8582da5d735441a78d1263c0c8b11a 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "dashing-unstable-${version}";
+  pname = "dashing-unstable";
   version = "2018-02-15";
   rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49";
 
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 230a97da5e44322b0213fbd4bb9927a72f99a762..efeb760e560bbff022250e5270e00e385b0ded82 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "datamash-${version}";
+  pname = "datamash";
   version = "1.4";
 
   src = fetchurl {
-    url = "mirror://gnu/datamash/${name}.tar.gz";
+    url = "mirror://gnu/datamash/${pname}-${version}.tar.gz";
     sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a";
   };
 
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 05a312bb8bcaa958f2d900d5767207ffcea286c1..b440808833fcf82b4860e3e33031f04dfe60c5df 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.6";
-  name = "dateutils-${version}";
+  pname = "dateutils";
 
   src = fetchurl {
-    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
+    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
     sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
   };
 
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index 8dcaecf9851c8360e0a4d9fb4382b04d1606e76b..ab52d73ac27b5e09cd290fea912c2b22d7330354 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-map-${version}";
+  pname = "dbus-map";
   version = "2015-05-28";
   src = fetchFromGitHub {
     owner = "taviso";
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 8453aa677477cd97cbf93e0bae87d85561123ef6..0d5efb2ca22bc89e8c7b0fd847e6839b54ad555b 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -5,7 +5,8 @@
 
 let version = "0.4.4"; in
 stdenv.mkDerivation rec {
-  name = "ddccontrol-${version}";
+  pname = "ddccontrol";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 3a607b4ec75173a0e610ee4273d99def3676355c..0ddceb76ffe8a5e27cd517216b84ba4564857f81 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -2,7 +2,7 @@
 , glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "ddcutil-${version}";
+  pname = "ddcutil";
   version = "0.9.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 3ed284aa3e1fe0dd3e2e8564bc0e3d8eba48d170..35db9ef7db368558e2f168701eb503b2e4d11095 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -9,7 +9,7 @@ let
   inherit (python3Packages) python setuptools;
 in stdenv.mkDerivation rec {
   version = "2.16.8";
-  name = "debian-devscripts-${version}";
+  pname = "debian-devscripts";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
index 61c8a8370d7f26c314b109f0dc3c48b77ad2153f..e99e9289b67659d14402b0eecee243d63a70926a 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/pkgs/tools/misc/ding-libs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, check }:
 
 stdenv.mkDerivation rec {
-  name = "ding-libs-${version}";
+  pname = "ding-libs";
   version = "0.6.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e71971ccb091562202906bb2eeabb2a694fa1a89..22c0721d79d8996e3f980193623aa01305fcfe64 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, bash }:
 
 buildGoPackage rec {
-  name = "direnv-${version}";
+  pname = "direnv";
   version = "2.20.1";
   goPackagePath = "github.com/direnv/direnv";
 
diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix
index 7b97e58fdf969e03dfec66669ad7e4fc2c1f6746..193a631ccdc32c1fd12a6da0bb50206373c26625 100644
--- a/pkgs/tools/misc/diskscan/default.nix
+++ b/pkgs/tools/misc/diskscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, ncurses, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "diskscan-${version}";
+  pname = "diskscan";
   version = "0.20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix
index affcd310bea058b4598efad21b73cd9f9dcd0730..efe65683e07bb971886c69f93d464bfe4d483d59 100644
--- a/pkgs/tools/misc/docbook2mdoc/default.nix
+++ b/pkgs/tools/misc/docbook2mdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "docbook2mdoc-${version}";
+  pname = "docbook2mdoc";
   version = "0.0.9";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz";
+    url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz";
     sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk";
   };
 
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix
index f6bc091c14afa5502ac611dea317142b9b95dbcc..c1baf8e82f5fcb948b8c216ebcf5584d81c009a9 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/pkgs/tools/misc/docker-ls/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, stdenv, docker }:
 
 buildGoPackage rec {
-  name = "docker-ls-${version}";
+  pname = "docker-ls";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index 47abcf79869d12a242e94b0dbddfbf92f175d2a8..66c0cfc82b1b0eacaea1d7ada09c3b734f7cff13 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "docui-${version}";
+  pname = "docui";
   version = "2.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index c50e3adb6abb1400ed1b0406d36136bbedecc8ce..7d85decbb84bd888ea6c4fd18efcf2e9af74cce7 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dtach-${version}";
+  pname = "dtach";
   version = "0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz";
     sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
   };
 
diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index 82b29bb67f663cbf1cc870f8b5a61af1caaffba8..77ad7cd8ccd913e7387231b1990650f1ff8a4d40 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -7,7 +7,7 @@
 assert enableCairo -> cairo != null && pango != null;
 
 stdenv.mkDerivation rec {
-  name = "duc-${version}";
+  pname = "duc";
   version = "1.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix
index 892287fa2d70d516c540e855144dcd9d7850d905..1b9a6c9bbea2db411445548e1c332f6158cbb670 100644
--- a/pkgs/tools/misc/dumptorrent/default.nix
+++ b/pkgs/tools/misc/dumptorrent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-    name = "dumptorrent-${version}";
+    pname = "dumptorrent";
     version = "1.2";
     
     src = fetchurl {
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index 5eb4055d5b96a560b59e65c33200b7ed95fab084..bcd3ec6d8f7f1f173056d1bc5829f2ddac5f5cfc 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -2,7 +2,8 @@
 let
   version = "2018-12-06";
 in stdenv.mkDerivation rec {
-  name = "edid-decode-unstable-${version}";
+  pname = "edid-decode-unstable";
+  inherit version;
 
   src = fetchgit {
     url = "git://linuxtv.org/edid-decode.git";
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 6f491ac93496ba3c6c6e68393af2ad8e0c29cbbe..160c3982cc154f1db63121228ca49b1376a8f4fa 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "emv-${version}";
+  pname = "emv";
   version = "1.95";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 19bcd77923b940167476d1174f7050d25982b487..954b570c79dadd38f89592d88efe3a938079f5c6 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "entr-${version}";
+  pname = "entr";
   version = "4.2";
 
   src = fetchurl {
-    url = "http://entrproject.org/code/${name}.tar.gz";
+    url = "http://entrproject.org/code/${pname}-${version}.tar.gz";
     sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17";
   };
 
diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix
index ea08608da01c3d728bf78d0b0bf50103c5087f7a..db31df982cf8e99b8c8afaa34c0a57aee5289be9 100644
--- a/pkgs/tools/misc/envdir-go/default.nix
+++ b/pkgs/tools/misc/envdir-go/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   version = "1.0.0";
-  name = "envdir-${version}";
+  pname = "envdir";
 
   goPackagePath = "github.com/d10n/envdir";
 
diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix
index 86f78af2560370367124835a2da73a2b726b9989..9b2153d17cb170ed2cfc32239212278bdb3a1f7e 100644
--- a/pkgs/tools/misc/envsubst/default.nix
+++ b/pkgs/tools/misc/envsubst/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "envsubst-${version}";
+  pname = "envsubst";
   version = "1.1.0";
 
   goPackagePath = "github.com/a8m/envsubst";
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
index b9efead27988d855626565057307dadad38a54b0..8d65aee9e7a847f483d28416d1da48946a6bdd18 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "eot_utilities";
   version = "1.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz";
diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix
index 9d3b796c87969a4064edd982bd6908eceaa7d18a..52b56f10ea97d07a33fd9992534fb2defab247f0 100644
--- a/pkgs/tools/misc/esptool-ck/default.nix
+++ b/pkgs/tools/misc/esptool-ck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "esptool-ck-${version}";
+  pname = "esptool-ck";
   version = "0.4.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index a6afa03a3f150e00b1ffd0f44ca7dddce3b25ede..8fa1eccadf015f276ba14912577f5497de3808e2 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-${version}";
+  pname = "ethtool";
   version = "5.2";
 
   src = fetchurl {
-    url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
+    url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz";
     sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6";
   };
 
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index bb701f187fa8464f95ef0536f6ea16672a5ec0eb..fe18a506560821e2838ff1b74b266d35c2497b6d 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.45.4";
-  name = "expect-${version}";
+  pname = "expect";
 
   src = fetchurl {
     url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz";
diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix
index 84b61f9aae92746ce0e55ad104e63a1a6f65e4fb..25179c36c01f1ae14d77abcc7e62cf14e8978bad 100644
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/pkgs/tools/misc/fdupes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fdupes-${version}";
+  pname = "fdupes";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 14858428ee9984e039893ce5e2e44047888bd679..b3ed85ca2282434266666dd585432b9f1698ebcc 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, file, zlib, libgnurx }:
 
 stdenv.mkDerivation rec {
-  name = "file-${version}";
+  pname = "file";
   version = "5.37";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
-      "https://distfiles.macports.org/file/${name}.tar.gz"
+      "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz"
+      "https://distfiles.macports.org/file/${pname}-${version}.tar.gz"
     ];
     sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9";
   };
diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix
index e934da76e6e51ff186f1d2eace5d13658d0ef60a..a16695cf7c32dc78f878806c060267a35ba33c39 100644
--- a/pkgs/tools/misc/filebench/default.nix
+++ b/pkgs/tools/misc/filebench/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "filebench-${version}";
+  pname = "filebench";
   version = "1.4.9.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/filebench/${name}.tar.gz";
+    url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz";
     sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc";
   };
 
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index a7ca7700c71ba3e63ef66eae2895772f8c1e1d94..18914a304f342bf9ba1a5b3b34f314459c3ad376 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "flashrom-${version}";
+  pname = "flashrom";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix
index a72279b90b6ec5525bff4798ba1bbbdd9a5025f6..692f7daa9cf6597e4d2b3254efb4a2b002712c6b 100644
--- a/pkgs/tools/misc/fltrdr/default.nix
+++ b/pkgs/tools/misc/fltrdr/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fltrdr-${version}";
+  pname = "fltrdr";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix
index e31da3bfd2123110a23c6392bec260549eef1e5f..33efd2bd6143b98a232242991cb091a373291d77 100644
--- a/pkgs/tools/misc/fondu/default.nix
+++ b/pkgs/tools/misc/fondu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "060102";
-  name = "fondu-${version}";
+  pname = "fondu";
 
   src = fetchurl {
     url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz";
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 45d27e7b7c824ebf052bd0c22e8636523ba0417c..871f113a41dd57aff6a21b85431fabdf2d430be9 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -13,7 +13,8 @@ let srcs = {
     version = "2.6.2";
 in
 stdenv.mkDerivation {
-  name = "fortune-mod-${version}";
+  pname = "fortune-mod";
+  inherit version;
 
   src = srcs.fortune;
 
diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix
index f75dfec5e562b83d8adf7bf42f668b108a160a8c..563152cc10df88df218eeae3c3b389f5262cb04a 100644
--- a/pkgs/tools/misc/fpart/default.nix
+++ b/pkgs/tools/misc/fpart/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "fpart-${version}";
+  pname = "fpart";
   version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "martymac";
     repo = "fpart";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4";
   };
 
diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix
index 8b7c2b4308824f6a9eefa79e944d4fbdd5e2b6ac..ac731bcdbe86e2beab7a3990e385bed38c389c64 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/pkgs/tools/misc/fpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "fpp-${version}";
+  pname = "fpp";
   version = "0.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix
index 0e821ce7f1f504658e7757fe6e0ec48300a309b7..ac56d948bdad10cfeb463ee28e4c88fd9ae7d19b 100644
--- a/pkgs/tools/misc/fsmark/default.nix
+++ b/pkgs/tools/misc/fsmark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fsmark-${version}";
+  pname = "fsmark";
   version = "3.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index f9e40b6b7867d498ad0407f5253220da8cb600f1..dde69778e5fec60ccf76664d7c367de53b1127dc 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fsmon-${version}";
+  pname = "fsmon";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
index e723db260eb5d7c364e83b0748bc57ced8cc1308..4e7db2dc4847680deef75c1b9eda9bff4a681c8f 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "fsql-${version}";
+  pname = "fsql";
   version = "0.3.1";
 
   goPackagePath = "github.com/kshvmdn/fsql";
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index a5baf4de5b84a9a3c401a4c46f870310328b3a3c..a189e8c1dba501922b2c0898905712bcf496130f 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -3,7 +3,7 @@
 , libarchive, darwin, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "fwup-${version}";
+  pname = "fwup";
   version = "1.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix
index 6a04213e21aeeef4ed4ee40ddec713e52de1472b..5b05ce534d70c3f37bc4e7e0bae7cec56826cb50 100644
--- a/pkgs/tools/misc/fzy/default.nix
+++ b/pkgs/tools/misc/fzy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "fzy-${version}";
+  pname = "fzy";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index 011231692f3a1a80d48291c9e4bfb311c3c2da99..ba0b76026a5809ed19e153dfeca817a354b183db 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -4,7 +4,7 @@ assert licenseFile != null;
 
 stdenv.mkDerivation rec {
   version = "25.0.2";
-  name = "gams-${version}";
+  pname = "gams";
   src = fetchurl {
     url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe";
     sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index c187b09624ad2927113bc4fc2b317df2b48e9871..002853abc1d35877f2f2e40d380c03cd912bbb42 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -3,7 +3,7 @@
 with builtins;
 
 buildGoPackage rec {
-  name = "gawp-${version}";
+  pname = "gawp";
   version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
   
diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix
index 6307d012debd7451181b71cc141ac982f5f9875a..9b41dba4e259df40ca45fc5458a172eb828cda53 100644
--- a/pkgs/tools/misc/gbdfed/default.nix
+++ b/pkgs/tools/misc/gbdfed/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6";
-  name = "gbdfed-${version}";
+  pname = "gbdfed";
 
   src = fetchurl {
-    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2";
+    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2";
     sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
   };
 
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index d71227ae8f530c9a1f3912a9a75ed293c5973828..0f32d1e63b1e8c9848e601ade5539bd33238340b 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "geekbench-${version}";
+  pname = "geekbench";
   version = "4.4.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix
index b95c7179141d5377e86e79b08011c76b4dfe38cb..d6fbb6233312f26a0cfe255cf16fc62656018569 100644
--- a/pkgs/tools/misc/geteltorito/default.nix
+++ b/pkgs/tools/misc/geteltorito/default.nix
@@ -1,7 +1,7 @@
 { stdenv, perl, ronn, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "geteltorito-${version}";
+  pname = "geteltorito";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index b79388c6f29dc2bade6b7e1ee560d4a549777ea3..e5c0997c8e3e03abe9d50ddc549e3630ea41499c 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -7,7 +7,8 @@ let
 
 in
 buildGoPackage ({
-    name = "gh-ost-${version}";
+    pname = "gh-ost";
+    inherit version;
     inherit goPackagePath;
 
     src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix
index 5c8bacac162c038a1f002a8bcffc6fe908bd0ffb..a8e957ce4840ad64b0004b9c321ed3594040165a 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/pkgs/tools/misc/gibo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coreutils, findutils, git }:
 
 stdenv.mkDerivation rec {
-  name = "gibo-${version}";
+  pname = "gibo";
   version = "1.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index afcf9cf4c781eacb020d024bc19ef940e7ef1000..5438f71930daa6f24c21bc220076ccab27d15efd 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }: 
 
   buildGoPackage rec {
-    name = "git-town-${version}";
+    pname = "git-town";
     version = "7.2.0";
 
     goPackagePath = "github.com/Originate/git-town";
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index be4de738c1c3fa1a6ce3bdc60bfded3bb1079ac4..581a1f84fc7f50e76910eef38f642d3cbfcf9885 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -2,12 +2,12 @@
 , readline, pcsclite, libical, gtk2, glib, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "gnokii-${version}";
+  pname = "gnokii";
   version = "0.6.31";
 
   src = fetchurl {
     sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-    url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz";
+    url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 0430f010e97aca26a4cec6e5b75c658fef31c4f9..6fad9829d799bbe5d65c978a97150ccccda3f0c8 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3";
-  name = "goaccess-${version}";
+  pname = "goaccess";
 
   src = fetchurl {
     url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index d7c10220f4b7c7c7753d7b131d1f2a9e3ad0ec86..bd53529a5d254353001dfb57033105d642995be7 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gosu-${version}";
+  pname = "gosu";
   version = "2017-05-09";
   rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
 
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 59ac70a8162faa2cae4c558dff16caa82185bb8c..0f448cc089c82f8931e779488ce9ca5d9f4bf7b5 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
+  pname = "graylog";
   version = "3.1.0";
-  name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
index 6c5bac11e738b42edfb3d181abbf279047710537..51c6d9c20758d92eebed0eaefe2d96b48f993437 100644
--- a/pkgs/tools/misc/gringo/default.nix
+++ b/pkgs/tools/misc/gringo/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gringo-${version}";
+  pname = "gringo";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index ec1c5897ed799d59680cf40cb9d785fa6a761f9b..a176ef13fccbf735a5c727153117c496b5b8d7c0 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -40,11 +40,12 @@ assert zfsSupport -> zfs != null;
 assert !(efiSupport && xenSupport);
 
 stdenv.mkDerivation rec {
-  name = "grub-${version}";
+  pname = "grub";
+  inherit version;
 
   src = fetchgit {
     url = "git://git.savannah.gnu.org/grub.git";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0";
   };
 
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index ca4e477adce724e95f730923a33d3dae97deaf6e..7b432df3e8b884ec281a589a50f6f1f394845008 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -29,7 +29,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "trustedGRUB2-${version}";
+  pname = "trustedGRUB2";
+  inherit version;
 
   src = if for_HP_laptop
         then fetchgit {
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index ec77f39652734e1189b7b58f3476a28b97838a9d..edb9508df31ade0a4328f9ec35af5fb76f0fef57 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -5,7 +5,7 @@ let arch =
   else if stdenv.isx86_64 then "x86_64"
   else throw "Unknown architecture";
 in stdenv.mkDerivation rec {
-  name = "grub4dos-${version}";
+  pname = "grub4dos";
   version = "0.4.6a-2019-05-12";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index f7cdf5ca608b65aa6d830dd7869baa96fb76da28..78a678f0714db648e2906300a57a8f70a3d81575 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version="1.1.3";
-  name = "gsmartcontrol-${version}";
+  pname = "gsmartcontrol";
 
   src = fetchurl {
     url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index a66b32c789c2f26967f61711c533b52d3959c027..bca481cade4502fb76c7e5fdd5b028451837b0da 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gti-${version}";
+  pname = "gti";
   version = "1.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix
index db18cae77b1f55c687f52678e9bc1eab87ab65bc..9fe267771102231ee2a9200f42fe175685d706f0 100644
--- a/pkgs/tools/misc/h5utils/default.nix
+++ b/pkgs/tools/misc/h5utils/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.13.1";
-  name = "h5utils-${version}";
+  pname = "h5utils";
 
   # fetchurl is used instead of fetchFromGitHub because the git repo version requires
   # additional tools to build compared to the tarball release; see the README for details.
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index be5e1371cd45ae74019ca64429d80e7fa402f9c1..8c2e7dc7451d94e3a492d6cc3cfe05ece8720cdf 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, wxGTK30, openssl, curl }:
 
 stdenv.mkDerivation rec {
-  name = "hakuneko-${version}";
+  pname = "hakuneko";
   version = "1.4.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix
index 8b19cd038951576f1a84c66262ad85f23ea1efc5..af4d4228c2c64d114188c4d6ca7597b0d2e4ad72 100644
--- a/pkgs/tools/misc/hdaps-gl/default.nix
+++ b/pkgs/tools/misc/hdaps-gl/default.nix
@@ -2,7 +2,8 @@
 
 let version = "0.0.5"; in
 stdenv.mkDerivation {
-      name = "hdaps-gl-${version}";
+      pname = "hdaps-gl";
+      inherit version;
       src = fetchzip {
             url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz";
             sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4";
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index bd3bebc881ee4f4c052bcc9c7d0d2946ee458f1f..e765e9234745f478322e811d1f69dae76270cdc3 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hdf-${version}";
+  pname = "hdf";
   version = "4.2.14";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix
index 17b48ad8741a68af596a62629961df5e3806dad7..d27f6fc01bcec6a8ee73e3a03fa86a5daa75de75 100644
--- a/pkgs/tools/misc/hdf5/1_8.nix
+++ b/pkgs/tools/misc/hdf5/1_8.nix
@@ -24,9 +24,9 @@ let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   version = "1.8.19";
-  name = "hdf5-${version}";
+  pname = "hdf5";
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2";
+    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2";
     sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ;
  };
 
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index e6402322d35adf3be564618a2a2c04ce5d5eb749..336010718dda9d3c8040a7ec5b803c370e9c952b 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -17,9 +17,9 @@ let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   version = "1.10.5";
-  name = "hdf5-${version}";
+  pname = "hdf5";
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
+    url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2";
     sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8";
   };
 
diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix
index 0fe72425d79cf6a20885a95f8626d629f17b9b35..6087a76e6bd1d91932f3fbf53b17cf22bd9c60fc 100644
--- a/pkgs/tools/misc/hdfjava/default.nix
+++ b/pkgs/tools/misc/hdfjava/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, javac }:
 
 stdenv.mkDerivation rec {
-  name = "hdf-java-${version}";
+  pname = "hdf-java";
   version = "3.3.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 82801da322c6b8e142dc54db00b242c80054e1a3..fb6914c01d0a4a2cd3ccf823a266156915481837 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ant, javac, hdf_java }:
 
 stdenv.mkDerivation rec {
-  name = "hdfview-${version}";
+  pname = "hdfview";
   version = "2.14";
 
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz";
+    url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz";
     sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p";
   };
 
diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index 55542b4c7fc62c3947edda2f09b035f94d7c480f..39678abeba43711cb153dac8148cc84fba04d504 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.18";
-  name = "hebcal-${version}";
+  pname = "hebcal";
 
   src = fetchFromGitHub {
     owner = "hebcal";
diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix
index b080e23b265a94e5f771d72118ae1118be0d42c7..eabb7838e8ac49474947b0481f1ef9688ae7081a 100644
--- a/pkgs/tools/misc/hexd/default.nix
+++ b/pkgs/tools/misc/hexd/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "hexd-${version}";
+  pname = "hexd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix
index b4ee1f2f5c0dad832cf732684345c48b8943e0cf..4b1b0d0c7623d0fcbf0016a642124dd58a69921f 100644
--- a/pkgs/tools/misc/hhpc/default.nix
+++ b/pkgs/tools/misc/hhpc/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, xorg, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "hhpc-${version}";
+  pname = "hhpc";
   version = "0.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix
index a0fcc6074dc00d71629a6b8e430a034594dfa56b..61832a5d3260047acf51ea2fe83d7211d134dacc 100644
--- a/pkgs/tools/misc/hostsblock/default.nix
+++ b/pkgs/tools/misc/hostsblock/default.nix
@@ -20,7 +20,7 @@
 ] }:
 
 stdenv.mkDerivation rec {
-  name = "hostsblock-${version}";
+  pname = "hostsblock";
   version = "20161213";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix
index d9aaefb46d940c0f294e6d1552585cfd1a02bcc5..16bc0393f23c33b5e9531f94be323c4812407043 100644
--- a/pkgs/tools/misc/hpl/default.nix
+++ b/pkgs/tools/misc/hpl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openblasCompat, mpi } :
 
 stdenv.mkDerivation rec {
-  name = "hpl-${version}";
+  pname = "hpl";
   version = "2.3";
 
   src = fetchurl {
-    url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz";
+    url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz";
     sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j";
   };
 
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index 7035f2ecedff1c3ad7547c6c3f15adab6fe7dd66..bc934c424f30a600d2a5c098687a424e7ad46f4d 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "i3cat-${version}";
+  pname = "i3cat";
   version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
 
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 898ecd9df4a84f132cfca21f4ee8862fd039c822..372eebb59f6115b8cec34c617cab945659777db5 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "i3minator-${version}";
+  pname = "i3minator";
   version = "0.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index 141fc968a2d4e0bdc5c6614d72d8a40ee1cdac70..872de2c702b6d7b021a6caa8771642e0a48d10e6 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage}:
 
 buildGoPackage rec {
-  name = "ical2org-${version}";
+  pname = "ical2org";
   version="1.1.5";
 
   goPackagePath = "github.com/rjhorniii/ical2org";
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix
index 15af413a999d55b220d6d97c6b1fc273f455fc31..98b039e3f8ae448bc4f8e8070a32cdecfe81a35c 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/pkgs/tools/misc/ideviceinstaller/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "ideviceinstaller";
   version = "2018-10-01";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix
index 7d15825c27e8f44046536650e7ad9284a48021f9..7fe4ad86b8ebaede00e64ce4ac439c31baa01063 100644
--- a/pkgs/tools/misc/ifdtool/default.nix
+++ b/pkgs/tools/misc/ifdtool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ifdtool-${version}";
+  pname = "ifdtool";
   version = "4.9";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix
index 66378e457a26d6ca0913d8f80d78aa191a69952c..87aa7df8d6d71998683c829345fe570d10e01cd8 100644
--- a/pkgs/tools/misc/intelmetool/default.nix
+++ b/pkgs/tools/misc/intelmetool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, zlib, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "intelmetool-${version}";
+  pname = "intelmetool";
   version = "4.8.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix
index caefcb835a3f8ec9b845f0d41b29525efe592795..981d9f2dc6cfe5b774f233bb72c239921e87fbec 100644
--- a/pkgs/tools/misc/ipad_charge/default.nix
+++ b/pkgs/tools/misc/ipad_charge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "ipad_charge-${version}";
+  pname = "ipad_charge";
   version = "2015-02-03";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index a87d199d9bd4fa9ec5dd3e342ab9a89cec44f81a..3529324b30ad9a723f28f314eaa7ca1fafdbe45c 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ised-${version}";
+  pname = "ised";
   version = "2.7.1";
   src = fetchurl {
-    url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2";
     sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb";
   };
 
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index d82347fef8f81e80cc1ab3aaf7977a2b9ea1faf7..bf1501155d96c1add4688174987359bd26c39ded 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "jdupes-${version}";
+  pname = "jdupes";
   version = "1.13.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 208c04ff039bcf7d78cec61a4e49933ee6593f96..c19ed50ece2df6f9bd27351dabed46a5426f21a0 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -2,7 +2,7 @@
 , perl, procps, gnugrep, gawk, findutils, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "keychain-${version}";
+  pname = "keychain";
   version = "2.8.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix
index be0ceda511c44915532ed44d58f5020e0845fd1a..c272584e2c0585fb09531e3dcbcbee3003bd948d 100644
--- a/pkgs/tools/misc/kt/default.nix
+++ b/pkgs/tools/misc/kt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "kt-${version}";
+  pname = "kt";
   version = "12.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index b7963c3ed81734f79107881404f61d48eeef28f7..2ca99eb61e88b3f9824775b4ed353f569838a2cb 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -6,7 +6,7 @@
 # https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb
 
 stdenv.mkDerivation rec {
-  name = "latex2html-${version}";
+  pname = "latex2html";
   version = "2018";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index e48d6354eb53bec3fd08f2897ebdb4df0f60cd40..6624eb5102d3be4d036026b6c5eae907368a1b06 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -12,7 +12,8 @@ in
 with stdenv.lib;
 with perlPackages;
 stdenv.mkDerivation {
-  name = "lbdb-${version}";
+  pname = "lbdb";
+  inherit version;
   src = fetchurl {
     url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
     sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh";
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 72c9cecf540615f2528685753d89ce57024a35f3..5955c1104d3fa932ec912fa1975064591e197986 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "ldapvi-${version}";
+  pname = "ldapvi";
   version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg";
 
   # use latest git, it includes some important patches since 2007 release
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index c6b544f9e0a1d405c7eeafe6d667bc926c8ca5f9..b59c46a8477964ab9267149f494169c9dbfcd18b 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -2,7 +2,7 @@
   libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-   name = "ldmtool-${version}";
+   pname = "ldmtool";
    version = "0.2.4";
 
    src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 95f88654425ff7ab77f1969e35c1c6d0ccca51a5..61e115e71eb7a0ae2b0d85e8f2e74b8e7415f8d4 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
-  name = "lf-${version}";
+  pname = "lf";
   version = "13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 8c9db5b8a778f6fe244a41052f852b9c784e998a..e31112a74d8ad28d58240a8037d346edb3f1f0e8 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libcpuid-${version}";
+  pname = "libcpuid";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix
index d489a5188f1471be3263b03e703da7609fbbd5f6..9bc7c372d93c9ba8b6a64e472e2663d769aef088 100644
--- a/pkgs/tools/misc/linuxquota/default.nix
+++ b/pkgs/tools/misc/linuxquota/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.05";
-  name = "quota-${version}";
+  pname = "quota";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
index 7834bc96bef0ac696bb17b13e958b03eeb5e0a15..2545dd1e6bc03b0eb52bb424280b84f4cd62b721 100644
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ b/pkgs/tools/misc/logstash/5.x.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = elk5Version;
-  name = "logstash-${version}";
+  pname = "logstash";
 
   src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
+    url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz";
     sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0";
   };
 
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index dc33d2ece5484c04bc4930e043d4989462ecd798..b580d559868b744018687d81fac5a7eb9b92a06c 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -4,7 +4,7 @@
 #   $path/logstash/{inputs,codecs,filters,outputs}/*.rb 
 stdenv.mkDerivation rec {
   version = "1.4.2";
-  name = "logstash-contrib-${version}";
+  pname = "logstash-contrib";
 
   src = fetchzip {
    url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index cb594391e2a10cd26027be1ae719b335bf86a48a..4521f8b407a6b49612582072071e4cf7572deffd 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -4,7 +4,7 @@
 # adding this to services.udev.packages on NixOS
 
 stdenv.mkDerivation rec {
-  name = "ltunify-${version}";
+  pname = "ltunify";
   version = "unstable-20180330";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix
index 9ddd92188016c21f51f3b0bed6cf2444e52f4adb..828e235823636d31835fda2c0d55b66e2122a878 100644
--- a/pkgs/tools/misc/mandoc/default.nix
+++ b/pkgs/tools/misc/mandoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "mandoc-${version}";
+  pname = "mandoc";
   version = "1.14.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index e2ff4868c9eac8e83c058091d51a2e7e9bce7f90..6d198a35605dd76a54680335c89d0d0e9b008791 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "massren-${version}";
+  pname = "massren";
   version = "1.5.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 59ed474e9bc297dbf6f23859ecdde22b3548c4a4..44b00adf5c171b6a59f255a643bc30f0587c9964 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "20190725";
-  name = "mbuffer-${version}";
+  pname = "mbuffer";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 7f0cdac1dbfa3eda719378d48fbd9d7371a2438c..b2711903ead1f35619dd3b105ac16ddfea01f960 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -2,11 +2,11 @@
 , libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "mc-${version}";
+  pname = "mc";
   version = "4.8.23";
 
   src = fetchurl {
-    url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
+    url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
     sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";
   };
 
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index 52c96fda19739c692852c47fb9373bc769d70931..bc520c57a338e92ac3457cc979bed86713526200 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.6.8";
-  name = "mcrypt-${version}";
+  pname = "mcrypt";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz";
     sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
   };
 
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 8a3842322f98025f5961b5d331c90a3b95a1046e..b365086c46d3b8222c28b952be0d42ff89430339 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -4,7 +4,8 @@
 
 let version = "0.7.1";
 in stdenv.mkDerivation {
-  name = "mdbtools-${version}";
+  pname = "mdbtools";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "brianb";
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index bbd78feaaf873d8fcc01c875aafe4c5ea969d2f8..5121491625f0a12a29a3e21bfdc5e44fee018404 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "megacli-${version}";
+  pname = "megacli";
   version = "8.07.14";
 
   src =
diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix
index 4f6c4bad97c718f78ae5704002e133f7aed126c7..e382db0b92c3dc85d47296cf2ffbfaf665a49a97 100644
--- a/pkgs/tools/misc/mht2htm/default.nix
+++ b/pkgs/tools/misc/mht2htm/default.nix
@@ -4,7 +4,7 @@ let
   date = "07.apr.2016";
 
 in stdenv.mkDerivation rec {
-  name = "mht2mht-${version}";
+  pname = "mht2mht";
   version = "1.8.1.35";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 3c2ed1352257a15dbdc23c2246db24387b02d921..3e23e2bddcc14c29d7c0fa4435ed3ede23793f61 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -2,7 +2,7 @@
 , lrzsz, ncurses, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-${version}";
+  pname = "minicom";
   version = "2.7.1";
 
   # The repository isn't tagged properly, so we need to use commit refs
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix
index 7b9549a80feac94d8b12b2306f2abb495a7a7eaa..7b8b8a82b72789811675bcc3c56f4ff0d6d5245e 100644
--- a/pkgs/tools/misc/ministat/default.nix
+++ b/pkgs/tools/misc/ministat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "ministat-${version}";
+  pname = "ministat";
   version = "20150715-1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index da1e8be7cf49a4c27c1ea5e732c82ea2f912ccf8..b2f7fdf2a906ab47ac9b1d3de931ee5abbeab1ac 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "mktorrent-${version}";
+  pname = "mktorrent";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
index baf418ac9f04e2c9d343469063f3981c0ff8031a..f8fb253af471dcce498a6cde2721be47a64b6e25 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -3,11 +3,11 @@
 let
   dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
 in stdenv.mkDerivation rec {
-  name = "mlocate-${version}";
+  pname = "mlocate";
   version = "0.26";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/mlocate/${name}.tar.xz";
+    url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz";
     sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
   };
 
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
index 1d3a355dd95008c6a9a136d719325963cadaeb9f..a791cbe5d482885a48fd9a8defca9a003dfbdae3 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mmake-${version}";
+  pname = "mmake";
   version = "1.2.0";
 
   goPackagePath = "github.com/tj/mmake";
diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
index 602c9c26c787d4020be7dfa792742366151900c8..6129f15c734f1bf45b0fcdb027db7478a385601a 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mmv-${version}";
+  pname = "mmv";
   version = "1.01b";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index 16762d243dbb0c9bed4827016dbf39b4bcf25963..25d7eaba55ed0b15c1e45ee54826ee48eb322e86 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -52,7 +52,8 @@ let
       throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
 
 in stdenv.mkDerivation {
-  name = "mongodb-compass-${version}";
+  pname = "mongodb-compass";
+  inherit version;
 
   inherit src;
 
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index a728450d76e589cbc16edc020b88ef7f4f2f3039..dc7a64bdcf7e20b3b82876dc02d48380bf3876e3 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -10,7 +10,7 @@ in
 with stdenv.lib;
 
 buildGoPackage rec {
-  name = "mongo-tools-${version}";
+  pname = "mongo-tools";
   version = "3.7.2";
   rev = "r${version}";
 
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 00cbc8b46295f0662825ed9759819ddb711ca66f..336d673f7ecdf7313571f8156d483a3de2c928d7 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "moreutils-${version}";
+  pname = "moreutils";
   version = "0.63";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix
index 5be323a6f4bc3cac87a84229ab6ac6820a389544..df84084fc9c18a633e0af78195887eb25d760ce6 100644
--- a/pkgs/tools/misc/mpdscribble/default.nix
+++ b/pkgs/tools/misc/mpdscribble/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "mpdscribble-${version}";
+  pname = "mpdscribble";
   version = "0.22";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
index 778671f0b54ed0b4e715bbebf967d15c5bda9d1a..363e90ab5f2386e1dbf9e2f98dfc516a25b38fd4 100644
--- a/pkgs/tools/misc/mprime/default.nix
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mprime-${version}";
+  pname = "mprime";
   version = "29.4b7";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index 26fcea669c223c8c2b7ed8135e4031825c33e004..922592a256d05efb1b00e1ed0b26a35e1887c14e 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "2.17.7";
-  name = "mrtg-${version}";
+  pname = "mrtg";
 
   src = fetchurl {
-    url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz";
+    url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz";
     sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v";
   };
 
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 04271b610699ce201e840fed8988fdc8a28fb3f4..2607cf6f300a02ffb68ec82897b70b7edd457403 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "ms-sys-${version}";
+  pname = "ms-sys";
   version = "2.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
+    url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz";
     sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
   };
 
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 07561d390cd0dfd91309d1bde9dd2b3990fc4acc..3037b672498c76efa48eb614ece620c09c9eec48 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "6.4.2";
-  name = "multitail-${version}";
+  pname = "multitail";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/multitail/${name}.tgz";
+    url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz";
     sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg";
   };
 
diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix
index 9c483fe3b8f24a55d6fc4105ca1bc40134d91c80..183871c39a7e3056b4671186bcf3d27c6af4ef67 100644
--- a/pkgs/tools/misc/mysqltuner/default.nix
+++ b/pkgs/tools/misc/mysqltuner/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mysqltuner-${version}";
+  pname = "mysqltuner";
   version = "1.7.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix
index 57036acb58e89a07b4c52ba40c269abbc6c10ea1..525c16b6024bb4bd2f9c32b673d7e266269880b4 100644
--- a/pkgs/tools/misc/nagstamon/default.nix
+++ b/pkgs/tools/misc/nagstamon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "nagstamon-${version}";
+  pname = "nagstamon";
   version = "3.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix
index 2312ce236abddd4045098099bf54301fa019ac9c..a1a6347642b634d1a9169cca67f4a2610a16fc7a 100644
--- a/pkgs/tools/misc/nbench/default.nix
+++ b/pkgs/tools/misc/nbench/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nbench-byte-${version}";
+  pname = "nbench-byte";
   version = "2.2.3";
 
   src = fetchurl {
-    url = "http://www.math.utah.edu/~mayer/linux/${name}.tar.gz";
+    url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz";
     sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";
   };
 
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 6b2e7d681706e9af548d9282beadc7e96940bc0e..d29626c99d188733d6c04f246ad23a8a8b3af906 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ncdu-${version}";
+  pname = "ncdu";
   version = "1.14.1";
 
   src = fetchurl {
-    url = "https://dev.yorhel.nl/download/${name}.tar.gz";
+    url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
     sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy";
   };
 
diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix
index e19eac1c51e57108305d41d802f4491cd2a097ab..91dd56c9b0f4f473f728b1d7e457f560d80bcb07 100644
--- a/pkgs/tools/misc/nginx-config-formatter/default.nix
+++ b/pkgs/tools/misc/nginx-config-formatter/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2019-02-13";
-  name = "nginx-config-formatter-${version}";
+  pname = "nginx-config-formatter";
 
   src = fetchFromGitHub {
     owner = "1connect";
diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix
index 3037262322f2fd2d146d81ef3172ddf98f9fcb11..0005ffe824b0c935513331228c43681c82614f60 100644
--- a/pkgs/tools/misc/nms/default.nix
+++ b/pkgs/tools/misc/nms/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nms-${version}";
+  pname = "nms";
   version = "0.3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix
index 77c84ab451188296bf6cec7047d55d3f2f62b27f..b197e9bc5d2e99231b153505d6f5a2214af55f69 100644
--- a/pkgs/tools/misc/noteshrink/default.nix
+++ b/pkgs/tools/misc/noteshrink/default.nix
@@ -3,7 +3,7 @@
 with python3.pkgs;
 
 buildPythonApplication rec {
-  name = "noteshrink-${version}";
+  pname = "noteshrink";
   version = "0.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix
index 93c0f5e346bf629c286317bf5bca71be864811c9..307a08bbdf937af1df475390e3aa5d46181d0340 100644
--- a/pkgs/tools/misc/notify-desktop/default.nix
+++ b/pkgs/tools/misc/notify-desktop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, dbus, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "notify-desktop-${version}";
+  pname = "notify-desktop";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix
index fdce7076661a9f208e48babd6ad048a08636148b..ecff547e9513c3f41f106e5dbfc5ad79b618098f 100644
--- a/pkgs/tools/misc/nvramtool/default.nix
+++ b/pkgs/tools/misc/nvramtool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, iasl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "nvramtool-${version}";
+  pname = "nvramtool";
   version = "4.8.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix
index 6d508a48901a628aa1fcc2bab73017c1dea0a949..3b45b7b064423655bc39f838e686de50cd629c46 100644
--- a/pkgs/tools/misc/oci-image-tool/default.nix
+++ b/pkgs/tools/misc/oci-image-tool/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "oci-image-tool-${version}";
+  pname = "oci-image-tool";
   version = "1.0.0-rc1";
 
   goPackagePath = "github.com/opencontainers/image-tools";
diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix
index 9ffb89aca6b13e835a2de44add9b2566a2a86246..4317c46190dbd2d0e62b4165a6205025c6a53179 100644
--- a/pkgs/tools/misc/ocz-ssd-guru/default.nix
+++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix
@@ -4,7 +4,7 @@ let
   system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32";
 in
 stdenv.mkDerivation rec {
-  name = "ocz-ssd-guru-${version}";
+  pname = "ocz-ssd-guru";
   version = "1.0.1170";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index f6aea4a92ab9338887dfaebc7e84c193848078ef..2a0846dd51160c1641ce85672b7107e19968d52e 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "opentsdb-${version}";
+  pname = "opentsdb";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd";
   };
 
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 59a60e356b80979e9165ae71adb0e4aabf22d859..78426329975c2c517f89e0d8b48a31090879aab8 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -10,7 +10,7 @@ ntfs3g      # ntfs3g
 
 stdenv.mkDerivation rec {
   version = "1.76";
-  name = "os-prober-${version}";
+  pname = "os-prober";
   src = fetchurl {
     url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2";
     sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g";
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
index f14fb5269970934a371817bb62578e28f7cc3d44..370d192471137758dfa7b70f7bd4e545b0ea86f9 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
 
 stdenv.mkDerivation rec {
-  name = "osm2pgsql-${version}";
+  pname = "osm2pgsql";
   version = "0.96.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
index 96e5e6a1d94ed1990f0480664b0c096788d09fcf..4b28a7c45e5ddf22fd24b44d6225e18fb9dbf1af 100644
--- a/pkgs/tools/misc/otfcc/default.nix
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, premake5 }:
 
 stdenv.mkDerivation rec {
-  name = "otfcc-${version}";
+  pname = "otfcc";
   version = "0.9.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 1e747961499c670f25cd02d8588c0dfdc9e82e5f..5313b69933b6871d09ee24d5621ce00b7b6cba2f 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -3,7 +3,7 @@
 , which, wrapGAppsHook, xdotool }:
 
 stdenv.mkDerivation rec {
-  name = "parcellite-${version}";
+  pname = "parcellite";
   version = "1.2.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix
index a5e45dc259b9239f43a67c45720289b60c2675d5..c2c8e2b85733998b5215b7164ad61c4735781e12 100644
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.5";
-  name = "pastebinit-${version}";
+  pname = "pastebinit";
 
   src = fetchurl {
-    url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2";
+    url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
   };
 
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix
index fe1d848ee502be50272255181fb7282ce4ace423..858422b85328676648085bc88d2a3498e83a1eae 100644
--- a/pkgs/tools/misc/pb_cli/default.nix
+++ b/pkgs/tools/misc/pb_cli/default.nix
@@ -6,7 +6,7 @@ assert video -> capture != null;
 assert clipboard -> xclip != null;
 
 stdenv.mkDerivation rec {
-  name = "pb_cli-unstable-${version}";
+  pname = "pb_cli-unstable";
   version = "2019-03-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index c16106f4637baa724b6bc425283b5b5411316b87..6c1bc5fcf04d7313559d0a92fdd96a37a2a5007c 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }:
 
 stdenv.mkDerivation rec {
-  name = "phoronix-test-suite-${version}";
+  pname = "phoronix-test-suite";
   version = "8.8.1";
 
   src = fetchurl {
-    url = "https://phoronix-test-suite.com/releases/${name}.tar.gz";
+    url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
     sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn";
   };
 
diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index 74d24db574ff3b624a0c4cdb4b80a9d7fc6659bb..dd07fee340542ed27649e4bd53f6bdd5d186445f 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "phraseapp-client-${version}";
+  pname = "phraseapp-client";
   version = "1.11.0";
 
   goPackagePath = "github.com/phrase/phraseapp-client";
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index 45b0da6f8db08b546b043ba5b27eaa4b36412eda..ceb2bace7db984f0be26b4a5496784d6f0534f2b 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "pick-${version}";
+  pname = "pick";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index c49695fd9ad9b9852414c7d75d4c6ba2ddf50619..1ad219403687eb90b20a8efc3fa09b84470727a2 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -5,7 +5,7 @@ assert stdenv.isDarwin -> IOKit != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "picocom-${version}";
+  pname = "picocom";
   version = "3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index abbd64cb62fd0ceca1d1821ff9810215e5a00873..5bd1e34708291f82ddbb4369f7f133f441df60d3 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
 
   version = "0.2.8.2";
 
-  name = "pipelight-${version}";
+  pname = "pipelight";
 
   src = fetchurl {
     url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix
index ececef398501f0237885c61a445ebbec83fb2b13..a16333f6e440596188c8a48e32678b0f8a7b70a9 100644
--- a/pkgs/tools/misc/pixd/default.nix
+++ b/pkgs/tools/misc/pixd/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pixd-${version}";
+  pname = "pixd";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 1cf64362e6d68c1ee3183e0d6b0d862fc4eb2073..eb2881b29f75e1545f9db1fdc582f9bd9cd815bb 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2019.8";
-  name = "plantuml-${version}";
+  pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix
index 41913f966534b96dc2de7aca97b1e14ae78457d2..d2a7f3f37ea13967409756e76ec8c0aef0a77627 100644
--- a/pkgs/tools/misc/plotinus/default.nix
+++ b/pkgs/tools/misc/plotinus/default.nix
@@ -10,7 +10,7 @@
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "plotinus-${version}";
+  pname = "plotinus";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 191f8980d832253d8c98298f4294be631ca531a9..1d3e8c6c33dbbb9e2c59a1de2c46214d3e6c5293 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "plowshare-${version}";
+  pname = "plowshare";
   version = "2.1.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix
index 0bd61c0fcdf5cb23934b8dbecd3afea8933b01bf..5712e02e8ea06ad231a950831c74cdabc24600bf 100644
--- a/pkgs/tools/misc/pod2mdoc/default.nix
+++ b/pkgs/tools/misc/pod2mdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pod2mdoc-${version}";
+  pname = "pod2mdoc";
   version = "0.0.10";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz";
+    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz";
     sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f";
   };
 
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 2c9ed7be039ed7efa55c290671070b4dcf396135..5c1b1be2db3b574ca4515049c69c435f0d34368b 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -3,7 +3,6 @@
 buildGoModule rec {
   pname = "powerline-go";
   version = "1.13.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "justjanne";
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 2a34224c126653a018acc57a20da6bccd31bbd33..0c9d3a0ea79931e7e4065114cb2e5ac4f837fbc2 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.37";
-  name = "profile-cleaner-${version}";
+  pname = "profile-cleaner";
 
   src = fetchFromGitHub {
     owner = "graysky2";
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index ac98df58784f1dbb91eeb63c296136f9fbc8b1a0..989a2d3f22b9d1fd2134d4fa3f06e05530dd29c0 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "6.34";
-  name = "profile-sync-daemon-${version}";
+  pname = "profile-sync-daemon";
 
   src = fetchurl {
     url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index b29d0eafcc9e7498641c9b5af3e735a3fd01c7e8..3edca413f3aa8418e4544c697bbd56a45d4c7c0a 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, ncurses, which }:
 
 stdenv.mkDerivation rec {
-  name = "progress-${version}";
+  pname = "progress";
   version = "0.14";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 1aaed4feafe89f1f37895323cb73baab3f2d9cbb..ca3016d1187419ddb1c86eda9c1951e46deba11f 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }:
 
 stdenv.mkDerivation rec {
-  name = "pspg-${version}";
+  pname = "pspg";
   version = "1.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 6af33691a07d80cb2dc0cea5df7a85b9ae2e21d8..613ad263ed342327497e5fb5d02d6f482091a228 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "radeon-profile-${version}";
+  pname = "radeon-profile";
   version = "20170714";
 
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index 11ac0fc14199dc0c55d9155268b344cb3686c551..3d97874df7de28bd0d25e42a8bd7dd56c551fe22 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rcm-${version}";
+  pname = "rcm";
   version = "1.3.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix
index 484bb765c0db6dc09cfca18f93b477d65ed1fde0..88aff4f3c084da8da6badafc4a4146c150b9f486 100644
--- a/pkgs/tools/misc/recoverjpeg/default.nix
+++ b/pkgs/tools/misc/recoverjpeg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "recoverjpeg-${version}";
+  pname = "recoverjpeg";
   version = "2.6.3";
 
   src = fetchurl {
-    url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz";
+    url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz";
     sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv";
   };
 
diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix
index ee7b2623b1dd5e3c79e789ae6058f16f1a13ce5b..627758e9c5e71617738fc618402295af0e450bbc 100644
--- a/pkgs/tools/misc/rig/default.nix
+++ b/pkgs/tools/misc/rig/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.11";
-  name = "rig-${version}";
+  pname = "rig";
 
   src = fetchurl {
     url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index bd60e786036f57f328df755c6727a372a0ce19ae..af5bfedf2037542d01482ecd8507026e9d6bc68a 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "rlwrap-${version}";
+  pname = "rlwrap";
   version = "0.43";
 
   src = fetchurl {
-    url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf";
   };
 
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 320edd83021f3b5a67ac83262d304c6c4e235f2d..7b7fa9ce705e5f4c4fb809ef606c41389dcd4f4d 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rmlint-${version}";
+  pname = "rmlint";
   version = "2.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 925bb199b2793e4a9c9764ee11c017e9ca444d41..232949b7dace6749ae9970730e29bc5f841d0f5e 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -5,7 +5,7 @@
 let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation  rec {
-  name = "rockbox-utility-${version}";
+  pname = "rockbox-utility";
   version = "1.4.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix
index e24b1fce06efa0365663b1a3d439a3af1a8db018..7eebc1943009aa4aeea109ed9fd67e1cfe29af46 100644
--- a/pkgs/tools/misc/roundup/default.nix
+++ b/pkgs/tools/misc/roundup/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ronn, shocco }:
 
 stdenv.mkDerivation rec {
-  name = "roundup-${version}";
+  pname = "roundup";
   version = "0.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix
index 650ac9f660aa86560324f335bf366df5b73a7aff..d852818b31554cef059f2c85354f2a4f691404f2 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/pkgs/tools/misc/routino/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "routino-${version}";
+  pname = "routino";
   version = "3.2";
 
   src = fetchurl {
-    url = "https://routino.org/download/${name}.tgz";
+    url = "https://routino.org/download/${pname}-${version}.tgz";
     sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972";
   };
 
diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix
index 345f26852dcb99aa379fa429df5d1de4d376d516..b6e53e4653600d5139ae8cb5fc51a3fcb8287ae2 100644
--- a/pkgs/tools/misc/rw/default.nix
+++ b/pkgs/tools/misc/rw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rw-${version}";
+  pname = "rw";
   version = "1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix
index 2d1db4eb64c748bc7bad28367b3ea9b72d2ca3a0..acab41e8ff54ea193260b54cbfb1c1b63c100be9 100644
--- a/pkgs/tools/misc/sam-ba/default.nix
+++ b/pkgs/tools/misc/sam-ba/default.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2.16";
-  name = "sam-ba-${version}";
+  pname = "sam-ba";
 
   src = fetchzip {
     url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip";
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index bd760adecf75b731a36455f82525e3ab54de94e8..65b7b47256a8b2abad6632b5d843b86d6958c227 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.17";
-  name = "scanmem-${version}";
+  pname = "scanmem";
 
   src = fetchFromGitHub {
     owner  = "scanmem";
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix
index 1b7afdfbe9df0b4674ce35b9a56d8a7ef61781f1..2ba3224a5f8b48cf2482f5a7d30555d20321cea0 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/pkgs/tools/misc/scfbuild/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }:
 
 buildPythonApplication rec {
-  name = "scfbuild-${version}";
+  pname = "scfbuild";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index df1fcd89ac783ca93b4ddd2db725896adab7d5a2..beeeb84aac93f51a7362628caf898e27585984de 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-${version}";
+  pname = "screen";
   version = "4.6.2";
 
   src = fetchurl {
-    url = "mirror://gnu/screen/${name}.tar.gz";
+    url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
     sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v";
   };
 
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index a9cd9d75de8e2cc27fabfc88fff7ec4efbafc657..883c2edd80a35302a46bde7a344b32d002623fdf 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -19,7 +19,7 @@ let
   ]));
 
 in stdenv.mkDerivation rec {
-  name = "screenFetch-${version}";
+  pname = "screenFetch";
   version = "3.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix
index 23dccc0273d1e3627b887fbc7cc25a4ef511b64f..742b25601c08c274b5cf99ffdbcc6c7f09f50476 100644
--- a/pkgs/tools/misc/sdate/default.nix
+++ b/pkgs/tools/misc/sdate/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, autoreconfHook }:
 stdenv.mkDerivation rec {
-  name = "sdate-${version}";
+  pname = "sdate";
   version = "0.5";
   src = fetchurl {
     url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz";
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index 6a2ed3bcb911b8e307b90a566052449499bf4199..e821d5e4332a27dc01e57aaad918f1b2b2c8127b 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }:
 
 stdenv.mkDerivation rec {
-  name = "sdl-jstest-${version}";
+  pname = "sdl-jstest";
   version = "2018-06-15";
 
   # Submodules
diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix
index c0f877f4c41406608515143eab51f7340db9567b..4ef91f6c55a31025b7847b5448d29890ed81f4f2 100644
--- a/pkgs/tools/misc/sl/default.nix
+++ b/pkgs/tools/misc/sl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "sl-${version}";
+  pname = "sl";
   version = "5.05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 6f7c9d3506b2efc55490bcb97bd15e0301f9dc6c..65031c2a1fe72b30e72a686e7de78104b95ecf3e 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "slop-${version}";
+  pname = "slop";
   version = "7.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index f5e1fd7b1b4deb1daa47702949be822656ee404f..c6661ee62e4644228f1652ca93c3a68496c20a1f 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.15";
-  name = "smenu-${version}";
+  pname = "smenu";
 
   src = fetchFromGitHub {
     owner  = "p-gen";
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index ac0b950a1da59bf6878d9768ef80de126b0f9c5c..5eba12285ded7070dcaffe9790d77ca36cba6fe8 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -4,7 +4,7 @@
 , lvm2, pam, python, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "snapper-${version}";
+  pname = "snapper";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix
index de9366d1d0ff9f7ab3a15070160d399dc9f28f5a..d111e0b2b71766ccce90d96e2943739e572ad655 100644
--- a/pkgs/tools/misc/sonota/default.nix
+++ b/pkgs/tools/misc/sonota/default.nix
@@ -12,7 +12,7 @@ let
   };
 
 in buildPythonApplication rec {
-  name = "sonota-unstable-${version}";
+  pname = "sonota-unstable";
   version = "2018-10-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 794c06b8044e7ff66b61ccee319ca6ccd73b93d8..e4e1adf20016e800f11c03ee06ec63cfe805981f 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -10,7 +10,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "2.8.1";
-  name = "staruml-${version}";
+  pname = "staruml";
 
   src =
     if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix
index e5cc5ad4198f10920cadf1f6cd2779ad75758d56..e54dc3b3f2b66ce444492ae502a1999720823164 100644
--- a/pkgs/tools/misc/subberthehut/default.nix
+++ b/pkgs/tools/misc/subberthehut/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }:
 stdenv.mkDerivation rec {
-  name = "subberthehut-${version}";
+  pname = "subberthehut";
   version = "20";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix
index c96ac41fb2684a6b3b1b7231acd5f7d3191c9e29..8d42d2d823f30402527b60b31d20801e59daaf8f 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/pkgs/tools/misc/sutils/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
    version = "0.2";
-   name = "sutils-${version}";
+   pname = "sutils";
 
    src = fetchFromGitHub {
      owner = "baskerville";
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 15b8f1bf3b42d760362116feb51ec576261008c0..12ba89304c0e6e53661b767c39757fe964b76623 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python3Packages) python nose pycrypto pyyaml requests mock;
 in stdenv.mkDerivation rec {
-  name = "svtplay-dl-${version}";
+  pname = "svtplay-dl";
   version = "2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index fd0a766f54e90039c4cfb1c542e0a1850e80a0ab..0d1ebd70041f69837e5240fe15f1c6674a61fdff 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -6,7 +6,7 @@
   libudev0-shim
 }:
   stdenv.mkDerivation rec {
-    name = "sweep-visualizer-${version}";
+    pname = "sweep-visualizer";
     version = "0.15.0";
 
     src = fetchurl {
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 6750bbe8ae69161cf52947d8fa1014683627c992..35259dada3db3aeda91c4068a55f1262776e3920 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "system-config-printer-${version}";
+  pname = "system-config-printer";
   version = "1.5.11";
 
   src = fetchurl {
-    url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q";
   };
 
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
index 73e144d93aa146affdf79365de2549ca1ad22421..dd48156d4564839e3467b8e37e22b8100412b6c2 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "systrayhelper-${version}";
+  pname = "systrayhelper";
   version = "0.0.4";
   rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9";
 
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix
index 2d3eb91250a8a05df77be8795eb5e8a115d89f87..4cac9befe16a35f5b526c63002716809d8cf04d6 100644
--- a/pkgs/tools/misc/teleconsole/default.nix
+++ b/pkgs/tools/misc/teleconsole/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "teleconsole-${version}";
+  pname = "teleconsole";
   version = "0.4.0";
 
   goPackagePath = "github.com/gravitational/teleconsole";
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix
index 2d713ae3821c7a6370abeeef7c96fc62c684140b..d875b098ab568f3e09c3853b935c3722c6d28629 100644
--- a/pkgs/tools/misc/tewisay/default.nix
+++ b/pkgs/tools/misc/tewisay/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
 
 buildGoPackage rec {
-  name = "tewisay-unstable-${version}";
+  pname = "tewisay-unstable";
   version = "2017-04-14";
 
   goPackagePath = "github.com/lucy/tewisay";
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix
index 47216838476a7c2262b677612cccb69b42423b89..abc25db2fa7e5a70aab5e482d2f86783546adf35 100644
--- a/pkgs/tools/misc/texi2mdoc/default.nix
+++ b/pkgs/tools/misc/texi2mdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "texi2mdoc-${version}";
+  pname = "texi2mdoc";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz";
+    url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz";
     sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs";
   };
 
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 8cbea666f12319484c38669e4103cb22399fc729..0739435084d29f627b19d6752087e0cc8dbe1fce 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }:
 
 stdenv.mkDerivation rec {
-  name = "thin-provisioning-tools-${version}";
+  pname = "thin-provisioning-tools";
   version = "0.7.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index 8f297542a3ca8844563afaeeb3a17f16690b8119..bb6276f70655146251091c059944dbc16d8374d7 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "time-${version}";
+  pname = "time";
   version = "1.9";
 
   src = fetchurl {
-    url = "mirror://gnu/time/${name}.tar.gz";
+    url = "mirror://gnu/time/${pname}-${version}.tar.gz";
     sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v";
   };
 
diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix
index ed26895fba6f302c7dc8947b4135500a92b69fb6..3a8388280d651601ab3f17190bbfea8532c37d0e 100644
--- a/pkgs/tools/misc/tio/default.nix
+++ b/pkgs/tools/misc/tio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "tio-${version}";
+  pname = "tio";
   version = "1.32";
 
   src = fetchzip {
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index fcd556c55966fc9f00bfbc729e8a073e9da2a4d2..d4ff9d8c844213122b433fec0cf7e425038905be 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, libzip, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tldr-${version}";
+  pname = "tldr";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 6e431fdc98eae95ed09cbaf38e31e6d5162efb90..e5932d9e9462a8b58ea4be8518cbc1defa532132 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -14,7 +14,7 @@ let
           );
 
 in stdenv.mkDerivation rec {
-  name = "tlp-${version}";
+  pname = "tlp";
   version = "1.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index c87fe8bf446c6ff72bb2243203d4a2ce6c4c2e27..420692c070c7830f05602740dad06eb525a27ec8 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -2,7 +2,7 @@
 , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
 
 stdenv.mkDerivation rec {
-  name = "tmate-${version}";
+  pname = "tmate";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index 968ead6131be8077ff2e9470fd2f8de90527abbd..fa024e58fa815184c16ff79507dc49662a562ff9 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
 
-  name = "togglesg-download-git-${version}";
+  pname = "togglesg-download-git";
   version = "2017-12-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 2729f6f885947d70c8b4ce1363b2d7f7e645202d..abc6933a777e68898254e9ccfea8e2421aae811f 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libcaca }:
 
 stdenv.mkDerivation rec {
-  name = "toilet-${version}";
+  pname = "toilet";
   version = "0.3";
 
   src = fetchurl {
-    url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz";
+    url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz";
     sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49";
   };
 
diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index 4591c5ac5b5aa6f9b2fed346183b0a0074f03a61..be0c33fb6e54a855e33d0972133eb728f3ce5fdd 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -6,7 +6,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "toybox";
   version = "0.8.1";
 
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index eed527da4168ec365b3ac3d4a83ff90098645224..bfb97c22b1d35d3f33c189753d477ac6573a2720 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -6,10 +6,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.8.3";
-  name = "ttfautohint-${version}";
+  pname = "ttfautohint";
 
   src = fetchurl {
-    url = "mirror://savannah/freetype/${name}.tar.gz";
+    url = "mirror://savannah/freetype/${pname}-${version}.tar.gz";
     sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7";
   };
 
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix
index 5663bcc35fdb4be49daef640c21ede49a5024bd1..59091bcd2bd1648c24b510be1814129c703d0696 100644
--- a/pkgs/tools/misc/ttwatch/default.nix
+++ b/pkgs/tools/misc/ttwatch/default.nix
@@ -2,7 +2,7 @@
 , enableUnsafe ? false }:
 
 stdenv.mkDerivation rec {
-  name = "ttwatch-${version}";
+  pname = "ttwatch";
   version = "2018-12-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index 113359a8bcea5b4007ed5474a932c62f7a75197f..edaa9b662e76ff76b6fff64915a9fdd6453ce92a 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tty-clock-${version}";
+  pname = "tty-clock";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index fda9dc506e2f7dd8930c1a19494a007d40c5c79d..70856fba7319d11ea572c7413c575e869cb00c5a 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "ttylog-${version}";
+  pname = "ttylog";
   version = "0.31";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
index 78aeab00a50fa5c9a715a97987fafe76e4a9b04e..45aa9ea5c0b24ae6a9d30434dc83a279d01781ad 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ttyplot-${version}";
+  pname = "ttyplot";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix
index ca66517181175d2bd1bc8abc1fe553ca853b9467..56ec9afea4386f4d4ab1edfebaedc4f20e878436 100644
--- a/pkgs/tools/misc/ttyrec/default.nix
+++ b/pkgs/tools/misc/ttyrec/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ttyrec-${version}";
+  pname = "ttyrec";
   version = "1.0.8";
 
   src = fetchurl {
-    url = "http://0xcc.net/ttyrec/${name}.tar.gz";
+    url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz";
     sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec";
   };
 
diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix
index f37892a231a5ebad2b2288351abbd916cb4768a1..90f9559e6b7c325de844c64d6e0bae46457e0360 100644
--- a/pkgs/tools/misc/txt2man/default.nix
+++ b/pkgs/tools/misc/txt2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, coreutils, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "txt2man-${version}";
+  pname = "txt2man";
   version = "1.6.0";
 
   src = fetchurl {
-    url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz";
+    url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz";
     sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn";
   };
 
diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix
index 90a9e0fa66ffee01e1ebeea7b95123c9ed4e5117..b642fb6ec5cec873d2ac4186c054bef93e7a8af3 100644
--- a/pkgs/tools/misc/txtw/default.nix
+++ b/pkgs/tools/misc/txtw/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4";
-  name = "txtw-${version}";
+  pname = "txtw";
 
   src = fetchFromGitHub {
     owner = "baskerville";
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 195a31b63e5bed2fe5076c9d55ed640c1f0e092e..d80af088342a0521d38091eff6ebb2f6914f2c23 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -7,7 +7,7 @@
 # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
 
 stdenv.mkDerivation rec {
-  name = "ultrastar-creator-${version}";
+  pname = "ultrastar-creator";
   version = "2019-04-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 3ab404d020779ccf68254f0c76854d551e8500f2..0a3bb19d14b9751505197bd00fbcb97bdab74384 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -83,7 +83,8 @@ let
     };
 
 in stdenv.mkDerivation {
-  name = "ultrastar-manager-${version}";
+  pname = "ultrastar-manager";
+  inherit version;
   src = patchedSrc;
 
   postPatch = ''
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 9ac60ca8b13ab77dbc29d8386634ae6850cd925d..2b70848cbb815f107ca138206d5c48786812b866 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   major = "14";
   minor = "3";
   version = "${major}.${minor}.0";
-  name = "umlet-${version}";
+  pname = "umlet";
 
   src = fetchurl {
     url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 374e1b9eaf639ce017052f717dc18218e320c7ec..8f66f566aa7d0c04342449985c351fa72f86f23b 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "units-${version}";
+  pname = "units";
   version = "2.19";
 
   src = fetchurl {
-    url = "mirror://gnu/units/${name}.tar.gz";
+    url = "mirror://gnu/units/${pname}-${version}.tar.gz";
     sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2";
   };
 
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix
index 01b62eed56c321147e91859f4f00a4a3a2a9b798..b3937175604df35a54c827cada77cfa11fa6dbbd 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/pkgs/tools/misc/up/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  name = "up-${version}";
+  pname = "up";
   version = "0.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index 7751e03df1935480f524688e46441656faf6d026..607cb47ed4e8b0f21a73755a3d9bc11d8f671a94 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -7,7 +7,7 @@
 #   (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) &
 # '';
 buildGoPackage rec {
-  name = "upower-notify-${version}";
+  pname = "upower-notify";
   version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
   
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 545d7c554acc53986df5bb637602b3707dc486a0..fe89e74cb697a404efbc4b34a6b4b613b8745299 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.10";
-  name = "urjtag-${version}";
+  pname = "urjtag";
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
index a655aa9502e5d47f0ef3ce1ce209cd0a89809353..7f81774aebee3754586cc05565afa4688b1514c0 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.2.0";
-  name = "vimer-${version}";
+  pname = "vimer";
 
   src = fetchFromGitHub {
     owner = "susam";
diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix
index e9733c7ef799b38bab8b999d9a89c9914c0a6e6c..858cbe9e317a4064e43317538919014c89aa0024 100644
--- a/pkgs/tools/misc/vimpager/build.nix
+++ b/pkgs/tools/misc/vimpager/build.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "vimpager-${version}";
+  pname = "vimpager";
 
   src = fetchFromGitHub {
     inherit sha256;
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 4f1ca8f89ceb5e045d34eedec9282ccc497e56b2..06280b49fbf19a463eef422a3fea90165cdefd45 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -2,7 +2,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  name = "wakatime-${version}";
+  pname = "wakatime";
   version = "10.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix
index 00e26d762a442a9cb690a84b6715d1cfb7859274..de3a19c3f51c326da7d4e3ec5e8b03e6e835428c 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/pkgs/tools/misc/wl-clipboard/default.nix
@@ -2,7 +2,7 @@
 , wayland, wayland-protocols }:
 
 stdenv.mkDerivation rec {
-  name = "wl-clipboard-${version}";
+  pname = "wl-clipboard";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 12a97a2e8e46635a9aefea328aea29238d28c11f..f25034dd8cda22c5b6a6e753be95cb7fdb4da0b1 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.3.0";
-  name = "woeusb-${version}";
+  pname = "woeusb";
 
   src = fetchFromGitHub {
     owner = "slacka";
diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix
index 35da2e0a4e945e3f3ebd528a9de9b6a5989b76ec..fa3ab747f64f1f1a8ebdddf7afd947bcd0085308 100644
--- a/pkgs/tools/misc/woof/default.nix
+++ b/pkgs/tools/misc/woof/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2012-05-31";
-  name = "woof-${version}";
+  pname = "woof";
 
   src = fetchurl {
     url = "http://www.home.unix-ag.org/simon/woof-${version}.py";
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index f19d448e5fc26d130793bc97aadc8a01300ae3dc..78affe34b58b7160ea2afdc3b7aed1472f4aba0d 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -4,10 +4,9 @@
 stdenv.mkDerivation rec {
   pname = "wv";
   version = "1.2.9";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+    url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc";
   };
 
diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index 1029dbb29d8ca130dde604f160d3c15d55c3021e..ec516555273a66a00ece6c9fc1cd29c82f850ff9 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
-  name = "wyrd-${version}";
+  pname = "wyrd";
 
   src = fetchurl {
     url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz";
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index aad5b35c79ff37aee25df07db5caaf3e2165485b..62e2b31fa15348ad63643c80a7b6ef9da00b82cf 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -6,7 +6,8 @@ let
   version = "2011-12-26";
 in
 stdenv.mkDerivation {
-  name = "xburst-tools-${version}";
+  pname = "xburst-tools";
+  inherit version;
 
   src = fetchgit {
     url = git://projects.qi-hardware.com/xburst-tools.git;
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index 79565af8e926fe30167c34fbc30b97a034ac9fea..69009b86af8cb11424be0187a1131128dfadf0bb 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libXmu }:
 
 stdenv.mkDerivation rec {
-  name = "xclip-${version}";
+  pname = "xclip";
   version = "0.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 8260d7921ecc8e57d43df3bc0e378aa3350295fc..28268052826cdc53328823b402b1577f6b30757f 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "xdaliclock-${version}";
+  pname = "xdaliclock";
   version = "2.44";
 
   src = fetchurl {
-    url="https://www.jwz.org/xdaliclock/${name}.tar.gz";
+    url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz";
     sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0";
   };
 
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index c33e01fa0e7124cfaf0e81dff67c675ef38146a2..f042b9e209f7b400b56dbcaf22d595411d38be90 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }:
 
 stdenv.mkDerivation rec {
-   name = "xdo-${version}";
+   pname = "xdo";
    version = "0.5.7";
 
    src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index d8959687945a12980d78c3810396e66f4a642604..f3f80143c57a88c4e8b98ace05b3d47fc12dd095 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -3,7 +3,7 @@
 , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook
 }:
 pythonPackages.buildPythonApplication rec {
-  name = "xflux-gui-${version}";
+  pname = "xflux-gui";
   version = "1.1.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index f51746e312e591dc02b89744ae0bd3d912690532..43a674069706ee9597953aa9881e8187537e8065 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }:
 
 stdenv.mkDerivation rec {
-  name = "xiccd-${version}";
+  pname = "xiccd";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix
index 7a092e59562156f62d0b724e89a100bf1fd7bffa..ad5086f2f5958d6e48987fd3adbcb10d75adf98b 100644
--- a/pkgs/tools/misc/xmonad-log/default.nix
+++ b/pkgs/tools/misc/xmonad-log/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "xmonad-log-${version}";
+  pname = "xmonad-log";
   version = "0.1.0";
 
   goPackagePath = "github.com/xintron/xmonad-log";
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 0ec7d58598f86c50192632fd82e8dde08504ef67..cd4d709fb7690091b24188583b78d78d4c9cabfd 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "xsel-unstable-${version}";
+  pname = "xsel-unstable";
 
   version = "2018-01-10";
 
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 303722aac0b876e2c8889eb477e604e33aa842c4..d369bb4fed780d1d88c16a5dc1704d94a90378d3 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "yle-dl-${version}";
+  pname = "yle-dl";
   version = "2.31";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 8308d5eebcd046dbf74510e5690178671c8e4d95..c20fe68b7b22e609f14cb25799586cb6e4e4fa35 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }:
 
 stdenv.mkDerivation rec {
-  name = "yubikey-personalization-${version}";
+  pname = "yubikey-personalization";
   version = "1.20.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index a8b621e32ac4bc54ffcf4b6c8e5c1156184cd126..d21573885123d150864b5d1c61d7388929ea1e08 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -3,7 +3,7 @@ let
   pythonPackages = python2Packages;
 
 in pythonPackages.buildPythonApplication rec {
-  name = "zabbix-cli-${version}";
+  pname = "zabbix-cli";
   version = "2.1.1";
 
   propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix
index 61945266e13b60ffa4a5cdecde843ffcb9b0921b..657d93a3ca0e9e6ac4e7588f904d0eede2472788 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "zsh-autoenv-${version}";
+  pname = "zsh-autoenv";
   version = "2017-12-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix
index 108071edb64cd47b44fe0b5d8e6d588f6369feb7..be64ff47e6be6223ea28451346f34095048071c8 100644
--- a/pkgs/tools/misc/zsh-navigation-tools/default.nix
+++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "zsh-navigation-tools-${version}";
+  pname = "zsh-navigation-tools";
   version = "2.2.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix
index 1e10529082f5cdedde2b44cdd338221b0cec5e57..60b3b6df69aa6ac79b448e8125c8d33c098511b1 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/pkgs/tools/networking/acme-client/default.nix
@@ -11,7 +11,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "acme-client-${version}";
+  pname = "acme-client";
   version = "0.1.16";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix
index dccab1796fbc9d454e13bd64f8dc3488870d14a8..08db7b4f58d832469b4fa948436da7ea24bf1948 100644
--- a/pkgs/tools/networking/argus-clients/default.nix
+++ b/pkgs/tools/networking/argus-clients/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
   pname = "argus-clients";
   version = "3.0.8.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://qosient.com/argus/src/${name}.tar.gz";
+    url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
     sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj";
   };
 
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix
index 8b9d1e3b704c8a9ff1000c2d2d657ddd01e43d70..72c0a78a447bc0a6c3aa33e2763ca3b630afb94f 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/pkgs/tools/networking/argus/default.nix
@@ -4,10 +4,9 @@
 stdenv.mkDerivation rec {
   pname = "argus";
   version = "3.0.8.2";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://qosient.com/argus/src/${name}.tar.gz";
+    url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
     sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna";
   };
 
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 8d9ec928811455aa42ecc1ab45a50852e12ea63e..e086105e19e91e5a4d32afe5de145a5a1cdc54b2 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-${version}";
+  pname = "aria2";
   version = "1.34.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 7904ffb0d04e4620c41e3b44d4064025c4862d05..bfb1abaeaf234df6d23f98834f23110874564921 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
 
 buildGoPackage rec {
-  name = "assh-${version}";
+  pname = "assh";
   version = "2.7.0";
 
   goPackagePath = "github.com/moul/advanced-ssh-config";
diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
index de8bcc8e7ff6de286408f31733f1ee7e374679c8..4d069a7e6d7d7efd880082c430b461816110e733 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
-  name = "ASynK-${version}";
+  pname = "ASynK";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
     url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
     sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1";
   };
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index e6d5abc17618fddec3ea35f7db77062504d7c89b..7fcd677044feea537aa4a983b95c6f81dc6578c8 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:
 
 stdenv.mkDerivation rec {
-  name = "atftp-${version}";
+  pname = "atftp";
   version = "0.7.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/atftp/${name}.tar.gz";
+    url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
     sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s";
   };
 
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 93a98a10daad02301c9bcd3c3aa1dbd10e35607c..7cd7254518adb71fbf316a79b60e1fa7b15b9d80 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "biosdevname-${version}";
+  pname = "biosdevname";
   version = "0.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 386642614bc969a03c8ac199538163c4195ce6f0..2c5e1a2f8f4a2c9ecf25e46a0c228e793ebb1e2d 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, python, gyp, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "bud-${version}";
+  pname = "bud";
 
   version = "0.34.1";
 
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index 81dd294d786add0e6eb226c2cd64dfafa4e8ef21..46bac3d5b5b2860efff0f852471965291c3d824d 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "bully-${version}";
+  pname = "bully";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 993e9ad74692c25a7760795d2263e9191a71a82d..12885982d26d25db0da1a56f1db623be75a8339b 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -12,7 +12,8 @@ let
     exec ${jre}/bin/java -jar ${jar} "$@"
   '';
 in stdenv.mkDerivation {
-  name = "burpsuite-${version}";
+  pname = "burpsuite";
+  inherit version;
   buildCommand = ''
     mkdir -p $out/bin
     echo "${launcher}" > $out/bin/burpsuite
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index a06b409ca49ba983a0cea3403c22b05cc0cd843e..4637a39e6e903ddf74381eeb549090d091d2446a 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -4,10 +4,11 @@ let
   version = "0.6.1";
 in
 stdenv.mkDerivation rec {
-  name = "bwm-ng-${version}";
+  pname = "bwm-ng";
+  inherit version;
 
   src = fetchurl {
-    url = "https://www.gropp.org/bwm-ng/${name}.tar.gz";
+    url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz";
     sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02";
   };
 
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 6fac4a282d014b9895c1323a87ff4e735da2648b..2c78b20138aa69de5bbafa31d3e19ede4216aa96 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "6.1.8";
   seafileVersion = "6.1.8";
-  name = "ccnet-${version}";
+  pname = "ccnet";
 
   src = fetchurl {
     url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 127244a29927ec2531bc3ca5b4509d44147e04ca..bbc0cac0551681c0f3486c0fc795b895fbb73b9f 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -4,12 +4,12 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "chrony-${version}";
+  pname = "chrony";
 
   version = "3.5";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/chrony/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
     sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf";
   };
 
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index ee561840da8602282994a585cc16fa2da88bff67..dcda354e4b42552ceeb6fec39630698473812711 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -7,7 +7,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
-    rev = "cmst-${version}";
+    rev = "${pname}-${version}";
     sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh";
   };
 
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
index 6267e3a7790d872428a76bba13bbd461a3f9cbde..9b8a1f0e7904e4e53b72fa8d2a4cb055fda177be 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which}:
 
 stdenv.mkDerivation rec {
-  name = "cntlm-${version}";
+  pname = "cntlm";
   version = "0.92.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cntlm/${name}.tar.gz";
+    url = "mirror://sourceforge/cntlm/${pname}-${version}.tar.gz";
     sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw";
   };
 
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index 3d63340adb0b995fcac61a1b5c150c732d12ae97..17923081dfdfcf862910bd0a2d80bdd1fb4f4253 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "connect-${version}";
+  pname = "connect";
   version ="1.105";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix
index d5688354a76d6eaf6fe8acb9c60f40f482e75e40..a3c774a62b11fa0db8f23844135dd9846079e2cf 100644
--- a/pkgs/tools/networking/connman/connman-gtk/default.nix
+++ b/pkgs/tools/networking/connman/connman-gtk/default.nix
@@ -2,7 +2,7 @@
 gtk3, connman, openconnect, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "connman-gtk-${version}";
+  pname = "connman-gtk";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix
index 8c4d4fa848655c4f9db57d69837ffdca26fffa90..dd636173cb714a1ecbd64aee1517f3c3c9a5c5f5 100644
--- a/pkgs/tools/networking/connman/connman-ncurses/default.nix
+++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }:
 
 stdenv.mkDerivation rec {
-  name = "connman-ncurses-${version}";
+  pname = "connman-ncurses";
   version = "2015-07-21";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix
index 42b0c37411c80647cfcc042305878d4c6b8f7392..3b30935d6cf1c3f0cff0c06cd6c8b626efd4963d 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman/connman-notify/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "connman-notify-${version}";
+  pname = "connman-notify";
   version = "2014-06-23";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix
index c39c82df634cd236639129878e34e92af11605e3..0d91dabaaebbc1b10aaf6771ed7e231a949a9274 100644
--- a/pkgs/tools/networking/connman/connman_dmenu/default.nix
+++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, connman, dmenu }:
 
 stdenv.mkDerivation rec {
-  name = "connman_dmenu-${version}";
+  pname = "connman_dmenu";
   version = "git-29-9-2015";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix
index 7c42cc965a005dfcc11cd828865df85110f3068c..17e8551fdda0de9d850cc5d259f4086e7aacdcae 100644
--- a/pkgs/tools/networking/connman/connmanui/default.nix
+++ b/pkgs/tools/networking/connman/connmanui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }:
 
 stdenv.mkDerivation rec {
-  name = "connmanui-${version}";
+  pname = "connmanui";
   rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516";
   version = "22062015-${rev}";
 
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index a4e8c17a545eadbcbadfbc053def2394985f20f2..56b0347e17f3d0c28ac83f32d9af7c513b65a717 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -3,10 +3,10 @@
   wpa_supplicant, readline6, pptp, ppp }:
 
 stdenv.mkDerivation rec {
-  name = "connman-${version}";
+  pname = "connman";
   version = "1.37";
   src = fetchurl {
-    url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
+    url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
     sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc";
   };
 
diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix
index 4ec23862522e77a045baa5a0422b3ed27f416757..6509c9c310604fd9fa5030838876a13b45b34d3d 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/pkgs/tools/networking/darkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.0.719";
-  name = "darkstat-${version}";
+  pname = "darkstat";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.bz2";
+    url = "${meta.homepage}/${pname}-${version}.tar.bz2";
     sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf";
   };
 
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 4b16eb406e326275d99b495fd1ca10e186b161d4..ff4d0d64c20fce9aca87e0175514a06f196bba0c 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
-  name = "davix-${version}";
+  pname = "davix";
   nativeBuildInputs = [ cmake pkgconfig python3 ];
   buildInputs = [ openssl libxml2 boost libuuid ];
 
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index 02bdb3e2a460e9c9536449de49c62a3fedaf4be0..98902e9809b98013bca82253d92b350fd1e199af 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -40,7 +40,7 @@ let
 
 in stdenv.mkDerivation rec {
   version = "5.11.2";
-  name = "dd-agent-${version}";
+  pname = "dd-agent";
 
   src = fetchFromGitHub {
     owner  = "datadog";
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d2ae24c8a7101a28e6af4c50cf99d0339d389ddf..32fbed7eb9f75766d0dabb7f8230fa3431195b85 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -6,7 +6,7 @@ let
   python = pythonPackages.python;
 
 in buildGoPackage rec {
-  name = "datadog-agent-${version}";
+  pname = "datadog-agent";
   version = "6.11.2";
   owner   = "DataDog";
   repo    = "datadog-agent";
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index 25ce4bcd68eb62dd0c252ec20dfd2aa90640c8b1..340bf4d863cacd0853b9e40edb9a74bb6cf79f84 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage  }:
 
 buildGoPackage rec {
-  name = "datadog-process-agent-${version}";
+  pname = "datadog-process-agent";
   version = "6.11.1";
   owner   = "DataDog";
   repo    = "datadog-process-agent";
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 6987bc553a58fbc3edd9b5d2fc839bcb72df3565..24e23e6e0d33d10d688f7f2b8571a5aeb7f4bab6 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dhcp-${version}";
+  pname = "dhcp";
   version = "4.4.1";
 
   src = fetchurl {
-    url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
     sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia";
   };
 
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 6d14789e7f422e2ddcbf9f8b30859c85e3ce2084..f0ae7e014beb022006e192220f2163b995b8818b 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -3,11 +3,12 @@
 stdenv.mkDerivation rec {
   # when updating this to >=7, check, see previous reverts:
   # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
-  name = "dhcpcd-7.2.3";
+  pname = "dhcpcd";
+  version = "8.0.2";
 
   src = fetchurl {
-    url = "mirror://roy/dhcpcd/${name}.tar.xz";
-    sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl";
+    url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -27,14 +28,14 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ];
 
-  makeFlags = "PREFIX=\${out}";
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   # Hack to make installation succeed.  dhcpcd will still use /var/db
   # at runtime.
-  installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
+  installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ];
 
   # Check that the udev plugin got built.
-  postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
+  postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
 
   meta = with stdenv.lib; {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
index d557c0ab9adb50beaddf9a4d487abf8a15585be6..a6cb05b3865bc0bc6e48c3cb77cffe577d43f8f4 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dhcping-${version}";
+  pname = "dhcping";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix
index fd306a0bcca395f4c77226d69dbfc8e8fc6f4240..43c9455712db0cdfacb9094c5d185b976970d6e3 100644
--- a/pkgs/tools/networking/dibbler/default.nix
+++ b/pkgs/tools/networking/dibbler/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dibbler-${version}";
+  pname = "dibbler";
   version = "1.0.1";
 
   src = fetchurl {
-    url = "http://www.klub.com.pl/dhcpv6/dibbler/${name}.tar.gz";
+    url = "http://www.klub.com.pl/dhcpv6/dibbler/${pname}-${version}.tar.gz";
     sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7";
   };
 
diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix
index d4837d28c825398a862853ead25e19a5a244941e..fe845f3cae87fc897665ddc6370fde9e1484fef6 100644
--- a/pkgs/tools/networking/dirb/default.nix
+++ b/pkgs/tools/networking/dirb/default.nix
@@ -4,7 +4,7 @@ let
   major = "2";
   minor = "22";
 in stdenv.mkDerivation rec {
-  name = "dirb-${version}";
+  pname = "dirb";
   version = "${major}.${minor}";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix
index b8a7133e7bc72b2ac5efb09a3b9424867ecc9e61..974f8a1f346a3ad37b197d7ccd186ce48e8fc978 100644
--- a/pkgs/tools/networking/djbdns/default.nix
+++ b/pkgs/tools/networking/djbdns/default.nix
@@ -11,7 +11,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "djbdns-${version}";
+  pname = "djbdns";
+  inherit version;
 
   src = fetchurl {
     url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz";
diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
index c0b2c795a40bd5e85b0dc6875d3e3edcd84bb6f3..fc4e40929c939f855c562b6b66dc7d18eb023fb5 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "dnscrypt-proxy-${version}";
+  pname = "dnscrypt-proxy";
   version = "1.9.5";
 
   src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}-${version}.orig.tar.gz";
     sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8";
   };
 
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index a43900ea4a52c3293d618c76d03888aa9e06232b..94d52b953d49117580d78c1394f0e8628093bbe0 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "dnscrypt-wrapper-${version}";
+  pname = "dnscrypt-wrapper";
   version = "0.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index ed46b49d8c7efd63ff8eb98a997a695bc9587844..63e19e924fcac509b3a7cd6c0d45da605f2c7680 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dnsperf-${version}";
+  pname = "dnsperf";
   version = "2.3.1";
 
   # The same as the initial commit of the new GitHub repo (only readme changed).
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index fd932617c936c91abd6094aecf87829a7125d7e1..566579555d339857d6263ac2940d2519e1b30adf 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -5,7 +5,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "driftnet-${version}";
+  pname = "driftnet";
   version = "1.1.5";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index d7ff19612eb124d4e3a8901ca9ad78d0d329fba2..b5d4d5e6dcbea85a297e968e3a26c10dd3dcbf1a 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -3,7 +3,8 @@
 let
   version = "3.0.0";
 in stdenv.mkDerivation rec {
-  name = "easyrsa-${version}";
+  pname = "easyrsa";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 12d9da87b39b3850ef2054cf67b0a159cd4fd000..f5dfff62a9658fb7e22d71cad4301c37322be606 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "eggdrop-${version}";
+  pname = "eggdrop";
   version = "1.6.21-nix1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix
index 83af542b8ad43370b1a0ce5c58fa5f6a1552b72a..2800139f8fac1841e2ee3ca16707658f75b149ce 100644
--- a/pkgs/tools/networking/envoy/default.nix
+++ b/pkgs/tools/networking/envoy/default.nix
@@ -215,7 +215,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "envoy-${version}";
+  pname = "envoy";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 607b11aaffb9839e980cb6ebc18b757b1c11542c..ffd7d25a0dceac84b35b275343d41975afa13079 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }:
 
 stdenv.mkDerivation rec {
-  name = "eternal-terminal-${version}";
+  pname = "eternal-terminal";
   version = "5.1.10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix
index 9737108e6acf58f6291df9ff88c3b375fd56dc81..d5190331d33fa5f783791d96ec08afa5b3a2a0a1 100644
--- a/pkgs/tools/networking/fakeroute/default.nix
+++ b/pkgs/tools/networking/fakeroute/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fakeroute-${version}";
+  pname = "fakeroute";
   version = "0.3";
 
   src = fetchurl {
-    url = "https://moxie.org/software/fakeroute/${name}.tar.gz";
+    url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz";
     sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f";
   };
 
diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix
index ef356935c56aae421255123ffc845a96142aa0ff..43efe2090f2ca5e2c406ae40a608e78b9ea82c45 100644
--- a/pkgs/tools/networking/fastd/default.nix
+++ b/pkgs/tools/networking/fastd/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "18";
-  name = "fastd-${version}";
+  pname = "fastd";
 
   src = fetchgit {
     url = "git://git.universe-factory.net/fastd";
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix
index a0b298f3f4ecbf716dc84e2d87bab87c5fa501a2..2cf111e8ccfc218c057d18ddeb6131304ccfc5be 100644
--- a/pkgs/tools/networking/ferm/default.nix
+++ b/pkgs/tools/networking/ferm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.1";
-  name = "ferm-${version}";
+  pname = "ferm";
 
   src = fetchurl {
     url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz";
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 259225e0b7c82aa39c5f26c45234dc9c32e458da..f16fcc7048c8a054c6a92c77a391a13289e78f19 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "flannel-${version}";
+  pname = "flannel";
   version = "0.11.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix
index 3f89323de36ba4299b6993726f5ed7d59f45045a..4ac979cc4a6ccdde766d4fcf812258d6608859d4 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/pkgs/tools/networking/freebind/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }:
 
 stdenv.mkDerivation rec {
-  name = "freebind-${version}";
+  pname = "freebind";
   version = "2017-12-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
index 6fdcfaa70db0ce7e9b18916febe7a71556a842d4..354288b3ce60f27c77f4261beef331623bb135b8 100644
--- a/pkgs/tools/networking/gmrender-resurrect/default.nix
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -4,7 +4,8 @@
 let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in
 
 stdenv.mkDerivation {
-  name = "gmrender-resurrect-${version}";
+  pname = "gmrender-resurrect";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "hzeller";
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index e94c3e4330fb64afa1c3ad45bf67285235a7d2e6..aab5b77351c967530ebf30dcccf488fe4c368262 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.9.1";
-  name = "gmvault-${version}";
+  pname = "gmvault";
 
   src = fetchurl {
     url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz";
-    name = "${name}.tar.bz";
+    name = "${pname}-${version}.tar.bz";
     sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji";
   };
 
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index db63b16415b2dd7e2fa438c3dacc19cdc721ccbd..8261ba6e28423373e01c7054a745e168886a48fc 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -2,7 +2,8 @@
 let
 version = "2.3";
 apk = stdenv.mkDerivation {
-  name = "gnirehtet.apk-${version}";
+  pname = "gnirehtet.apk";
+  inherit version;
   src = fetchzip {
     url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
     sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz";
diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix
index 88a6b74686c26948d987ab35e6499e049088030f..c260b47a63322b84fcf67814be0b867b306fb964 100644
--- a/pkgs/tools/networking/goklp/default.nix
+++ b/pkgs/tools/networking/goklp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "goklp-${version}";
+  pname = "goklp";
   version = "1.6";
 
   goPackagePath = "github.com/AppliedTrust/goklp";
diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix
index 10100b933d4d214879975a9cdfef0258b334c79b..12f285c2a60a992f030519d2a3ee019a05e8aa01 100644
--- a/pkgs/tools/networking/grpcurl/default.nix
+++ b/pkgs/tools/networking/grpcurl/default.nix
@@ -3,7 +3,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "grpcurl-${version}";
+  pname = "grpcurl";
   version = "1.0.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index bcc68a2a19f7d879f81cbd4561fced20c4c3c96d..ba59870a6b863a98dd62316a46ab7d0d277939f3 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "gvpe-${version}";
+  pname = "gvpe";
   version = "3.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 6fd4ab36163002fb5f0980d54f2968aaec07b705..ccc598b0692fc787a98435ba6561e6fb92b0f2b6 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "hans-${version}";
+  pname = "hans";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 62ac791252d8e7172df32fd4ae7d5bf7fb1a474f..d8711d516dc51165e3bbe3e41ec1d7f58a02f8f5 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -10,10 +10,9 @@ assert usePcre -> pcre != null;
 stdenv.mkDerivation rec {
   pname = "haproxy";
   version = "1.9.8";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
+    url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
     sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id";
   };
 
diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
index ba76c37a4bba38e0b34c040f6a0691e72029d993..96fb342e27fc3e86ffd9f008a7db8a61f48642d5 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/pkgs/tools/networking/horst/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }:
 
 stdenv.mkDerivation rec {
-  name = "horst-${version}";
+  pname = "horst";
   version = "5.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix
index 3fdebbf49662e960b26bd3a4546285c2d4f2a72c..6e00a6e9afa85c3d4e498ae44273a73ee90b1ffe 100644
--- a/pkgs/tools/networking/hping/default.nix
+++ b/pkgs/tools/networking/hping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpcap, tcl }:
 
 stdenv.mkDerivation rec {
-  name = "hping-${version}";
+  pname = "hping";
   version = "20051105";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index a4c6e517a75322b3c47666258eae42622d3f6105..4a350d237d0fc946db560eb0db764131baf2bbce 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
-  name = "htpdate-${version}";
+  pname = "htpdate";
 
   src = fetchurl {
-    url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz";
+    url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz";
     sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q";
   };
 
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index cfd4658f63f8d41b2c01f42e6bc12eb4e72cd812..bcaca9ef0ce5b61c181bb24d1fd72377b98f5bb1 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -3,7 +3,6 @@
 pythonPackages.buildPythonApplication rec {
   pname = "http-prompt";
   version = "1.0.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
index fa8bbb91c5bedf5fd39538e5738f566c27a5075d..271be9c2352fe23f4ed7ef1c84a1415389aa9f5b 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "httperf";
-  name = "${pname}-${version}";
   version = "0.9.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 1a6aeb57ab877f99fdc2666d4a1749ff5723a2d1..e269a38f8218f439a76c368699c4fd344f3d07a9 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -2,11 +2,11 @@
 , fftw ? null }:
 
 stdenv.mkDerivation rec {
-  name = "httping-${version}";
+  pname = "httping";
   version = "2.5";
 
   src = fetchurl {
-    url = "https://vanheusden.com/httping/${name}.tgz";
+    url = "https://vanheusden.com/httping/${pname}-${version}.tgz";
     sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
   };
 
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
index 8ec0ce2847ddb27d761a2ac8725bde8628817109..a7b157d3ebc24bfab26fcfe6f7c5fd9c951b4a34 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "httplab-${version}";
+  pname = "httplab";
   version = "0.3.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index 5a29657bd5b151fb0f23f695371871207393fe38..1649ebfb3cef731bd7036209440e92d0eb4207b4 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
-    name = "${pname}-${version}";
     pname = "httpstat";
     version = "1.2.1";
     src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix
index c47dd03cb9d0983fa242e405f525e8285cddcad8..df62f90ad0bb2258d734e77a59f646b9dc1c1f40 100644
--- a/pkgs/tools/networking/httptunnel/default.nix
+++ b/pkgs/tools/networking/httptunnel/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.3";
-  name    = "httptunnel-${version}";
+  pname = "httptunnel";
 
   src = fetchurl {
-    url    = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz";
+    url    = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz";
     sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql";
   };
 
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 7d709df75b6096997d1e33c04ee3f400ca181783..0b0860126b501273afcef24b71554cc0d92ad0ce 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,7 +1,7 @@
 { stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 let wrapper = stdenv.mkDerivation rec {
-  name = "wrapper-${version}";
+  pname = "wrapper";
   version = "3.5.35";
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 050f1c9cd4a53f16c12c4cfc4ec512b96b635b4f..97dbb1bdb8ff025931698857abad3ad2e9f78243 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -8,8 +8,6 @@
 assert upnpSupport -> miniupnpc != null;
 
 stdenv.mkDerivation rec {
-
-  name = pname + "-" + version;
   pname = "i2pd";
   version = "2.26.0";
 
diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix
index 8b7f4e1c2a04321d673c266cfbe39163335fed7e..756e77f1157e8e224299ac2493d07189cda62e2c 100644
--- a/pkgs/tools/networking/ifstat-legacy/default.nix
+++ b/pkgs/tools/networking/ifstat-legacy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, net_snmp }:
 
 stdenv.mkDerivation rec {
-  name = "ifstat-legacy-${version}";
+  pname = "ifstat-legacy";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 47352d21c4a2c2491dcb2d02158b984ef3226996..20169121cd9a1557cf44dee880ce7375fc238819 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -2,7 +2,7 @@
 , gnutls, libite, libconfuse }:
 
 stdenv.mkDerivation rec {
-  name = "inadyn-${version}";
+  pname = "inadyn";
   version = "2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix
index c37b409cdfb594cc16f5ca7e5d008ac67c292fe7..b49b34d6dc7aa9d52f0ebc2e1a548766fc881e22 100644
--- a/pkgs/tools/networking/iouyap/default.nix
+++ b/pkgs/tools/networking/iouyap/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "iouyap";
   version = "0.97";
 
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
index 3c2e7f53beeb383877b98feb7a99e3be4adb15ad..c3304c385e7bcda66dd7213eb3e54efbc334766d 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ip2location-${version}";
+  pname = "ip2location";
   version = "7.0.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index 549461fe5d0b1646f4e46e7d7ea4aab721730b24..ab09399cd8e317642c3d90e1a18d686c7e3d95c5 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ip2unix-${version}";
+  pname = "ip2unix";
   version = "2.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix
index 26c8d89b5d48e0627465bf09f6a80cf44e77c5c4..2727175f0412f8acece2c67d30066dc496f9ef3b 100644
--- a/pkgs/tools/networking/ipcalc/default.nix
+++ b/pkgs/tools/networking/ipcalc/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, perl}:
 stdenv.mkDerivation rec {
-  name = "ipcalc-${version}";
+  pname = "ipcalc";
   version = "0.41";
   src = fetchurl {
-    url = "http://jodies.de/ipcalc-archive/${name}.tar.gz";
+    url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz";
     sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
   };
   buildInputs = [perl];
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 9b4edd7630571e6aafd5d864a7619d5693f5ba39..169fea6c4474ca3ec6dac655cff7398d2d4314cf 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -2,11 +2,11 @@
 , geoip ? null, geolite-legacy ? null }:
 
 stdenv.mkDerivation rec {
-  name = "ipv6calc-${version}";
+  pname = "ipv6calc";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
+    url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz";
     sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq";
   };
 
diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix
index 7877200116d1abd4c13ab04e4e135853fd2844e3..931cfa3a74d978fde28a565573873a63f0084277 100644
--- a/pkgs/tools/networking/kail/default.nix
+++ b/pkgs/tools/networking/kail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kail-${version}";
+  pname = "kail";
   version = "0.8.0";
 
   goPackagePath = "github.com/boz/kail";
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 0d1bd462d3b48d630697ec3c5d58478c73a33716..bc35a25cfde8d4b3912dfdd170501ddb3a3a3f79 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -2,12 +2,11 @@
 , boost, python3, postgresql, mysql, gmp, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "kea";
   version = "1.5.0-P1";
 
   src = fetchurl {
-    url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz";
   };
 
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 43d0944a4159a5fb5e3ca77260a4e924c9afe8b7..9ae981e03692dfd402d2d548517948a72ff56f6b 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "keepalived-${version}";
+  pname = "keepalived";
   version = "1.4.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index b4886f58cbb168a40ae6198751f4c606043ff9c2..13bdbe17ff8bed21f58479770ca52c862d51ea13 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-${version}";
+  pname = "lftp";
   version = "4.8.4";
 
   src = fetchurl {
     urls = [
-      "https://lftp.tech/ftp/${name}.tar.xz"
-      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz"
-      "https://lftp.yar.ru/ftp/${name}.tar.xz"
+      "https://lftp.tech/ftp/${pname}-${version}.tar.xz"
+      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
+      "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz"
       ];
     sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f";
   };
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index a8e4f2dc83f50439e65a3119be24e9bd5ab58fbc..b8ba1357f5f82129994bd66d0693ec9ea0c2048d 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lldpd-${version}";
+  pname = "lldpd";
   version = "1.0.4";
 
   src = fetchurl {
-    url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
+    url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
     sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak";
   };
 
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index c5c7e18ba6d2fe8540a8cc21534b7e0b85fcb25f..52b2a9a94dcbd0663019fc544ba6ee264946df96 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -15,11 +15,11 @@ let
   libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
 
 in stdenv.mkDerivation rec {
-  name = "logmein-hamachi-${version}";
+  pname = "logmein-hamachi";
   version = "2.1.0.198";
 
   src = fetchurl {
-    url = "https://www.vpn.net/installers/${name}-${arch}.tgz";
+    url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz";
     inherit sha256;
   };
 
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index a7648fd59c35232b9a393d21e1af3f1b26b57e72..32f6b11d77c536be3495cd364a8dbe22510a7156 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "maxscale-${version}";
+  pname = "maxscale";
   version = "2.1.17";
 
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "MaxScale";
-    rev = "${name}";
+    rev = "${pname}-${version}";
     sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6";
   };
 
diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix
index 38b2aa531e67e8f06147da4075ca7bcd2661bc1a..e902f24ca0e56ece53e77917dbdd59f75ae501d9 100644
--- a/pkgs/tools/networking/mcrcon/default.nix
+++ b/pkgs/tools/networking/mcrcon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "mcrcon-${version}";
+  pname = "mcrcon";
   version = "0.6.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index c995eea7b14d3163832fc7134abf9a562ae1cf08..5a6fb5e51042e5b6a30fea10a6dcab07f7debe8e 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -2,7 +2,7 @@
 , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "megatools-${version}";
+  pname = "megatools";
   version = "1.10.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix
index c3a076076f145252c308bd52632f314b52344a64..075696cfba1be8a7dee8174dd26097eb21c186b5 100644
--- a/pkgs/tools/networking/memtier-benchmark/default.nix
+++ b/pkgs/tools/networking/memtier-benchmark/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "memtier-benchmark-${version}";
+  pname = "memtier-benchmark";
   version = "1.2.17";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 56a101b31573196f59fedd8648b4b5376f797ba0..49cc5710e59928c6b50f82724b550390f78bb834 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -3,7 +3,8 @@
 let version = "1.2.1"; in
 
 stdenv.mkDerivation {
-  name = "minidlna-${version}";
+  pname = "minidlna";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 3a3ca03f18ae812310e8134e3bd05237a4e7d497..ebd6e7c57993780d731a835033ecca8ab978f77a 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "minio-client-${version}";
+  pname = "minio-client";
 
   version = "2019-01-30T19-57-22Z";
 
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index 9809b330faba5c180a6f0add5265329227342db6..1277a17f9bae673e3cb6b20eae56cff9ceba6464 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libnfnetlink }:
 
 stdenv.mkDerivation rec {
-  name = "minissdpd-${version}";
+  pname = "minissdpd";
   version = "1.5.20180223";
 
   src = fetchurl {
     sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv";
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    name = "${name}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
   };
 
   buildInputs = [ libnfnetlink ];
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 84b31bd5d40cc64616fa95162a785d9d9b75fb35..dc0a4457dde464a76c4cb2807b2d43d6c35e7fc4 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -3,10 +3,11 @@
 let
   generic = { version, sha256 }:
     stdenv.mkDerivation rec {
-      name = "miniupnpc-${version}";
+      pname = "miniupnpc";
+      inherit version;
       src = fetchurl {
-        name = "${name}.tar.gz";
-        url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+        name = "${pname}-${version}.tar.gz";
+        url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
         inherit sha256;
       };
 
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix
index babfcf1db2162f395c6ed5f5c692e896c2708c65..26f6c2498e182923c573b35b984a2a55fc931c0a 100644
--- a/pkgs/tools/networking/miredo/default.nix
+++ b/pkgs/tools/networking/miredo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.6";
-  name = "miredo-${version}";
+  pname = "miredo";
 
   buildInputs = [ judy ];
 
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 75462659699c29cc3225121433853546682231b8..bd035e8f03cb635af2451b06efda2c49e81c3668 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -4,7 +4,7 @@
 , withMug ? false }:
 
 stdenv.mkDerivation rec {
-  name = "mu-${version}";
+  pname = "mu";
   version = "1.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix
index a352596eed0570c4d1f3a73757206270a44580bf..a4dcfb4a40f2a4342a8edd3bccec036c15cc13e9 100644
--- a/pkgs/tools/networking/nat-traverse/default.nix
+++ b/pkgs/tools/networking/nat-traverse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "nat-traverse-${version}";
+  pname = "nat-traverse";
   version = "0.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 90ac44aa375aa716be9a151d353c18a5ddc9d448..acd9a0e27f86b89b098cf197fd4c9e500c905a89 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "ncftp-${version}";
+  pname = "ncftp";
   version = "3.2.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
index 255d430a3a5da23be2a697673f5deedc747303e2..77f797fc7c7cc251b9e2dac54b03ad44ab4d4d26 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.06";
-  name = "ndjbdns-${version}";
+  pname = "ndjbdns";
 
   src = fetchFromGitHub {
     owner = "pjps";
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix
index 8f8cf929e9d49b78004afad2846463b835644536..940a37ab86fa113f5a3b1a3fdc083d5685db1046 100644
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ b/pkgs/tools/networking/netalyzr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "netalyzr-${version}";
+  pname = "netalyzr";
   version = "57861";
 
   # unfortunately there is not a version specific download URL
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index eac95a32008c0b9508fe9af4e68c5c521a371b49..a85d4d7ad10836e8fb5d6da82ff6b3811b543b5b 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "nethogs-${version}";
+  pname = "nethogs";
   version = "0.8.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix
index e9704c4babe684a730650aad4ef6034237cc5870..864838bdd3902ceff1214b362bfd126c8b414398 100644
--- a/pkgs/tools/networking/netmask/default.nix
+++ b/pkgs/tools/networking/netmask/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "netmask-${version}";
+  pname = "netmask";
   version = "2.4.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index d10125e09a65c721548efa8d621da383bbe003b1..dfd355237dc0725751493864f39a6d269229c838 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -8,7 +8,7 @@ assert checksumType == "mhash" -> libmhash != null;
 assert checksumType == "openssl" -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "netrw-${version}";
+  pname = "netrw";
   version = "1.3.2";
 
   configureFlags = [
diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix
index 702fee86922e2983f68ed88c0b0dd36f8b9ef599..c40f43c214fc686fa32a06f330319f89bad2d15b 100644
--- a/pkgs/tools/networking/netselect/default.nix
+++ b/pkgs/tools/networking/netselect/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "netselect-${version}";
+  pname = "netselect";
   version = "0.4";
 
   src = fetchFromGitHub {
     owner = "apenwarr";
     repo = "netselect";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1zncyvjzllrjbdvz7c50d1xjyhs9mwqfy92ndpfc5b3mxqslw4kx";
   };
 
diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix
index fdfa446907c1aa7fb4de6673e78b490215ae0755..d95171807dfa210ecb8635914d842684ae1fa91a 100644
--- a/pkgs/tools/networking/nettee/default.nix
+++ b/pkgs/tools/networking/nettee/default.nix
@@ -5,7 +5,8 @@ let
   sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r";
 
 in stdenv.mkDerivation {
-  name = "nettee-${version}";
+  pname = "nettee";
+  inherit version;
 
   src = fetchurl {
     url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz";
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix
index c5613341aab1acd10cb9b076392e6fdf58685353..131ec6751159a92d4ca83dbcea2e78d01b000f16 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/default.nix
+++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix
@@ -3,7 +3,7 @@
 , libgcrypt, perl, libgudev, avahi, ppp, kmod }:
 
 stdenv.mkDerivation rec {
-  name = "network-manager-${version}";
+  pname = "network-manager";
   version = "0.9.8.10";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 95d37e16478895974700985daa2aaf453b130e65..5bc915caea6500826be23dfc1117457437eb7928 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,14 +7,13 @@
 , openconnect, curl, meson, ninja, libpsl }:
 
 let
-  pname = "NetworkManager";
   pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 in stdenv.mkDerivation rec {
-  name = "network-manager-${version}";
+  pname = "network-manager";
   version = "1.18.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
     sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad";
   };
 
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix
index 665db4cc287b2c53ca5e3410a216b889b4e18221..93a169a3fb0f86141e41ac22423e417ee9e8516a 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/pkgs/tools/networking/network-manager/dmenu.nix
@@ -3,7 +3,7 @@
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "networkmanager_dmenu-${version}";
+  pname = "networkmanager_dmenu";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 6b69b97552a8b553455cf359f17cd632b096760f..60c344e8eb4b0d9680a2bf945f9584641cd9b951 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -2,12 +2,11 @@
 , gtk3, gnome3, libsecret }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "NetworkManager-strongswan";
   version = "1.4.5";
 
   src = fetchurl {
-    url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
+    url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2";
     sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl";
   };
 
diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
index 977683f26ccbcb5c964029b7ca9a749963bf851a..0ae309cf94d98fc3ebdbfb2bd7317bd75782b485 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -5,7 +5,8 @@
 let version = "1.6.18"; in
 
 stdenv.mkDerivation {
-  name = "nfdump-${version}";
+  pname = "nfdump";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "phaag";
diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix
index 9cddc5bbd877136891dd6d22f789075333916793..ab8da6236cff6bfae2c8396d5afd7698fb5c06f4 100644
--- a/pkgs/tools/networking/ngrep/default.nix
+++ b/pkgs/tools/networking/ngrep/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "ngrep-${version}";
+  pname = "ngrep";
   version = "1.47";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
index d0aec7889efab2281e16027af31a4178bdaaf77a..463227741fb3db5fea78578ff1fe4b68c5213cdf 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ngrok-${version}";
+  pname = "ngrok";
   version = "1.7.1";
   rev = "${version}";
 
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index b199d850f971b4132a5d15bde7bd6833723d96f2..dc921dc495af8d539ef2a361315d6c644f9c040a 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nss-pam-ldapd-${version}";
+  pname = "nss-pam-ldapd";
   version = "0.9.10";
 
   src = fetchurl {
-    url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
+    url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz";
     sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0";
   };
 
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix
index 2ed9c330181ccd888f0d691f7f18517302e0ecae..f01d5ccada19523d1a8d4ca71b86f644c2d8c4e6 100644
--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/pkgs/tools/networking/nuttcp/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nuttcp-${version}";
+  pname = "nuttcp";
   version = "8.1.4";
 
   src = fetchurl {
     urls = [
-      "http://nuttcp.net/nuttcp/latest/${name}.c"
-      "http://nuttcp.net/nuttcp/${name}/${name}.c"
-      "http://nuttcp.net/nuttcp/beta/${name}.c"
+      "http://nuttcp.net/nuttcp/latest/${pname}-${version}.c"
+      "http://nuttcp.net/nuttcp/${pname}-${version}/${pname}-${version}.c"
+      "http://nuttcp.net/nuttcp/beta/${pname}-${version}.c"
     ];
     sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh";
   };
 
   man = fetchurl {
-    url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8";
+    url = "http://nuttcp.net/nuttcp/${pname}-${version}/nuttcp.8";
     sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx";
   };
 
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index af7c4401daecfea718b1920b3fef5178af7f4d60..b3c77f5b797cbea76ec2cb1679003e69b6e67db9 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -2,7 +2,7 @@
 , gnutls, libgcrypt, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "nzbget-${version}";
+  pname = "nzbget";
   version = "21.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix
index c93e94e2f2879b945269fd9741fe3a508a64d790..729f5b31998075cbe006d1e1acfcef3b08b74542 100644
--- a/pkgs/tools/networking/ocproxy/default.nix
+++ b/pkgs/tools/networking/ocproxy/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.60";
-  name = "ocproxy-${version}";
+  pname = "ocproxy";
 
   src = fetchFromGitHub {
     owner = "cernekee";
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix
index 094bebe628f60b2507c39de629c9c5a7141afbd0..e695c46042298602509338c9439d628264b887fd 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/pkgs/tools/networking/ocserv/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ocserv-${version}";
+  pname = "ocserv";
   version = "0.12.4";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix
index 8fa30a5c2211a56ad7188badc70143acfbd588c3..cff4b7e97137b5dc9a766f9c8548bf2c3f817493 100644
--- a/pkgs/tools/networking/olsrd/default.nix
+++ b/pkgs/tools/networking/olsrd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "olsrd-${version}";
+  pname = "olsrd";
   version = "0.9.6.1";
 
   src = fetchurl {
-    url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2";
+    url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2";
     sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612";
   };
 
diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix
index d261e57170527701480196fa6ed2b7334678d78b..ba8fc6694d17c95c5927c838faa8422745c73004 100644
--- a/pkgs/tools/networking/openconnect_pa/default.nix
+++ b/pkgs/tools/networking/openconnect_pa/default.nix
@@ -4,7 +4,7 @@ assert (openssl != null) == (gnutls == null);
 
 stdenv.mkDerivation rec {
   version = "unstable-2018-10-08";
-  name = "openconnect_pa-${version}";
+  pname = "openconnect_pa";
   
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 019806fcd5729782cea6f8caabff691783ee2326..9ef8c75b7286d0ee210c41ede7bcad7ccf078ca6 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openntpd-${version}";
+  pname = "openntpd";
   version = "6.2p3";
 
   src = fetchurl {
-    url = "mirror://openbsd/OpenNTPD/${name}.tar.gz";
+    url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz";
     sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv";
   };
 
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 302e08617afcb5427fae2c5a1160a84b12733cf3..73cb98060a03cbba2e3c4cafddc693ea9a01f830 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-${version}";
+  pname = "openresolv";
   version = "3.9.1";
 
   src = fetchurl {
-    url = "mirror://roy/openresolv/${name}.tar.xz";
+    url = "mirror://roy/openresolv/${pname}-${version}.tar.xz";
     sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q";
   };
 
diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index d52cc9d8defbba98e617f27a6c951e26e27066bb..592c24b81fd068ac190e9b2d1d1d158f7d1ea423 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }:
 
 stdenv.mkDerivation rec {
-  name = "opensm-${version}";
+  pname = "opensm";
   version = "3.3.22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6ce574b9cdc40e6537e4b974c4573095050a53b7..bb51e3153e133e1971293be105eb7b89d53583ce 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -21,7 +21,7 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-${version}";
+  pname = "openssh";
   version = if hpnSupport then "7.8p1" else "7.9p1";
 
   src = if hpnSupport then
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       }
     else
       fetchurl {
-        url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
+        url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
         sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb";
       };
 
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
         url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
         sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
       })
+
+      ./ssh-keysign.patch
     ]
     ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
 
diff --git a/pkgs/tools/networking/openssh/ssh-keysign.patch b/pkgs/tools/networking/openssh/ssh-keysign.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7258f4a4db15222b17de20e61d2e1917d4dae4d2
--- /dev/null
+++ b/pkgs/tools/networking/openssh/ssh-keysign.patch
@@ -0,0 +1,29 @@
+diff --git a/pathnames.h b/pathnames.h
+index cb44caa4..354fdf05 100644
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -124,7 +124,7 @@
+ 
+ /* Location of ssh-keysign for hostbased authentication */
+ #ifndef _PATH_SSH_KEY_SIGN
+-#define _PATH_SSH_KEY_SIGN		"/usr/libexec/ssh-keysign"
++#define _PATH_SSH_KEY_SIGN		"ssh-keysign"
+ #endif
+ 
+ /* Location of ssh-pkcs11-helper to support keys in tokens */
+diff --git a/sshconnect2.c b/sshconnect2.c
+index dffee90b..e9a86e59 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
+ 		closefrom(sock + 1);
+ 		debug3("%s: [child] pid=%ld, exec %s",
+ 		    __func__, (long)getpid(), _PATH_SSH_KEY_SIGN);
+-		execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
++		execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
+ 		fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN,
+ 		    strerror(errno));
+ 	}
+-- 
+2.22.0
+
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 732687ecfa15f3dcd7ffedee21e40e9fdf929c73..c8aa2c1f5c57f5a9e399fb55b85c2f356a4e0b5a 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -18,11 +18,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "openvpn-${version}";
+  pname = "openvpn";
   version = "2.4.7";
 
   src = fetchurl {
-    url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
+    url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
     sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
   };
 
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 8c043294143eed74084268df345e9b53664a31ed..a5305acdf59750e9675305d67506af90e5e756cf 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -7,7 +7,7 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "1.13.0";
-  name = "tahoe-lafs-${version}";
+  pname = "tahoe-lafs";
   namePrefix = "";
 
   src = fetchurl {
@@ -65,8 +65,8 @@ pythonPackages.buildPythonApplication rec {
       cd docs
 
       make singlehtml
-      mkdir -p "$doc/share/doc/${name}"
-      cp -rv _build/singlehtml/* "$doc/share/doc/${name}"
+      mkdir -p "$doc/share/doc/${pname}-${version}"
+      cp -rv _build/singlehtml/* "$doc/share/doc/${pname}-${version}"
 
       make info
       mkdir -p "$info/share/info"
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix
index d770a51dc8203dd765bce2ccb31cdd2e93c176c6..13aa8fcbd00af16b49d53b56aad4b249ecef2cf3 100644
--- a/pkgs/tools/networking/packetdrill/default.nix
+++ b/pkgs/tools/networking/packetdrill/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, bison, flex }:
 stdenv.mkDerivation rec {
   version = "1.0";
-  name = "packetdrill-${version}";
+  pname = "packetdrill";
   src = fetchFromGitHub {
     owner = "google";
     repo = "packetdrill";
diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix
index fbb17308f90c2c7160187abc2fa00049a7e75824..211256ea72b8ac1f98ec100ffa20e1e20553a1ed 100644
--- a/pkgs/tools/networking/pacparser/default.nix
+++ b/pkgs/tools/networking/pacparser/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pacparser-${version}";
+  pname = "pacparser";
   version = "1.3.7";
 
   src = fetchurl {
-    url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/manugarg/pacparser/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b";
   };
 
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index f2c92d689f35042fa1b3e8b1fb9f973958825541..9bc4c178665dd019b6bf66dae2b905ab18e837af 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name    = "par2cmdline-${version}";
+  pname = "par2cmdline";
   version = "0.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 71d1e6fa6d6eea7777f32d284020b9e1bbf68fde..663e04db46018b0a7f7c56b29f588f4d74a7baa6 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libpcap, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "pcapc-${version}";
+  pname = "pcapc";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 5dff64e27c5cf4d17eab491ed1fa7b9c8903dcd5..c8b4411684689e26e3912fb5ed69462beb35f5b5 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "philter-${version}";
+  pname = "philter";
   version = "1.1";
   src = fetchurl {
-    url = "mirror://sourceforge/philter/${name}.tar.gz";
+    url = "mirror://sourceforge/philter/${pname}-${version}.tar.gz";
     sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
   };
 
diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix
index e585af81991e5e34f5ba70602d437354733adeeb..320e7614c7c3a244d96cc7049c1bf7ba439233c1 100644
--- a/pkgs/tools/networking/phodav/default.nix
+++ b/pkgs/tools/networking/phodav/default.nix
@@ -4,10 +4,11 @@
 let
   version = "2.2";
 in stdenv.mkDerivation rec {
-  name = "phodav-${version}";
+  pname = "phodav";
+  inherit version;
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz";
     sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8";
   };
 
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
index 2d13515d83d79a4de49133be0da657657a0e1a29..d791f6b91d995b3e40746f9160ea14eddeef7238 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "pingtcp-${version}";
+  pname = "pingtcp";
   version = "0.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix
index b082a981ae743ed94cd2adbdd1674bdbddc4e7b4..8bbf589f3b3df5bf0fb03dc5b9fdafdc722de06f 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/pkgs/tools/networking/pixiewps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pixiewps-${version}";
+  pname = "pixiewps";
   version = "1.2.2";
   src = fetchFromGitHub {
     owner = "wiire";
diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
index 2a70218f28796990ab745eb645375643ed1e745d..cf963068d1c575474fbcc98dccdd6f33e83decd5 100644
--- a/pkgs/tools/networking/polysh/default.nix
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -4,10 +4,10 @@ let
   inherit (python2Packages) buildPythonApplication;
 in
 buildPythonApplication rec {
-  name = "polysh-${version}";
+  pname = "polysh";
   version = "0.4";
   src = fetchurl {
-          url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2";
+          url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2";
           sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
         };
 
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 26dc71b7d61992b640d60851af487b94fed6fe90..b072ed21318c4323214aa505ae48023441ac8c43 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.7";
-  name = "ppp-${version}";
+  pname = "ppp";
 
   src = fetchurl {
-    url = "mirror://samba/ppp/${name}.tar.gz";
+    url = "mirror://samba/ppp/${pname}-${version}.tar.gz";
     sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02";
   };
 
diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix
index 4c29cd949ee6cca6a7c38e6e090c0d18fb1b532c..f373f594df80ca0b226110a3f5a62ef105cee411 100644
--- a/pkgs/tools/networking/pptpd/default.nix
+++ b/pkgs/tools/networking/pptpd/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, ppp }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "pptpd";
   version = "1.4.0";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/poptop/${pname}/${name}/${name}.tar.gz";
+    url    = "mirror://sourceforge/poptop/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg";
   };
 
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 56bd46427d86d44283b511e32aab3df90d4f165c..848a99f77718e9d3876662142469976463bef2b9 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
 
-  name = "privoxy-${version}";
+  pname = "privoxy";
   version = "3.0.28";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz";
+    url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
     sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm";
   };
 
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index 36d0150a49b583211d21b03b516ff7760084807f..52ef43838c2651e7853df271586c6c8f17d77952 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub } :
 stdenv.mkDerivation rec {
-  name = "proxychains-${version}";
+  pname = "proxychains";
   version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "haad";
     repo = "proxychains";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc";
   };
 
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index 22c359620507e8235b3037b7b85416eb6e5cbcb3..43e465e05b6ae5fcda381b9e6f1eaf2ed38072d6 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "pssh-${version}";
+  pname = "pssh";
   version = "2.3.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index 15ac5bceea336cc7b6dc3de66cb013c06c5ba904..57cd093e1cd633a854d9ffc12b5b7fb9702ee5eb 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -30,7 +30,7 @@ let
   '');
 
 in buildPythonApplication rec {
-  name = "pykms-${version}";
+  pname = "pykms";
   version = "20180208";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix
index 581405f63c052f836f5c3ed7a671e4fd71cf35dd..b1d972a733b61799c390b24fa10e5ab7147ba692 100644
--- a/pkgs/tools/networking/qr-filetransfer/default.nix
+++ b/pkgs/tools/networking/qr-filetransfer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "qr-filetransfer-unstable-${version}";
+  pname = "qr-filetransfer-unstable";
   version = "2018-10-22";
 
   goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 3d7dc68e35786f1ee871247b77e09921fc4d5695..12e073865166bae1b45f95821772014cf8ae3b5e 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "quicktun-${version}";
+  pname = "quicktun";
   version = "2.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 98466a800a34985435c83769a8a7905ab7ce5437..30e706d667376e82973f537705b5af839f5c468f 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-${version}";
+  pname = "radvd";
   version = "2.18";
 
   src = fetchurl {
-    url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
+    url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz";
     sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1";
   };
 
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix
index 5e18ee80f99de3efe2e257ca4cc97b447a867b9f..cf8c370c522a71eb21a5ec6f199e367ff7feddb1 100644
--- a/pkgs/tools/networking/ratools/default.nix
+++ b/pkgs/tools/networking/ratools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ratools-${version}";
+  pname = "ratools";
   version = "0.6.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix
index ed48feabb85aa25f8272e1d5f611d607a1fa21e8..864a7fb5e613f84e0afb6f95f0c16df2f09c7f0b 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/pkgs/tools/networking/reaver-wps/default.nix
@@ -2,8 +2,8 @@
 
 stdenv.mkDerivation rec {
   version = "1.4";
-  name = "reaver-wps-${version}";
-  confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
+  pname = "reaver-wps";
+  confdir = "/var/db/${pname}-${version}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
 
   src = fetchurl {
     url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz";
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index a11bebe0dca1d40374f448e53d3b32535a1b8717..1a6efb065e2ee630940a62beec3e01615449ccce 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "redir-${version}";
+  pname = "redir";
   version = "3.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index 37f542319dad2ba3f5aa7dbb8d71a4860862e933..ae84d9662aa0bd060d249643bb78ca653f4e32d0 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/pkgs/tools/networking/ripmime/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "ripmime";
   version = "1.4.0.10";
   src = fetchurl {
-    url = "http://www.pldaniels.com/${pname}/${name}.tar.gz";
+    url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
   };
 
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index 3814af60112e09e3c5f7ffbf4cccc6888362ca8f..d53d60333baf62196acddd8997463cf3fac71987 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "s3gof3r-${version}";
+  pname = "s3gof3r";
   version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
   
diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix
index 5cb65b78ee8bea53135f6b922302a0e32793be3b..d8167b8a48fce74c5268ffa6f6688f531169f1c3 100644
--- a/pkgs/tools/networking/samplicator/default.nix
+++ b/pkgs/tools/networking/samplicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "samplicator-${version}";
+  pname = "samplicator";
   version = "1.3.8rc1";
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix
index be2bc6a75a170d7039839a336792a1a27c6b0606..211758f692b7d478ab5e5568e770aa3974f30537 100644
--- a/pkgs/tools/networking/shncpd/default.nix
+++ b/pkgs/tools/networking/shncpd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shncpd-${version}";
+  pname = "shncpd";
   version = "2016-06-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix
index 476e7dc229dfc0d09395ebb67c1fe3ae1f79e05e..f94e177a8585df9e22e5685d1c8c6c4b0c611768 100644
--- a/pkgs/tools/networking/simpleproxy/default.nix
+++ b/pkgs/tools/networking/simpleproxy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "simpleproxy-${version}";
+  pname = "simpleproxy";
   version = "3.5";
   rev = "v.${version}";
 
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix
index 9400ccbb07248ec2795bed9e5a25cd84c8e5177a..dff929e9fa1c76ee2a172255e4efb99aa3ebd26e 100644
--- a/pkgs/tools/networking/sipcalc/default.nix
+++ b/pkgs/tools/networking/sipcalc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sipcalc-${version}";
+  pname = "sipcalc";
   version = "1.1.6";
 
   src = fetchurl {
-    url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz";
+    url = "http://www.routemeister.net/projects/sipcalc/files/${pname}-${version}.tar.gz";
     sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357";
   };
 
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix
index 908e4b05009fcc3260145622b079263290264045..c1a2451328df0a3d050c6407c3bef30a5e760602 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/pkgs/tools/networking/sipsak/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sipsak-${version}";
+  pname = "sipsak";
   version = "4.1.2.1";
 
   buildInputs = [
diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix
index e721479374454aa24046b59185a7d0ef233124e2..722deaff655c98d28e68bf05c76a5df1ec293a1b 100644
--- a/pkgs/tools/networking/skydive/default.nix
+++ b/pkgs/tools/networking/skydive/default.nix
@@ -2,7 +2,7 @@
 , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }:
 
 buildGoPackage rec {
-  name = "skydive-${version}";
+  pname = "skydive";
   version = "0.17.0";
   goPackagePath = "github.com/skydive-project/skydive";
 
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix
index 91b868a017f57dda18f1046da52811e1bfee770d..bdd650494b15fc9255f3f2bfe86e4949a62e9c9b 100644
--- a/pkgs/tools/networking/slack-cli/default.nix
+++ b/pkgs/tools/networking/slack-cli/default.nix
@@ -8,7 +8,7 @@
 { stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "slack-cli-${version}";
+  pname = "slack-cli";
   version = "0.18.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index 0f7c035b4c051dce0dc10e342f4e6719ebf79156..b64cf5cdd9b2785aae73355ea704ecc67cd88303 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "slirp4netns-${version}";
+  pname = "slirp4netns";
   version = "0.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix
index 08b5e6a211b87314651dbadb885d99799c7b1c2e..0c9079240d0c52bb09115614f327e298f2aee87c 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/pkgs/tools/networking/smokeping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fping, rrdtool, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "smokeping-${version}";
+  pname = "smokeping";
   version = "2.6.11";
   src = fetchurl {
     url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz";
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index cdf14f5af33f63c299bbf06351e33cf49567fd5a..ba05ee8e8b5143953d7716238dd30690fae2add5 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "snabb-${version}";
+  pname = "snabb";
   version = "2018.01.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index ad2d88e4a9827f379d16e614d01a3cb2c07a6741..9cc3370c0a1fc31123a802b108bbe90e2086bcfe 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, coreutils }:
 
 stdenv.mkDerivation rec {
-  name    = "spiped-${version}";
+  pname = "spiped";
   version = "1.5.0";
 
   src = fetchurl {
-    url    = "https://www.tarsnap.com/spiped/${name}.tgz";
+    url    = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz";
     sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj";
   };
 
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index faeec8523aa439e57145274032ef8323ef9c4e0c..2b5aa2b7cbf78b0506cd8992237a5c7a4ea093c2 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -7,10 +7,9 @@ in
 stdenv.mkDerivation rec {
   pname = "spoofer";
   version = "1.4.5";
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz";
+    url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz";
     sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z";
   };
 
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix
index 01903171e9c265c0b606fd73f2f376ec35445221..0264da5c81754d5552df185baf7b4b0803904214 100644
--- a/pkgs/tools/networking/ssh-ident/default.nix
+++ b/pkgs/tools/networking/ssh-ident/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, python }:
 
 stdenv.mkDerivation rec {
-  name = "ssh-ident-${version}";
+  pname = "ssh-ident";
   version = "2016-04-21";
   src = fetchFromGitHub  {
     owner = "ccontavalli";
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix
index 94221a359c1d84329e7337b1d09d5dd68ea05514..3765e6aa08f722bf2a0617cadea45ba2e3d6c96e 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/pkgs/tools/networking/sshpass/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "sshpass-${version}";
+  pname = "sshpass";
   version = "1.06";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index adda38c184d98988269ef327f08f984149e778b4..ad8f98302642eed98bc91b1e4754355fa88715c6 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "ssldump-${version}";
+  pname = "ssldump";
   version = "0.9b3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 7bbc872c98e16abd4f04b8b622bcb53d7b747e23..de65298d6481f1ff49a8abef87a47f81f20d7474 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sstp-client-${version}";
+  pname = "sstp-client";
   version = "1.0.12";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 1bd864d859c50ed3edad9e335d9553ad4c2a325b..869e568d36964e3c4e14c48060998fa65d0bc5cb 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -16,11 +16,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "strongswan-${version}";
+  pname = "strongswan";
   version = "5.8.0"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
 
   src = fetchurl {
-    url = "https://download.strongswan.org/${name}.tar.bz2";
+    url = "https://download.strongswan.org/${pname}-${version}.tar.bz2";
     sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m";
   };
 
diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index 89af381d0d6d7f565542c3ff3b4a301e954e4bb0..9b1ee7a9f799345b3eb4737e049534a77599a895 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   pname = "stubby";
-  name = "${pname}-${version}";
   version = "0.2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 7ba4a0d893626b7ef7f83a55fb78170c8292ec39..9960e6f003044697ab32f7304300510feb61a4c7 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
   pname   = "stun";
   version = "0.97";
 
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 66a6c28d92a8b1ce5dddfa8e3109343dbd2ad8a4..792e6f68294d7ce6b016b47d67a9e6f0d2cbc7f2 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name    = "stunnel-${version}";
+  pname = "stunnel";
   version = "5.55";
 
   src = fetchurl {
-    url    = "https://www.stunnel.org/downloads/${name}.tar.gz";
+    url    = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
     sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh";
     # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 2a4cf3506df81eeef5b493ce55026bebd41d2174..b05ab3eeb88be52be98275029b23e2d4e3500cf3 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "subfinder-git-${version}";
+  pname = "subfinder-git";
   version = "2018-07-15";
 
   goPackagePath = "github.com/subfinder/subfinder";
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix
index 4fc456523f7d3d0c4cc5916df532eb762596a7b0..91f155739140a3a3882a4ab9d1f2e3ec6e7bd365 100644
--- a/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/pkgs/tools/networking/swagger-codegen/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   version = "2.3.1";
   pname = "swagger-codegen";
-  name = "${pname}-${version}";
 
   jarfilename = "${pname}-cli-${version}.jar";
 
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index a9b0d04360ef235e55e1cef138af0d2bd629e990..9d776752c8270c1b61b0b3e43870ad03ec9fcafb 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "swaks-${version}";
+  pname = "swaks";
   version = "20181104.0";
 
   src = fetchurl {
-    url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
+    url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz";
     sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2";
   };
 
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index e0a9a7e76ae372a3157e3fdfdbd309bacaeb252a..a04d47b64144b336ea970bf6b28462a4d2f8bcd6 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpcap, perl }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-${version}";
+  pname = "tcpdump";
   version = "4.9.2";
 
   # leaked embargoed security update
diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
index 53af27b4debaab65f4fec2f151b11a25be0c8b1d..032adbff74fb29cde177393c38518844bf593478 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpcap, tcpdump }:
 
 stdenv.mkDerivation rec {
-  name = "tcpreplay-${version}";
+  pname = "tcpreplay";
   version = "4.3.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index bc97d5d8d6e411ca773726ceb96be06d0ea3acf0..edd2abdd13e3309c826613f8f49a9b5c82039d3d 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tftp-hpa-${version}";
+  pname = "tftp-hpa";
   version="5.2";
   src = fetchurl {
-    url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
+    url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz";
     sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
   };
 
diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index a17f382557ac8c353ce95cd84e0f25fb99cb7db8..cf4a2bad78b9cadd32758abee09ce3c9145f8a31 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.35";
-  name = "tinc-${version}";
+  pname = "tinc";
 
   src = fetchurl {
     url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index df9eb9bdad25d479c9db4561b73bb1860de91b88..85cdd19702faac47fcf5f83a67751a09733df64c 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-${version}";
+  pname = "tinc";
   version = "1.1pre17";
 
   src = fetchgit {
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix
index c9a6599708c60dd7cc68f49defce3367180d827c..84ecc44c1833bc2b3d5358bccdc8180473996dd1 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/pkgs/tools/networking/tinyproxy/default.nix
@@ -2,7 +2,7 @@
   libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec{
-  name = "tinyproxy-${version}";
+  pname = "tinyproxy";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix
index c3abdd49e1389e1f756a65ff81795dafd81731fe..4062fc0fd585285f95b61b2b847f18f54fe1e158 100644
--- a/pkgs/tools/networking/tracebox/default.nix
+++ b/pkgs/tools/networking/tracebox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
 
 stdenv.mkDerivation rec {
-  name = "tracebox-${version}";
+  pname = "tracebox";
   version = "0.2";
 
   src = fetchzip {
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index 3d3be5d4532c97ff0069f8bc6b777fd3a131ac51..af8f5cafb89408d30d2115a987d4eaba0a221c1a 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "traceroute-${version}";
+  pname = "traceroute";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/traceroute/${name}.tar.gz";
+    url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz";
     sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6";
   };
 
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index 6170718b61842cdebe8886ea4791361b69643cf7..fe75b35eea2b8bedf7cc1dfe43187b3eac800781 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "twa-${version}";
+  pname = "twa";
   version = "1.8.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 0cb8ad5a4376bbf603f7eccbf047282d44000e29..ddd0bab5d6153c78802def1ab89f1c1ab6445f67 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "ua-unstable-${version}";
+  pname = "ua-unstable";
   version = "2017-02-24";
   rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
 
diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix
index f6afddaba381721ea7f56583a217948b21e7e44c..42839a8ba2f222dc944b0a23bd8c2cd4ba82fc03 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/pkgs/tools/networking/ubridge/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ubridge-${version}";
+  pname = "ubridge";
   version = "0.9.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix
index cc93da7f25332f0e1b976850c071cc1d11251f6f..68f457c2a63823c8c29184d55b029dd69551b437 100644
--- a/pkgs/tools/networking/uget-integrator/default.nix
+++ b/pkgs/tools/networking/uget-integrator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, uget, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "uget-integrator-${version}";
+  pname = "uget-integrator";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index b35c3e8c883e4b2420a690f3f0aea8b5c5ef794e..6b9d0bfa5dd5fbb92fdc1ef8df112d8a7e4912dd 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "uget-${version}";
+  pname = "uget";
   version = "2.2.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/urlget/${name}.tar.gz";
+    url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz";
     sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw";
   };
 
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 5702483b88bbdc737db221e9282cbd560c2979d2..660ffcb823b37e9eecaa82876717187692fd103f 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
 
 stdenv.mkDerivation rec {
-  name = "unbound-${version}";
+  pname = "unbound";
   version = "1.9.2";
 
   src = fetchurl {
-    url = "https://unbound.net/downloads/${name}.tar.gz";
+    url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
     sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg";
   };
 
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index f41aa35df90e9011fc3bbd723013631de5d9bdd4..f6b5852a6752298024e09549ae1ee6460a99bab6 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -4,7 +4,6 @@ let
   inherit (pythonPackages) python;
 in stdenv.mkDerivation rec {
   pname = "pyunbound";
-  name = "${pname}-${version}";
   version = "1.9.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix
index 0c97f20ee65ff40bb22b3e9388f23abfabca6fdb..b1fb6ae8d909345f60b047f4a2f27011a85d69ed 100644
--- a/pkgs/tools/networking/wbox/default.nix
+++ b/pkgs/tools/networking/wbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wbox-${version}";
+  pname = "wbox";
   version = "5";
 
   installPhase = ''
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://www.hping.org/wbox/${name}.tar.gz";
+    url = "http://www.hping.org/wbox/${pname}-${version}.tar.gz";
     sha256 = "06daxwbysppvbh1mwprw8fgsp6mbd3kqj7a978w7ivn8hdgdi28m";
   };
 
diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
index 1e93948be68b6d5363f17a8b8bb07bea80c240a1..5615c249de90cd3090144432ce52645bb259eb6f 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, python, libev, wafHook }:
 stdenv.mkDerivation rec {
-  name = "weighttp-${version}";
+  pname = "weighttp";
   version = "0.4";
 
   src = fetchgit {
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 38a24eddc2884379aaa4ee15dfb16e1642e72914..b7486ded4c8aed26e412c60bc09d3786b4811d5e 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-${version}";
+  pname = "wget";
   version = "1.20.3";
 
   src = fetchurl {
-    url = "mirror://gnu/wget/${name}.tar.lz";
+    url = "mirror://gnu/wget/${pname}-${version}.tar.lz";
     sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39";
   };
 
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index ee72cf4d2d89fdb086329d81f0922ac3979aa32c..b6c03c08cffec7eb3ab601439eee7e5240c952a7 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.5.1";
-  name = "whois-${version}";
+  pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 9f67dd4e2c30290540afc289d5d6f969cf267226..2f95876c2f3065b2dbfafb6f60b1caff0ebefe9c 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -5,11 +5,11 @@
 let
   inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
 in stdenv.mkDerivation rec {
-  name = "wicd-${version}";
+  pname = "wicd";
   version = "1.7.2.4";
   
   src = fetchurl {
-    url = "https://launchpad.net/wicd/1.7/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index a537e4dfb2667cc553c3ee6183bc59716b36aa4c..dfda88cb867826d3fe9584a7c77bf46de6782bbf 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchzip }:
 
 buildGoPackage rec {
-  name = "wireguard-go-${version}";
+  pname = "wireguard-go";
   version = "0.0.20190517";
 
   goPackagePath = "git.zx2c4.com/wireguard-go";
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix
index 05bf8d5dd11c2122d87df9f436cb40e38eb1134f..555c04a00899ddff3fb03e2f6e60f169e9ec852e 100644
--- a/pkgs/tools/networking/wolfebin/default.nix
+++ b/pkgs/tools/networking/wolfebin/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "5.4";
-  name = "wolfebin-${version}";
+  pname = "wolfebin";
   
   src = fetchFromGitHub {
     owner = "thejoshwolfe";
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index 5dd2f3b74fdccdae51c5a5897f93882471a7fba8..9c8f46bef07bae33ff31099f75a8ae1063cea388 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, luajit, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "wrk-${version}";
+  pname = "wrk";
   version = "4.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix
index e2e638ad485b5e00046944b1dcedc3c748f2cb0f..7908143bdab3fb9a84046cdd65225cc7ed7f8b68 100644
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/pkgs/tools/networking/wrk2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, luajit, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "wrk2-${version}";
+  pname = "wrk2";
   version = "4.0.0-${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index b13e5dee18c7cfc125abd6738da89b9065b2398a..e84a97525f12015ae84ef3675bf16b814c273529 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "wuzz-${version}";
+  pname = "wuzz";
   version = "0.2.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
index 7cac5a4557003e06ed2aaae598a886634fe2f0c9..7afd5e07717a1c5aa0b99fd36799a6f2f4cd3011 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/pkgs/tools/networking/zap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, jdk, ant, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "zap-${version}";
+  pname = "zap";
   version = "2.7.0";
   src = fetchFromGitHub {
     owner = "zaproxy";
diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix
index ac64e135c2fe93ecc55eaa69a28d8361834a508a..b2016fe9452cbd19864336f49c77297b0967bfdb 100644
--- a/pkgs/tools/networking/zssh/default.nix
+++ b/pkgs/tools/networking/zssh/default.nix
@@ -3,10 +3,11 @@
 let
   version = "1.5c";
 in stdenv.mkDerivation rec {
-  name = "zssh-${version}";
+  pname = "zssh";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/zssh/${name}.tgz";
+    url = "mirror://sourceforge/zssh/${pname}-${version}.tgz";
     sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52";
   };
 
diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix
index 3742d22c02126aba8f4576a09eca55670489201f..664e55125b54b0523108390414074cb71229f686 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/pkgs/tools/nix/nix-script/default.nix
@@ -1,7 +1,7 @@
 { stdenv, haskellPackages, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nix-script-${version}";
+  pname = "nix-script";
   version = "2015-09-22";
 
   src  = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix
index bcf96a50d36aa1a2b69b68d575e9d412646a0f36..f161591c8f1d585ee87db76777ba76187ececb9f 100644
--- a/pkgs/tools/package-management/apt-dater/default.nix
+++ b/pkgs/tools/package-management/apt-dater/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apt-dater-${version}";
+  pname = "apt-dater";
   version = "1.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index 46da85d97488082d16d2324ed76807cb68b9eac2..cbb4ad4591e9378f93c48f227045a01afdacd13c 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "apt-${version}";
+  pname = "apt";
 
   version = "1.4.6";
 
diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index 0f45084f3c0553e93302d31bba1e82ca9cff0832..938a762ba303aca5ad11216a8e158c36ed3870f1 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  name = "bunny-${version}";
+  pname = "bunny";
   version = "1.3";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
index e45906688ada3f6d6fb7ceb82eee9c72dd72eab2..5354fbb5e5edd2bf57a37f27a58eee8710888c8c 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cde-${version}";
+  pname = "cde";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index 158db426c61502b8449300985f55d8129a1e1008..60c77db44d82699ca4d3afb2b2d44eb3d0521e79 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.8.1";
-  name = "clib-${version}";
+  pname = "clib";
 
   src = fetchFromGitHub {
     rev    = version;
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
index 0a0cae32dcf507fd738832b2a9da66a28e763020..15a64ffd25e60c7007ea8db96b02615ab2824df9 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:
 
 stdenv.mkDerivation rec {
-  name = "createrepo_c-${version}";
+  pname = "createrepo_c";
   version = "0.11.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index f13256d33bfb284ddf0ad2e31bd1f2d08da8ab78..11672e6d456d18863ad4683d8cec5c1040a9d4c1 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "dpkg-${version}";
+  pname = "dpkg";
   version = "1.19.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index 4c03fc35dea484062ae72cb36c3fba8624f914c1..8e8d30e4fccf386a379cf4ea9a171c3d7371c44c 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gx-${version}";
+  pname = "gx";
   version = "0.14.1";
   rev = "refs/tags/v${version}";
 
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index 0ae0b8a198353cc2336669f74c5ff525f250c97d..0a0793130d140b9b2f7fdb648a4a4158445eaf95 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "gx-go-${version}";
+  pname = "gx-go";
   version = "1.9.0";
   rev = "refs/tags/v${version}";
 
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index ffa9f427dc2f50d16ef528365916beff4d78bae2..5049a90c7a7c3e8ae0daa004abfb2ebc6f5c777f 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "home-manager-${version}";
+  pname = "home-manager";
   version = "2019-06-25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index c35550597a34ab1e8591b949d26531dbe4c0f0a2..0c53c1bbbc91de3a480ca07f43e0bf784832a9f8 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.9.2";
-  name = "librepo-${version}";
+  pname = "librepo";
 
   src = fetchFromGitHub {
     owner  = "rpm-software-management";
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index 51a963497fa2b4a4e385205721399cacf14e3f04..9804c0fa18513cd000f11a6c12c783f84f0fa7d6 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, go-bindata, lib }:
 
 buildGoPackage rec {
-  name = "morph-${version}";
+  pname = "morph";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index 41471b2c8a7a058340dc4c637de74dfd4e857c90..3f307d38f0297513717bf007413900e9b8de88b7 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mynewt-newt-${version}";
+  pname = "mynewt-newt";
   version = "1.3.0";
 
   goPackagePath = "mynewt.apache.org/newt";
diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
index 7c02d2d9a638caff140c4c8afdb774fd27d79cc0..cd90e50d70eb09be5821576f85c49ffdb18dc42a 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-bundle";
-  name = "${pname}-${version}";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index efedb8b67da90a12dd1c40c7c7e993b175f95b71..f5dfacf319bcffdaa762df020759537fbaedc6b9 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper
 , runtimeShell }:
 let self = stdenv.mkDerivation rec {
-  name = "nix-pin-${version}";
+  pname = "nix-pin";
   version = "0.4.0";
   src = fetchFromGitHub {
     owner = "timbertson";
diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix
index 96a283a8ea8a121e7c9aed6b0da95e2e1d292d8e..f88820ffad9e41e37b402a9c423ad57efcf35e77 100644
--- a/pkgs/tools/package-management/nix-prefetch/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch/default.nix
@@ -5,7 +5,6 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "nix-prefetch";
   version = "0.1.0";
 
diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
index cd3a8507be14a64f73e9937130237c24e56c0a72..1d2cad2e39e48ab7504c9ea445123dfaa3a852d3 100644
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -15,7 +15,7 @@ let
   additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
 in
 stdenv.mkDerivation rec {
-  name = "nix-top-${version}";
+  pname = "nix-top";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 574f95f82bb0c04ad5c597509128c67919e8d88c..6e7aac706538c09c04d65780cf7232f3d8b84a1e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -129,7 +129,8 @@ common =
         inherit fromGit;
 
         perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
-          name = "nix-perl-${version}";
+          pname = "nix-perl";
+          inherit version;
 
           inherit src;
 
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix
index ce31de9f65d3b9d22a4e49aacb10a19ffa4bb66f..f63fe868e011880ffc94d2a0d31494c12d0658e1 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/pkgs/tools/package-management/nixops/nixops-dns.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nixops-dns-${version}";
+  pname = "nixops-dns";
   version = "1.0";
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 804bbbdf8d71bc0bdb07f3e45c17154526309f95..b495577ef664aab8fdb4e71652bdb2e24724cd32 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -25,7 +25,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "nixui-${version}";
+  pname = "nixui";
   inherit version src;
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index e02c0a2c66ff97dda26491a3220ae68e93981dff..05f43cf29b1b1397853bde8c4b28b721619e4883 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.1";
-  name = "opkg-${version}";
+  pname = "opkg";
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
     sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25";
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 2e9f93177e45d6aeb14e5f17b4c9a6dbae1f3373..a82f44008910a843bdd2ab9f35f3f346fbd69642 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -8,7 +8,7 @@
 , enableSystemd ? stdenv.isLinux, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "packagekit-${version}";
+  pname = "packagekit";
   version = "1.1.12";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index f0f05a4c858e8a8e7269dad2ffeecae55c8c4cdf..987c834f505d1f72be654fee09ddd181bddb9e4a 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -2,7 +2,7 @@
 , qttools, packagekit }:
 
 stdenv.mkDerivation rec {
-  name = "packagekit-qt-${version}";
+  pname = "packagekit-qt";
   version = "1.0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index d756b679bf3d539c08f1ed0ebd718ec81387145a..81e8152769b7fd55bdb59fde88eb37a678c78fa8 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -2,7 +2,7 @@
 zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "pacman-${version}";
+  pname = "pacman";
   version = "5.1.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 55171e6d38f704a7201b4040c3444a4cba63db17..ae0259e65fcd1f1f4cb6168aad6415610aa4da8e 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-${version}";
+  pname = "rpm";
   version = "4.14.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix
index 68b9194015b13b9d03cd5f9b1815e4db5ab48039..c4ba7b67dc71698172a8840d556034d8130b13b6 100644
--- a/pkgs/tools/security/2fa/default.nix
+++ b/pkgs/tools/security/2fa/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "1.1.0";
-  name = "2fa-${version}";
+  pname = "2fa";
 
   goPackagePath = "rsc.io/2fa";
 
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix
index 246a2c5d9917e329d3e337f061231c436edfb99a..5a771917311f321a3b851b3c4cb0236d994f704b 100644
--- a/pkgs/tools/security/acsccid/default.nix
+++ b/pkgs/tools/security/acsccid/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.1.6";
-  name = "acsccid-${version}";
+  pname = "acsccid";
 
   src = fetchFromGitHub {
     owner = "acshk";
diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index c67c758b933de7d127737814012a9d85899285c0..22fb8848eb9172748e20743a18310b1da609b5e1 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "aespipe-${version}";
+  pname = "aespipe";
   version = "2.4e";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 2ee0c478212c0be8394bf1cfbecb6318630f1c0b..05866792af68b2c9af969ad16ff185519bd26e9a 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -8,11 +8,11 @@ let
     else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386"
     else throw "afl: no support for ${stdenv.hostPlatform.system}!";
   afl = stdenv.mkDerivation rec {
-    name    = "afl-${version}";
+    pname = "afl";
     version = "2.52b";
 
     src = fetchurl {
-      url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
+      url    = "http://lcamtuf.coredump.cx/afl/releases/${pname}-${version}.tgz";
       sha256 = "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3";
     };
     enableParallelBuilding = true;
diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix
index c5844702ef38bb0689213a7a8127f28edaa3f648..58b25e6d3ee59cbb46d09c4b03cc8458c7ba8fe1 100644
--- a/pkgs/tools/security/afl/libdislocator.nix
+++ b/pkgs/tools/security/afl/libdislocator.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = (builtins.parseDrvName afl.name).version;
-  name = "libdislocator-${version}";
+  pname = "libdislocator";
 
   src = afl.src;
   sourceRoot = "${afl.name}/libdislocator";
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index 1513ae58a0b62b0dc68ddedb698f4045b596cef1..ea14d89c45c64b3673870694b38b9b3810d03590 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "aide-${version}";
+  pname = "aide";
   version = "0.16.2";
 
   src = fetchurl {
-    url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
     sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p";
   };
 
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index ca2ea67e7881542b200000c73956454df798fd0c..19c9acc0a457752d54006413063a97c90ddb7c67 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -5,7 +5,7 @@
 assert testQR -> zbar != false;
 
 stdenv.mkDerivation rec {
-  name = "asc-key-to-qr-code-gif-${version}";
+  pname = "asc-key-to-qr-code-gif";
   version = "20180613";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index 36b6a5767a1e4d86a03564ad8b30ebc9f053c671..9067e6a4dbf8a3876ccda281d203c69783aa1949 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv }:
 
 buildGoPackage rec {
-  name = "aws-okta-${version}";
+  pname = "aws-okta";
   version = "0.20.1";
 
   goPackagePath = "github.com/segmentio/aws-okta";
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 16811d8f8897f5736c1a0ac4d9f2129a54fbdfeb..2fa50f91111a51d533c60bacc3e31ad51f163618 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "b2sum-${version}";
+  pname = "b2sum";
   version = "unstable-2018-06-11";
 
   src = fetchzip {
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
index 59be6ed0ec26dd30176497a8cb148ce719f79b4d..c6d2cbd53c9db2596675e08b6ed8342b1c297fe5 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "bash-supergenpass-unstable-${version}";
+  pname = "bash-supergenpass-unstable";
   version = "2018-04-18";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 9faedf0c7ef9c9d0d72fdf8dc5154c284ab4c6a0..47851fbfa053792c0422ca8fd6d6e1bb79750de8 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "bmrsa-${version}";
+  pname = "bmrsa";
   version = "11";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix
index 69444d1612e895fd592ebf1a194af935aab5a2ac..0c650781bdaadc9ee6bed90ec0c0772acdb3ab7b 100644
--- a/pkgs/tools/security/bruteforce-luks/default.nix
+++ b/pkgs/tools/security/bruteforce-luks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }:
 
 stdenv.mkDerivation rec {
-  name = "bruteforce-luks-${version}";
+  pname = "bruteforce-luks";
   version = "1.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 654d2dd6a7ac1697e44de6fa223a8e0960c3b670..8d0b3a89a348444f827b29064bf5d824947224fd 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
+  pname = "ccid";
   version = "1.4.31";
-  name = "ccid-${version}";
 
   src = fetchurl {
-    url = "https://ccid.apdu.fr/files/${name}.tar.bz2";
+    url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2";
     sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b";
   };
 
diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix
index a025c69b7381319ace1587195e9e3ece881e1ad0..4f48522e613f96f6ffdbee1d182686dc6f0f311e 100644
--- a/pkgs/tools/security/certmgr/default.nix
+++ b/pkgs/tools/security/certmgr/default.nix
@@ -4,7 +4,7 @@ let
   generic = { patches ? [] }:
     buildGoPackage rec {
       version = "1.6.4";
-      name = "certmgr-${version}";
+      pname = "certmgr";
 
       goPackagePath = "github.com/cloudflare/certmgr/";
 
diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index e0935f0f76066910502b2580407ed54c7fda70d0..fb3c00e48f91c00aef51213240aa8497be8776e6 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "certstrap-${version}";
+  pname = "certstrap";
   version = "1.1.1";
 
   goPackagePath = "github.com/square/certstrap";
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 750539b3ace8dbdca40381aa0ad96816f67ab9ad..8d8497f6cb944933b76f006509910cdbb1c9999b 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
-  name = "cfssl-${version}";
+  pname = "cfssl";
   version = "1.3.2";
 
   goPackagePath = "github.com/cloudflare/cfssl";
diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
index 602c0d60a5f19d1b8b97a71dd388ed72459c2bb6..5a037090801a5cac5f58ee93066397975d73a33a 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "chntpw-${version}";
+  pname = "chntpw";
 
   version = "140201";
 
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 2dc9336bb32973e843342f6fb2860d79e6ce5ec5..5e304f86b4ef5bf7d321491bb8eb78ae847cc9bd 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
 
 stdenv.mkDerivation rec {
-  name = "chrome-token-signing-${version}";
+  pname = "chrome-token-signing";
   version = "1.0.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index a4afa772d10e1ef1120bda28731cc3b2e0e4ccb1..eae5a5256dff11202cfb90da43501d4141eab21c 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "cipherscan-${version}";
+  pname = "cipherscan";
   version = "2016-08-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index b96fc49886a4e87fc44e6ece5ac125816fa16cbd..54932e1200bf3525feac6b037259c5976430b24b 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "clamav-${version}";
+  pname = "clamav";
   version = "0.101.4";
 
   src = fetchurl {
-    url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
+    url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
     sha256 = "1kdw0b49hbvja6xn589v4f0q334wav16pmi1hibql5cxj7q99w0b";
   };
 
diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix
index c5ace5d2e8c480951f4a970e0d01a1f9bed9febb..0fb9ed58997f6296303075985b50e5ade789460c 100644
--- a/pkgs/tools/security/cowpatty/default.nix
+++ b/pkgs/tools/security/cowpatty/default.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "cowpatty-${version}";
+  pname = "cowpatty";
   version = "4.6";
 
   buildInputs = [ openssl libpcap ];
 
   src = fetchurl {
-    url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${name}.tgz";
+    url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz";
     sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd";
   };
 
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 2a88e4462b6d4c2872091af518c3886a65bfa44a..04b7b5695b5511e6f38856a6d7cc0c77ff34f91b 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "crackxls-${version}";
+  pname = "crackxls";
   version = "0.4";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix
index 3e94d52fc5fc61462df08e0fe567365f781f5a28..57943a3140646a7c7e50b9f3c28c563a84fca25f 100644
--- a/pkgs/tools/security/crunch/default.nix
+++ b/pkgs/tools/security/crunch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which }:
 
 stdenv.mkDerivation  rec {
-  name = "crunch-${version}";
+  pname = "crunch";
   version = "3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/crunch-wordlist/${name}.tgz";
+    url = "mirror://sourceforge/crunch-wordlist/${pname}-${version}.tgz";
     sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va";
   };
 
diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
index 1e0618412210f592b93db9055b93dee3f929fb23..104a615542bda77e97ac9e2bcb18893b248373b8 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name = "ctmg-${version}";
+  pname = "ctmg";
   version = "1.2";
 
   src = fetchzip {
diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix
index c5987d37889c8a2f55df71b59363e6c5dcd1f7c5..cee198c1b3be4cb722d97249a42283bbd4f8d59d 100644
--- a/pkgs/tools/security/default.nix
+++ b/pkgs/tools/security/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.0.1";
-  name = "ecdsatool-${version}";
+  pname = "ecdsatool";
 
   src = pkgs.fetchFromGitHub {
     owner = "kaniini";
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix
index 55335927b36ad767d819155e36b180c74e4aab52..ce8b5825647ce13003e0b32fe275f1335aaaa1cb 100644
--- a/pkgs/tools/security/doas/default.nix
+++ b/pkgs/tools/security/doas/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, bison, pam }:
 
 stdenv.mkDerivation rec {
-  name = "doas-${version}";
+  pname = "doas";
 
   version = "6.0";
 
diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 10e2138494e5e0ba0fad69990684525855240a42..49ceacadcb7d52294d60d91e464716039249710d 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pam, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "duo-unix-${version}";
+  pname = "duo-unix";
   version = "1.11.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix
index 48a713287b8bbaee0498ece57c518d91155959bf..00dac6e94294def3343eca6b4b39e0e6a2a4dfa4 100644
--- a/pkgs/tools/security/ecdsautils/default.nix
+++ b/pkgs/tools/security/ecdsautils/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4.0";
-  name = "ecdsautils-${version}";
+  pname = "ecdsautils";
 
   src = pkgs.fetchFromGitHub {
     owner = "freifunk-gluon";
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index d0d01761c2464a855f22139ff6a1935259d673e2..9fd8c3ac7a22da7a2fe4e275c3340d677e7a29ef 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -2,7 +2,7 @@
 , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
 
 stdenv.mkDerivation rec {
-  name = "ecryptfs-${version}";
+  pname = "ecryptfs";
   version = "111";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 40a728f6cb1aad32e6ad909b283c5a44ce3ba9e3..4acef56a2c58c9ddff9b4da7f7d873d965f02a3e 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -5,7 +5,6 @@
 }:
 
 stdenv.mkDerivation rec {
-  name    = pname + "-" + version;
   pname   = "ecryptfs-helper";
   version = "20160722";
 
diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix
index 1d983cb8599aaf9d647c432f7a69f4c8f26eb38b..8a64a019fef02d1e42163ace46da77236d5692db 100644
--- a/pkgs/tools/security/efitools/default.nix
+++ b/pkgs/tools/security/efitools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages,
 help2man, fetchgit }:
 stdenv.mkDerivation rec {
-  name = "efitools-${version}";
+  pname = "efitools";
   version = "1.9.2";
 
   buildInputs = [
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 155c63c87e13fdcb759b7efab3b76714bc88e4e9..13ab56aaa9a23977c24bd63ee4d82211ff34fea7 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,7 +7,7 @@
 , substituteAll }:
 
 stdenv.mkDerivation rec {
-  name = "eid-mw-${version}";
+  pname = "eid-mw";
   version = "4.4.16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix
index 8d4cc6ec3ca66592ae61de8d16d2c4c7e729b090..baada40a6cb1cd792a52714fa1c4aca88179469c 100644
--- a/pkgs/tools/security/enchive/default.nix
+++ b/pkgs/tools/security/enchive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "enchive-${version}";
+  pname = "enchive";
   version = "3.4";
   src = fetchFromGitHub {
     owner = "skeeto";
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
index 6f79be83be550d32cfd8ab3ab8d14090a7611e73..01855ee3e5b4da7b04647099f3a55ec519835959 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/pkgs/tools/security/encryptr/default.nix
@@ -14,7 +14,7 @@ let
     else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
 
 in stdenv.mkDerivation rec {
-  name = "encryptr-${version}";
+  pname = "encryptr";
   version = "2.0.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index c33e433448f59c89d73898561dba71c4bbf004e3..8ba80c4645798981e640d525b216201b0d11f5d8 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -42,7 +42,7 @@ let
   package = stdenv.mkDerivation rec {
 
     inherit (data) version;
-    name = "enpass-${version}";
+    pname = "enpass";
 
     src = fetchurl {
       inherit (data) sha256;
diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix
index d628a28023a42d606bad0e53a06ebfa935fc0ded..28df3a284427dd59331b90e6516b0244885ae935 100644
--- a/pkgs/tools/security/eschalot/default.nix
+++ b/pkgs/tools/security/eschalot/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "eschalot";
   version = "2018-01-19";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "ReclaimYourPrivacy";
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 296080cbd8e74526bc17e67acc8731caa7457ec7..324ac46b0841ec286927de03b8aacaecc534c697 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -3,7 +3,8 @@
 let version = "0.10.4"; in
 
 pythonPackages.buildPythonApplication {
-  name = "fail2ban-${version}";
+  pname = "fail2ban";
+  inherit version;
 
   src = fetchFromGitHub {
     owner  = "fail2ban";
diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix
index 5d2e515c3277b22654b56817a2bba5a138e5d1d6..d923e81ae8261ff8b7c222b4f6c6b30be0e2185c 100644
--- a/pkgs/tools/security/fcrackzip/default.nix
+++ b/pkgs/tools/security/fcrackzip/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "fcrackzip-${version}";
+  pname = "fcrackzip";
   version = "1.0";
   src = fetchurl {
-    url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz";
+    url = "http://oldhome.schmorp.de/marc/data/${pname}-${version}.tar.gz";
     sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a";
   };
 
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
index 66a50e268a53b6e684aa6858c716308ca323027a..b6669358f7f91815bf396b6ef2ba8ed47e174fda 100644
--- a/pkgs/tools/security/fpm2/default.nix
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "fpm2-${version}";
+  pname = "fpm2";
   version = "0.79";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix
index 14a4c985d5023c2c55ee43310814f8979411994e..59d126c5e2c9ed1aee114a3ab71ba00a2bd3462e 100644
--- a/pkgs/tools/security/fprot/default.nix
+++ b/pkgs/tools/security/fprot/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "f-prot-${version}";
+  pname = "f-prot";
   version = "6.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 812c032230c1a77e08347941736b64ed14fa3860..4579136add26bea8b98387efd9af8bde97da9704 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -7,7 +7,6 @@
 , buildClient ? true }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "fwknop";
   version = "2.6.10";
 
diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix
index ca7793281ef99b95b3cb0b5ba9cd24d1b2935ab5..89900d27bd2768db4adbaedd7741e195ac4f8716 100644
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/pkgs/tools/security/gen-oath-safe/default.nix
@@ -1,7 +1,7 @@
 { coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }:
 
 stdenv.mkDerivation rec {
-  name = "gen-oath-safe-${version}";
+  pname = "gen-oath-safe";
   version = "0.11.0";
   src = fetchFromGitHub {
     owner = "mcepl";
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 27bdc51c7688d768304a6d6d5efa43d4e8bd8f07..63d1bab89d7fbb5848614af39720e33994e8f02f 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.8.19";
-  name = "gnome-encfs-manager-${version}";
+  pname = "gnome-encfs-manager";
 
   src = fetchurl {
     url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix
index 2139b7c84afc19c0c519a975bc81a863481d4a6c..940a5b9a05350dfe947618f38408c7cd718557cc 100644
--- a/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl, gnulib }:
 
 stdenv.mkDerivation rec {
-  name = "gnu-pw-mgr-${version}";
+  pname = "gnu-pw-mgr";
   version = "2.4.2";
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
+    url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz";
     sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
   };
 
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 6ae2bbc436ed5208f3a277e90d995f58863a2cf2..6336d319997f2a454dd57aa5768cbad95b66593b 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-${version}";
+  pname = "gnupg";
   version = "2.0.30";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+    url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
     sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
   };
 
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 7a8fb5a324432760e8b6a42c833110d36352d20f..90bd55f55a23171024572b8605da63cbb3d61633 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -14,12 +14,12 @@ with stdenv.lib;
 assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-${version}";
+  pname = "gnupg";
 
   version = "2.2.17";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+    url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
     sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg";
   };
 
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
index 152ff40e7a224d76e60cb0f90afc65c5f9102936..1ba650f5af751d7b3c196ab7d1ea53737ad1ef97 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
 
 stdenv.mkDerivation rec {
-  name = "gorilla-bin-${version}";
+  pname = "gorilla-bin";
   version = "1.5.3.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
index c095b77129ccd74db66c825b8026db771156d422..34e8c7bd6796c5f74b1be33d6f8fc88e4bea7904 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/pkgs/tools/security/gpgstats/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, gpgme }:
 
 stdenv.mkDerivation rec {
-  name = "gpgstats-${version}";
+  pname = "gpgstats";
   version = "0.5";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/gpgstats/${name}.tgz";
+    url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz";
     sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy";
   };
 
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
index 2b1708c9243ce92a9a6fa0f475416caf13a9cfd5..c4b96f04dc27356d23600432b49d9a9e61acc9c0 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/pkgs/tools/security/haka/default.nix
@@ -3,7 +3,8 @@
 let version = "0.3.0"; in
 
 stdenv.mkDerivation rec {
-  name = "haka-${version}";
+  pname = "haka";
+  inherit version;
 
   src = fetchurl {
     name = "haka_${version}_source.tar.gz";
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix
index 385a201d88b0174bb220a56e403908412f131d9b..577fe02cb2ec976bf426b6433ecb8693f3292678 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/pkgs/tools/security/hash-slinger/default.nix
@@ -4,7 +4,6 @@ let
   inherit (pythonPackages) python;
 in stdenv.mkDerivation rec {
   pname    = "hash-slinger";
-  name    = "${pname}-${version}";
   version = "2.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix
index 0c5691a1e106d93863e448bb385917930f4d741f..9efa7e2afa29bc5f5ec6a80f4bcf5a26b54242a8 100644
--- a/pkgs/tools/security/hash_extender/default.nix
+++ b/pkgs/tools/security/hash_extender/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "hash_extender-${version}";
+  pname = "hash_extender";
   version = "2017-04-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index 81f627179a25fbff787cd8a7af94c78b8f746194..c47331f1bcb95031cbe7cf406e5df3c4dcc78a69 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "haveged-${version}";
+  pname = "haveged";
   version = "1.9.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix
index 5731f3ef8bb690b6dfb37931ef11b231ae52c5a0..8f30b5885e40368b29cdae92fbf1f32b85913451 100644
--- a/pkgs/tools/security/ifdnfc/default.nix
+++ b/pkgs/tools/security/ifdnfc/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ifdnfc-${version}";
+  pname = "ifdnfc";
   version = "2016-03-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index d4db02cc9ed1d76a867afa8b722612593856ac2a..dd3a93be99500323722e8dd054b558af15493474 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "john-${version}";
+  pname = "john";
   version = "1.9.0-jumbo-1";
 
   src = fetchurl {
-    url = "http://www.openwall.com/john/k/${name}.tar.xz";
+    url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";
     sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
   };
 
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 6fac3b66cbc66bc19cf22f7d64e1506eada4087b..1a2b06ea41f9320af56ed91caf421cc3bd171d6b 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "keybase-${version}";
+  pname = "keybase";
   version = "4.3.1";
 
   goPackagePath = "github.com/keybase/client";
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 02d8625aa7626b82c5115af21677c91b9fd5f5be..3954ec818b14ce47fd5e8ed44e9ef6b6f05b76e6 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "keybase-gui-${version}";
+  pname = "keybase-gui";
   version = "4.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index e7c09e0b2d5e7b63c23642f1e7b1618f20761b7c..9d4c590efa1e3d1d1697fcc26362ca16d5bcf4ff 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "3.3";
-  name = "kpcli-${version}";
+  pname = "kpcli";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kpcli/${name}.pl";
+    url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
     sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4";
   };
 
diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix
index d858ed3fd6d37fed7edece0993306de7cf0f30ed..4af6e3de3cf94e2c0976b0636a51ec41a508e2cf 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/pkgs/tools/security/libacr38u/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.7.11";
-  name = "libacr38u-${version}";
+  pname = "libacr38u";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2";
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index b3dc1270fb9c76ae91daf18e899f955fe72a09ea..17861ac2da607cce9dd9d54ee390a8e15af9a07c 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -3,7 +3,7 @@
 , curl, geoip, libxml2, lmdb, lua, pcre, yajl }:
 
 stdenv.mkDerivation rec {
-  name = "libmodsecurity-${version}";
+  pname = "libmodsecurity";
   version = "3.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index 8a73d056b1edbecfb8f813ab11a8bd45eb384d1f..a325c47ca0d997d5e659bc86755fdf9b302fd8e5 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }:
 
 stdenv.mkDerivation rec {
-  name = "logkeys-${version}";
+  pname = "logkeys";
   version = "2018-01-22";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 7579636cfbf5afdaa4ab26bb7edb9dcfa08301df..923c96719fe35d19b7d67e5d475f436e822ac8a0 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "lynis";
   version = "2.7.5";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index e33681c45e0e16935af6905aab102f03da39242c..94f0a3adfb82dd118bbca7ce200e7a4cc73078fd 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "masscan-${version}";
+  pname = "masscan";
   version = "1.0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 37796fef1747e557dc2962394b780ae0093a7f70..50341e873fad17b460f6b39bfa3de42417433a7c 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -16,7 +16,7 @@ let
     gemdir = ./.;
   };
 in stdenv.mkDerivation rec {
-  name = "metasploit-framework-${version}";
+  pname = "metasploit-framework";
   version = "4.16.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
index 3d4bdd2edf175e66135e7c6165099f3c7a3c289a..9098457cec1719418cf3199a3f038f4ad1e2d10e 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libnfc }:
 
 stdenv.mkDerivation rec {
-  name = "mfcuk-${version}";
+  pname = "mfcuk";
   version = "0.3.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix
index f5bc7a60839e2041c60f60905e1e509814b686c6..15ee2446922b51d976817e72b68478c6e3e8d8eb 100644
--- a/pkgs/tools/security/minisign/default.nix
+++ b/pkgs/tools/security/minisign/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "minisign-${version}";
+  pname = "minisign";
   version = "0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix
index 0c927b7501b6b7f32f72b8e04067207f1b4acd32..a4aae480ae16dfdead1f2b4ba957c89276e9d4c9 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/pkgs/tools/security/mkp224o/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "mkp224o-${version}";
+  pname = "mkp224o";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index 6ec90cd15a851de0ee00a8d13805508326edd605..2a9e41ac0fa98bd4569dd62a268ed6e26e618fbf 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -10,11 +10,11 @@ let luaValue = if luaSupport then lua5 else "no";
 in
 
 stdenv.mkDerivation rec {
-  name = "modsecurity-${version}";
+  pname = "modsecurity";
   version = "2.9.3";
 
   src = fetchurl {
-    url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz";
+    url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz";
     sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1";
   };
 
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index e1a134ec5d18e71c2889b0deca6f12cce1b8f272..b4d5ddb267dc903809d8237276446e04d6b593e1 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -13,7 +13,7 @@ let
     patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ];
   });
 in stdenv.mkDerivation rec {
-  name = "monkeysphere-${version}";
+  pname = "monkeysphere";
   version = "0.44";
 
   # The patched OpenSSH binary MUST NOT be used (except in the check phase):
diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix
index 84b738a21092a31b667de4ae9448818dd9056dc7..d45861cf50e114d66dda1ba29a372b98ad22474c 100644
--- a/pkgs/tools/security/nasty/default.nix
+++ b/pkgs/tools/security/nasty/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gpgme }:
 
 stdenv.mkDerivation rec {
-  name = "nasty-${version}";
+  pname = "nasty";
   version = "0.6";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/nasty/${name}.tgz";
+    url = "https://www.vanheusden.com/nasty/${pname}-${version}.tgz";
     sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn";
   };
 
diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index 88494e8dbdf76bb26b9fab12823fb1b337c67af7..5e26bcf6759d3b66e983d21f1fee69bacf890d57 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -11,7 +11,7 @@
 , gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "neopg-${version}";
+  pname = "neopg";
   version = "0.0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 1b18f0e1e11a0400f8e2690c4bc480de0b0f1acb..33a873f73dae5b809fe7ff3f3ecf9ea76329f232 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -2,7 +2,7 @@
 , qtbase, qttranslations, qtsvg, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "nitrokey-app-${version}";
+  pname = "nitrokey-app";
   version = "1.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix
index c0b7a72d18e0d9235d062b6c91f159dd3dd6616f..f873c475bbfeb1a50dcb82be5640c9a13f4519be 100644
--- a/pkgs/tools/security/nmap/qt.nix
+++ b/pkgs/tools/security/nmap/qt.nix
@@ -3,7 +3,7 @@
 , qtbase, qtscript, qtwebengine }:
 
 stdenv.mkDerivation rec {
-  name = "nmapsi4-${version}";
+  pname = "nmapsi4";
   version = "0.4.80-20180430";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 221817b004df67f4f587e05cca98e065c1c088e7..17473b6398813e81111955e2be300527f9c0bd94 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoPackage, libtool }:
 
 buildGoPackage rec {
-  name = "notary-${version}";
+  pname = "notary";
   version = "0.6.1";
   gitcommit = "d6e1431f";
 
diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index f88156285ca789d6cea4111066b481352a3f80c2..3f04d27648912864999ca25bcfbe8d1c4a773f12 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsjail-${version}";
+  pname = "nsjail";
   version = "2.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index a27ed7bad1a50fea6d34fe176eba2059b777c694..caaa5eba86a983d3ce8336daa1206b056dfd7513 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.25";
-  name = "nwipe-${version}";
+  pname = "nwipe";
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
index 91df7f3fbb0acc3190823b369450539bf8d7764d..baea02402d9f4d0bbf1606e5b6201218f1d4d614 100644
--- a/pkgs/tools/security/omapd/default.nix
+++ b/pkgs/tools/security/omapd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4, gdb, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "omapd-${version}";
+  pname = "omapd";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz";
     sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
   };
 
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 898bfb599a314ad48c10f9696d877569be74683b..5a9f101274815b80cda228383b666145b3785572 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "onioncircuits-${version}";
+  pname = "onioncircuits";
   version = "0.5";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix
index eff2211a71c5e03b7311d80c4585cd083c07a273..1d506928a52a8f7a639ee8d870d5c7108508d264 100644
--- a/pkgs/tools/security/opencryptoki/default.nix
+++ b/pkgs/tools/security/opencryptoki/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "opencryptoki-${version}";
+  pname = "opencryptoki";
   version = "3.8.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 769b87fa8d31902a1be9e1f67ada798d9dcef8bb..e5611f8b2671d1473ec74e0d0f3f22aff38ef3f4 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensc-${version}";
+  pname = "opensc";
   version = "0.19.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
index 11e1f14baf9ae5388461fae59d1e5e04dd730d75..1e618cdce1ad9d2d8711afad27259ac0fc22f326 100644
--- a/pkgs/tools/security/p0f/default.nix
+++ b/pkgs/tools/security/p0f/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, bash }:
 
 stdenv.mkDerivation rec {
-  name    = "p0f-${version}";
+  pname = "p0f";
   version = "3.09b";
 
   src = fetchurl {
-    url    = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz";
+    url    = "http://lcamtuf.coredump.cx/p0f3/releases/${pname}-${version}.tgz";
     sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl";
   };
 
diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index d7d1f1c40d47e9039706f763313c4b469c658681..dc3582b7369f99460bfdd9d47c956d881cf8f154 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "paperkey-${version}";
+  pname = "paperkey";
   version = "1.6";
 
   src = fetchurl {
-    url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
+    url = "https://www.jabberwocky.com/software/paperkey/${pname}-${version}.tar.gz";
     sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2";
   };
 
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 94f517d2e92d270f85e276caaf4420c3627b6e93..aeb838c05765301eac5c8026909baae6ef24f647 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -30,10 +30,10 @@ let
 
   generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
     version = "1.7.3";
-    name    = "password-store-${version}";
+    pname = "password-store";
 
     src = fetchurl {
-      url    = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+      url    = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz";
       sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
     };
 
diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix
index 79dd1fadb01cd9076eca16169e61196f42251824..ca5ca855337f267a3a27eba02014133a3d813649 100644
--- a/pkgs/tools/security/pass/extensions/audit.nix
+++ b/pkgs/tools/security/pass/extensions/audit.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]);
 
 in stdenv.mkDerivation rec {
-  name = "pass-audit-${version}";
+  pname = "pass-audit";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index ba3f821e88c60a38e18988ea0627a44a89e753cb..c34fae083cdccc1d0d3ef96fbf25064a0f7c5e8f 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pass-genphrase-${version}";
+  pname = "pass-genphrase";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
index 0ee775bfbe8b7c5d3f6de341cc758d03c520da08..9d9d36fd0d909c251c3f660ec9b1b8692f61c4d1 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]);
 
 in stdenv.mkDerivation rec {
-  name = "pass-import-${version}";
+  pname = "pass-import";
   version = "2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix
index c951a5e37ef619444e31984b4a7bc9e8dce6578c..4b15c3d68035e7d86d893cecd9037c226808586d 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, oathToolkit }:
 
 stdenv.mkDerivation rec {
-  name = "pass-otp-${version}";
+  pname = "pass-otp";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
index b9f458cd4e120e454a20e78d80720f53f7a8421f..ccb558c9b853f82fbf174b22132478f12bd500dc 100644
--- a/pkgs/tools/security/pass/extensions/tomb.nix
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tomb }:
 
 stdenv.mkDerivation rec {
-  name = "pass-tomb-${version}";
+  pname = "pass-tomb";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index dd145b069720a54d2127d27e2c4865b5acb4f05e..b712557ab3eb5b933347429629c96870edace180 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "pass-update-${version}";
+  pname = "pass-update";
   version = "2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 6140159dcb5039f7213044dc6316898106df1e6d..b188b411517bcbffccb3f22e8065548a30785088 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rofi-pass-${version}";
+  pname = "rofi-pass";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 23a744f8e23d423aac1a2a537f1068e2473a11e0..8aadb685aa8b09f6970d9350ab015c89d7145091 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "pcsc-cyberjack-${version}";
+  pname = "pcsc-cyberjack";
   version = "3.99.5_SP12";
 
   src = with stdenv.lib; let
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix
index 88ca8a3d1b1a9b76fa88224f32e16dedc92a7f18..0302fc6fc674c525db3453f9f17c25a59f2ffda8 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix
@@ -6,7 +6,7 @@ let
   else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 in
 stdenv.mkDerivation rec {
-  name = "pcsc-scm-scl-${version}";
+  pname = "pcsc-scm-scl";
   version = "2.09";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 5c40ccdef58401206bd0e44b5b9fae74d47ac1bb..eed462ef0d04683b5dd5ea57f0c12c6d8c31649a 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -2,7 +2,7 @@
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-${version}";
+  pname = "pcsclite";
   version = "1.8.25";
 
   outputs = [ "bin" "out" "dev" "doc" "man" ];
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index 55d2505ed1cbc033a5e3713cc116160d88e71184..c235c98b971976c8ea556a5a2c87af0db8ca1d2c 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pdfcrack-${version}";
+  pname = "pdfcrack";
   version = "0.17";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 9c8f47cd27569610a13c95004c4d8732b20b61ed..8bf440d2b07f51702486f0313d81a529d53942c1 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pgpdump-${version}";
+  pname = "pgpdump";
   version = "0.33";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index b24af50ee7c2461fadfac723e9adf31b22818dd2..2c03183fa96eddf951581ae26647e1ec5ae895c5 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -13,7 +13,7 @@ let
     sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30";
   };
 in stdenv.mkDerivation rec {
-  name = "prey-bash-client-${version}";
+  pname = "prey-bash-client";
   version = "0.6.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 17bbf982255b65aa17de001eb2b944e6aa5818aa..7fc6ed209663c5fa84c850a5533a9b8d0415d223 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -2,7 +2,7 @@
 , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
 
 stdenv.mkDerivation rec {
-  name = "qdigidoc-${version}";
+  pname = "qdigidoc";
   version = "4.1.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index f8b110ce2213155de0f18774c7f0a800ca495346..5ce5672eb254346001faf2c168efeede7ec77020 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = "2018-08-21";
-  name = "qesteidutil-${version}";
+  pname = "qesteidutil";
 
   src = fetchFromGitHub {
     owner = "open-eid";
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
index 3491feccc45cb5927b9ff2a1a3dd949f15c510bb..0227268cf4360d7cc3742ffdf8184767998a4282 100644
--- a/pkgs/tools/security/rarcrack/default.nix
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "rarcrack-${version}";
+  pname = "rarcrack";
   version = "0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 5e622cf68f350e1c676f600ce270c9aa23c8d91e..ad606af95621c3b863ad2a6f7614690970f3146a 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.8";
-  name = "rhash-${version}";
+  pname = "rhash";
 
   src = fetchFromGitHub {
     owner = "rhash";
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index 1091b366781d4c5ce4fe641401abdd7550b818bf..aaac975bb8139f2aba8dbb787335646b60e31e94 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sbsigntool-${version}";
+  pname = "sbsigntool";
   version = "0.9.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix
index 75ea92a786c5b3d60dffa02d43f37d1ec4328e95..e419232641b68ebd16317a6aa2558a906078e9f1 100644
--- a/pkgs/tools/security/scallion/default.nix
+++ b/pkgs/tools/security/scallion/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.1";
-  name = "scallion-${version}";
+  pname = "scallion";
 
   src = fetchFromGitHub {
     owner = "lachesis";
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 352a81b2727a14ee14d122f9b578a23716137664..2ca4c1df18c45d01897fd5abf10df72cc69da67e 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "scrypt-${version}";
+  pname = "scrypt";
   version = "1.2.1";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+    url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz";
     sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6";
   };
 
diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix
index a2ec48d4d270f75a671144954bc847a42d8bf03c..686ef36f863c2cbc2475a3fb5a4d74262ce30d2f 100644
--- a/pkgs/tools/security/seccure/default.nix
+++ b/pkgs/tools/security/seccure/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "seccure-${version}";
+  pname = "seccure";
   version = "0.5";
   
   src = fetchurl {
-    url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
+    url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz";
     sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5";
   };
 
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix
index fd03e6bebabc1beba77c2604cd75205d4d77b076..c9ba2a8ac6dd2cb9e2b0f080752ae3e203968650 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/pkgs/tools/security/secp256k1/default.nix
@@ -16,7 +16,7 @@
 let inherit (stdenv.lib) optionals; in
 
 stdenv.mkDerivation rec {
-  name = "secp256k1-${version}";
+  pname = "secp256k1";
 
   # I can't find any version numbers, so we're just using the date of the
   # last commit.
diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix
index 343992a6322f1afb79867a41d1b5820fa5a7327c..9edd9745326e5b2ade46bb6f0243ad1f93c4c4d5 100644
--- a/pkgs/tools/security/sedutil/default.nix
+++ b/pkgs/tools/security/sedutil/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sedutil-${version}";
+  pname = "sedutil";
   version = "1.15.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix
index 38da144841476409a3dd4c531bf07880920ac6e4..8c6a026a61248425457d1caa5296ff5cd10693fc 100644
--- a/pkgs/tools/security/sha1collisiondetection/default.nix
+++ b/pkgs/tools/security/sha1collisiondetection/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtool, which }:
 
 stdenv.mkDerivation  rec {
-  name = "sha1collisiondetection-${version}";
+  pname = "sha1collisiondetection";
   version = "1.0.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix
index 3d3bd4eef849251a7f58242f6ae47a5aeb60d9e9..cd93c55001ebac5ddda93a12b8644f4ee95d7bd5 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shc-${version}";
+  pname = "shc";
   version = "4.0.3";
   rev = "${version}";
 
diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix
index a642a12b0bd0affb0fba67f2c29682ba438ca87c..22604a3f70ba2a4665795cc1dfd4c2e9a077c14b 100644
--- a/pkgs/tools/security/signify/default.nix
+++ b/pkgs/tools/security/signify/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libbsd, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "signify-${version}";
+  pname = "signify";
   version = "25";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index 8148692327ef3fef3a69d6ccd7d6d810b1ed529a..ea487fed2a1d654c77fdc57d4d8ec7a2560e7520 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -14,7 +14,6 @@ let
 in stdenv.mkDerivation rec {
   pname = "signing-party";
   version = "2.10";
-  name = "${pname}-${version}";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix
index 96565ec84b520d4de12eaefaf78cbb34604ad65b..16056f9a59e06b15bfd7f3b3b2baf8aadade7ec2 100644
--- a/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/pkgs/tools/security/simple-tpm-pk11/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "simple-tpm-pk11-${version}";
+  pname = "simple-tpm-pk11";
   version = "0.06";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index ec5eea52a6f8533c7cd8c0b1afc096bf7153be25..94642700c336ae7a368f1201fdf140c0bf4e4caa 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "softhsm-${version}";
+  pname = "softhsm";
   version = "2.5.0";
 
   src = fetchurl {
-    url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+    url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
     sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj";
   };
 
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index a1844668af65f524bf3ed3f5d9c62032028ef31f..3ece05926ccc649f53407e58337352e5cd51ed76 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }:
 
 stdenv.mkDerivation rec {
-  name = "spectre-meltdown-checker-${version}";
+  pname = "spectre-meltdown-checker";
   version = "0.42";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 1ff9c73d8b58743259caf419b28ef3c9b954a3ea..33ab4c373bcac250d7288513fd2e6a2b1a5147a5 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name    = "ssdeep-${version}";
+  pname = "ssdeep";
   version = "2.14.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix
index 18f010ee1ecbc6ba52d9dc169ceee2f6c32093e8..a196fe9ca47a7b4accbc197767cddc080bf49c43 100644
--- a/pkgs/tools/security/sshguard/default.nix
+++ b/pkgs/tools/security/sshguard/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
-  name = "sshguard-${version}";
+  pname = "sshguard";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sshguard/${name}.tar.gz";
+    url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz";
     sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06";
   };
 
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index d3a8f35d91485bc9ddc83f3853edb0ace66a8b7a..15ac376d72a77137d724aaf9df123658a0a47478 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sslscan-${version}";
+  pname = "sslscan";
   version = "1.11.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix
index c8be366066be9939afaf0b706fa12ee94f9442a2..7a759c3c33363f68e8f2cf07cb0357849cbf5d56 100644
--- a/pkgs/tools/security/steghide/default.nix
+++ b/pkgs/tools/security/steghide/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
   version = "0.5.1";
-  name = "steghide-${version}";
+  pname = "steghide";
 
   src = fetchurl {
     url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index d28260ffb8b9492b13f7092fd82795e4279c0090..38fc884de48742fe5faf66011aaa5cfbf584a0f1 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
   pname = "stoken";
   version = "0.92";
-  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = pname;
diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix
index ecc34ede556be35cd3889eac3ea7f0146cd46f90..28c462cbb0a24ad7c2598f644eaea64db53cdc41 100644
--- a/pkgs/tools/security/stricat/default.nix
+++ b/pkgs/tools/security/stricat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "stricat-${version}";
+  pname = "stricat";
   version = "20140609100300";
 
   src = fetchurl {
-    url    = "http://www.stribob.com/dist/${name}.tgz";
+    url    = "http://www.stribob.com/dist/${pname}-${version}.tgz";
     sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
   };
 
diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix
index 56e40d514bb1b714e8d725f3c20f0c5d93de0784..8ff33ee1ec91c757c28d40b635fff6fbe9921d95 100644
--- a/pkgs/tools/security/su-exec/default.nix
+++ b/pkgs/tools/security/su-exec/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "su-exec-${version}";
+  pname = "su-exec";
   version = "0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix
index 15f7674158903ccdf6001ca6795699db7fae8b00..97db4a28c45804058526606450cf26cd0c9cf78e 100644
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/pkgs/tools/security/sudolikeaboss/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }:
 
 buildGoPackage rec {
-  name = "sudolikeaboss-unstable-${version}";
+  pname = "sudolikeaboss-unstable";
   version = "20161127-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "2d9afe19f872c9f433d476e57ee86169781b164c";
 
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index f159dd27c42aa5013c54f0ecd49b79679199f503..f5184b985622e3ebfa7ca1c23df420a7b9821275 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, trousers, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tboot-${version}";
+  pname = "tboot";
   version = "1.9.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tboot/${name}.tar.gz";
+    url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
     sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00";
   };
 
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
index 4d0feef72c9fdf9432dcf687c4f1e857943c8d98..86a65a060280e78b5513407ebd29697b06b159fa 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -6,7 +6,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tcpcrypt-${version}";
+  pname = "tcpcrypt";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 9a7a245b813462c6cae4eb03448fce2e303f4796..252d73b479b64186145775c0636991aa66d88126 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -5,7 +5,7 @@ let
   makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs);
 
 in stdenv.mkDerivation rec {
-  name = "thc-hydra-${version}";
+  pname = "thc-hydra";
   version = "8.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
index 170d5c4ff7a43ca686867cac756624ac7ffabf05..896ab50562d8a6453f69c385e2fb0974093fcf88 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/pkgs/tools/security/tor/tor-arm.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-arm-${version}";
+  pname = "tor-arm";
   version = "1.4.5.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 686d03b7c3fabf05a5426e7e4efe3c40bffa88dc..8681d80c2ed32c2b35740b025dad622c880306e4 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "torsocks-${version}";
+  pname = "torsocks";
   version = "2.3.0";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
index e7a82f6089e7fa108701354775e4e313af230c01..ca78c5d73ffbc678457acfe417372621af0b6607 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tpm-luks-${version}";
+  pname = "tpm-luks";
   version = "git-2015-07-11";
 
   src = fetchgit {
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index 1541575aed745022e3d01fe58ba4ef864a5bbec8..5d54758cc7c29fc6f318dc03519354297a5d0700 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, trousers, openssl }:
 
 stdenv.mkDerivation rec { 
-  name = "tpm-quote-tools-${version}";
+  pname = "tpm-quote-tools";
   version = "1.0.4";
 
   src = fetchurl { 
-    url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz";
     sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h";
   };
 
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix
index 5a2dc6652ddc434d1e998fe4fe6d734087ae7365..e546cc5a10fb9ff0b469e7bea93abc21bd0918fa 100644
--- a/pkgs/tools/security/tpm-tools/default.nix
+++ b/pkgs/tools/security/tpm-tools/default.nix
@@ -4,10 +4,11 @@ let
   version = "1.3.9.1";
 in
 stdenv.mkDerivation rec {
-  name = "tpm-tools-${version}";
+  pname = "tpm-tools";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz";
     sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww";
   };
 
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 8309390d013bff5ab19157e8933c8a1a2bd6d0b3..6f7fed20c89dd1170d37e1dda34e6b530aa55272 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "trousers-${version}";
+  pname = "trousers";
   version = "0.3.13";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trousers/trousers/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
     sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
   };
 
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index dcded06527637d37363c7209aedfcdf10353b78f..c0fa221c96914c4b56b86626a94be519e446b4a8 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
-  name = "vault-${version}";
+  pname = "vault";
   version = "1.2.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index b58e41d850d8a2c1a756e1ce8f8212b2fede63d0..d33cdeb1c56fc49b4f4693dd66cdc88d5ced1030 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -29,7 +29,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "vault-bin-${version}";
+  pname = "vault-bin";
+  inherit version;
 
   src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index e3b7fb643a26a18d0217f51179031bfae946e0f3..bc8f1ce52c1d566786b323aea83820428f0ecaba 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -2,10 +2,10 @@
 
 pythonPackages.buildPythonApplication rec {
   version = "2.6";
-  name = "volatility-${version}";
+  pname = "volatility";
 
   src = fetchurl {
-    url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
+    url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip";
     sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
   };
 
diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix
index a7c337dc12223f13f298a8849e6a645d59bab326..25c7921d34c84e160a7ed11b24c4edaab7cd0b6e 100644
--- a/pkgs/tools/security/wipe/default.nix
+++ b/pkgs/tools/security/wipe/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wipe-${version}";
+  pname = "wipe";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/wipe/${version}/${pname}-${version}.tar.bz2";
     sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6";
   };
 
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 7fcb9fc10bd1f1a44e2b3c6686c5e6f0ff55eba9..ccebb2dbab42b9357e4d04b203053b995370b4bb 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.10.0";
-  name = "yara-${version}";
+  pname = "yara";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
index a31fdd08c60da310e4acf6a7a3cc0e8c4cafc597..7e92fc06b2d7679c644d1a3c6b5a6da03f8ac473 100644
--- a/pkgs/tools/system/amtterm/default.nix
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -2,14 +2,14 @@
 
 
 stdenv.mkDerivation rec {
-  name = "amtterm-${version}";
+  pname = "amtterm";
   version = "1.6-1";
 
   buildInputs = with perlPackages; [ perl SOAPLite ];
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchurl {
-    url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz";
+    url = "https://www.kraxel.org/cgit/amtterm/snapshot/${pname}-${version}.tar.gz";
     sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc";
   };
 
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 142d33d359dc127a214746c1b627905a94800c41..fded1da861d44a2126cf6c49c39c41cda492e65b 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "at-${version}";
+  pname = "at";
   version = "3.1.23";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index a8fca06c3618fd8e8a0102db2db4c4d202c2e2f6..a99df36beb6d206c4fd5e83ae3aefce91ae1a441 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, readline, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "augeas-${version}";
+  pname = "augeas";
   version = "1.12.0";
 
   src = fetchurl {
-    url = "http://download.augeas.net/${name}.tar.gz";
+    url = "http://download.augeas.net/${pname}-${version}.tar.gz";
     sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 9c6f21009ee31ad66c3c33d2e953627cb1fb7f1b..8443314cf71b988cbf9c775067e1066ee004e24c 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libcap, acl }:
 
 stdenv.mkDerivation rec {
-  name = "bfs-${version}";
+  pname = "bfs";
   version = "1.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index 9842bd85783a337c85269eaa4ad32bd783ac2c03..d3f692b70e7e1f3283505825f48716b9ad717dd7 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.14.8";
-  name = "bootchart-${version}";
+  pname = "bootchart";
 
   src = fetchFromGitHub {
     owner = "mmeeks";
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index 6dcaeed325aec4adc4cfbb0166fd2e915b24bffb..6c48d3341ecc868c76f46bf9e605d6ad38fd14d3 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
 
 stdenv.mkDerivation rec {
-  name = "chase-${version}";
+  pname = "chase";
   version = "0.5.2";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix
index cb8c4cc7d02926e5b483cf118df66298acab0742..0874aa7410c0c08496e56f833458e9e7710a6616 100644
--- a/pkgs/tools/system/collectd/data.nix
+++ b/pkgs/tools/system/collectd/data.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   inherit (collectd) meta version;
 
-  name = "collectd-data-${version}";
+  pname = "collectd-data";
 
   phases = [ "installPhase" ];
 
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index d71fa0c4e5841790df597c180fd6dc0ac5b62411..1df73e08d1e3093a9c3aaa983f060dffe14da045 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -42,10 +42,10 @@
 }:
 stdenv.mkDerivation rec {
   version = "5.8.1";
-  name = "collectd-${version}";
+  pname = "collectd";
 
   src = fetchurl {
-    url = "https://collectd.org/files/${name}.tar.bz2";
+    url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
     sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
   };
 
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index 3dc2a5caeb91dcea6e1bea09caae7fc9ff77f912..e7a5dc86578a5b2c54ffc999d537dfed232ab2bd 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,7 +1,7 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "confd-${version}";
+  pname = "confd";
   version = "0.9.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 35c57dd8ea916a3e50ed8388422810d1384410d3..ad120dd6481e706a6bdf38b889915352d70f7254 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "consul-template-${version}";
+  pname = "consul-template";
   version = "0.19.4";
   rev = "v${version}";
 
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index 1067e524788b4b12dc566eac57bf129d7d3cb55e..205b693dd9248a92e5cdbccc1fa21034a1bb90f6 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name    = "daemonize-${version}";
+  pname = "daemonize";
   version = "1.7.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
index bcea40b1193f6180b150ec0ca81c4b7bb89f1cee..c8f7e77b1562d4378d897ac0b83b9ba2b17b4da2 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "das_watchdog-${version}";
+  pname = "das_watchdog";
   version = "git-2015-09-12";
 
   src = fetchgit {
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index ca389a8e1b48158f31b69fa469364d06b00e3502..4018801f2490ed5fe48c1f10cfc4945b76114643 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
   pname = "datefudge";
   version = "1.22";
-  name = "${pname}-${version}";
 
   src = fetchgit {
     url = "https://salsa.debian.org/debian/datefudge.git";
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index e0d11769fd9fe0f336feae3774cd7eb8dc7772eb..9962337de078ab159d4ce8d28afc1a1db9ad73dc 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   version = "1.99.8";
-  name = "dd_rescue-${version}";
+  pname = "dd_rescue";
 
   src = fetchurl {
     sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh";
-    url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
+    url="http://www.garloff.de/kurt/linux/ddrescue/${pname}-${version}.tar.bz2";
   };
 
   dd_rhelp_src = fetchurl {
diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix
index f8a6dac8197601ac61c2bc34c00cd5f8253e4504..54bf6fbaf42b70f04244391275ee8119ea639d7d 100644
--- a/pkgs/tools/system/ddrutility/default.nix
+++ b/pkgs/tools/system/ddrutility/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ddrutility-${version}";
+  pname = "ddrutility";
   version = "2.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ddrutility/${name}.tar.gz";
+    url = "mirror://sourceforge/ddrutility/${pname}-${version}.tar.gz";
     sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac";
   };
 
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 9a255c1b0ea6894755dda4a8750e9cc0346021c2..8575d971898ac9fa7e1ddc7c07a4c3f87c0b19e1 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "dfc-${version}";
+  pname = "dfc";
   version = "3.1.1";
 
   src = fetchurl {
-    url = "https://projects.gw-computing.net/attachments/download/615/${name}.tar.gz";
+    url = "https://projects.gw-computing.net/attachments/download/615/${pname}-${version}.tar.gz";
     sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n";
   };
 
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 7d366dc9bd7f51c4b745a5c14c2e016a117382d6..9d56b8488e5ebc035c39d27b326ddf0753be9553 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "di-${version}";
+  pname = "di";
   version = "4.47.1";
 
   src = fetchurl {
-    url = "http://gentoo.com/di/${name}.tar.gz";
+    url = "http://gentoo.com/di/${pname}-${version}.tar.gz";
     sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f";
   };
 
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 638b018fd4158ad6a37a668d5439e73428c54823..272809e486c143f3648e116ddb05e8ecef1c408a 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }:
 
 stdenv.mkDerivation rec {
-  name = "efibootmgr-${version}";
+  pname = "efibootmgr";
   version = "17";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 5c9b0292e5c048c02b4521847c1f7117f7745cc0..365cfeab0581d1af2c919ebfc97eb0bfa5fa2634 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
-  name = "efivar-${version}";
+  pname = "efivar";
   version = "37";
 
   outputs = [ "bin" "out" "dev" "man" ];
diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix
index 5f013157e32b684bf885c4265aa812e680412b84..c2f5556cec67b327f2c74394821991c18fa7df4c 100644
--- a/pkgs/tools/system/envconsul/default.nix
+++ b/pkgs/tools/system/envconsul/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "envconsul-${version}";
+  pname = "envconsul";
   version = "0.7.3";
   rev = "v${version}";
 
diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index 5a902914b37bc489977f8b0458e17c66b868d0fc..1ba2b78e8609f3e9d87c07336223d26d811ff428 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "evemu-${version}";
+  pname = "evemu";
   version = "2.6.0";
 
   # We could have downloaded a release tarball from cgit, but it changes hash
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 38ca06a6f322a29f56bfa38bcbd6bd20caec087d..6b84f7d69a55e92120aaa176791775fa0c5cf307 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "facter-${version}";
+  pname = "facter";
   version = "3.13.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 1a16a8a34c7faa12673f7ed940a9d1754818cc68..c31e7337dd59cca4aa4ffe62fbbb05283a8dc8a1 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.23";
-  name = "fakeroot-${version}";
+  pname = "fakeroot";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ;
 
   postUnpack = ''
-    sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in
+    sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in
   '';
 
   meta = {
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 2bcab1c36b27c5e2a19ddf5bdb4caddd7e80db43..6ef39a647f721ce52064bad4fe08588a95c925c3 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -4,11 +4,11 @@
 { stdenv, fetchurl, perl, busybox, vim }:
 
 stdenv.mkDerivation rec {
-  name = "fcron-${version}";
+  pname = "fcron";
   version = "3.3.0";
 
   src = fetchurl {
-    url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
+    url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz";
     sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls";
   };
 
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 694a71d8ec1196770e973e61a5265a3ea48aac21..5a690b288450a5a322cfbfe500dadb60066c9bd2 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -3,7 +3,7 @@
 , withGnuplot ? false, gnuplot ? null }:
 
 stdenv.mkDerivation rec {
-  name = "fio-${version}";
+  pname = "fio";
   version = "3.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index b3048f2fcb7fdc22d152ecdeb6a2edc79db8fc73..be33f45ca9dc8f28f05984bb23ac38e5e66b96b0 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "foremost-${version}";
+  pname = "foremost";
   version = "1.5.7";
 
   src = fetchurl {
     sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h";
-    url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
+    url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz";
   };
 
   patches = [ ./makefile.patch ];
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index b8cd85c0abcaea4b8d489c0de54630a7d03a0745..b057c80c74ecbb9c7db94740bbbcdad3ae19d851 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.6.4";
-  name = "freeipmi-${version}";
+  pname = "freeipmi";
 
   src = fetchurl {
-    url = "mirror://gnu/freeipmi/${name}.tar.gz";
+    url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
     sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5";
   };
 
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index 9eef3b064a0c7d7bb2c6bf0c4e21359998ae88d8..c0dd2c89d2f1f8b08fb92627721e84b5f394251e 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gohai-${version}";
+  pname = "gohai";
   version = "2018-05-23";
   rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
 
diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix
index d58d19fd6ed12f3ec4a5a25b8a8de6827c725d95..22918f14145cb313e6779383c7744e72c0e61345 100644
--- a/pkgs/tools/system/goreman/default.nix
+++ b/pkgs/tools/system/goreman/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
-  name = "goreman-${version}";
+  pname = "goreman";
   version = "0.2.1";
 
   goPackagePath = "github.com/mattn/goreman";
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 25d60ffca5dc8cc0cc92f9712f3ec9261415dffe..71f82bfc3864a5817f7284416aae25df667dedd7 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, libuuid, popt, icu, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "gptfdisk-${version}";
+  pname = "gptfdisk";
   version = "1.0.4";
 
   src = fetchurl {
     # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
     # page clearly implies a preference for using SourceForge's bandwidth:
-    url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
+    url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
     sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
   };
 
diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix
index 63a72aac79f2ebb3d6717dcc5e6353f394b0e3bb..a2e342f85b74fbe6b15e97b0e7f6f6cd2baf1e6c 100644
--- a/pkgs/tools/system/hardinfo/default.nix
+++ b/pkgs/tools/system/hardinfo/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hardinfo-${version}";
+  pname = "hardinfo";
   version = "0.5.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index c9a21db7101060f9bc5fd4d6250a12ffa5d6eb1b..187c046875f7e79270c8707c888f43befaa9b075 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "hardlink-${version}";
+  pname = "hardlink";
   version = "1.3-4";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 68c6ef3c3ef5f897ded73c1efefbeaa04a08ba38..12e54b1b22ed89c8442acc1102e85fcd3eb0fe5e 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -2,11 +2,11 @@
 IOKit, python }:
 
 stdenv.mkDerivation rec {
-  name = "htop-${version}";
+  pname = "htop";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz";
+    url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz";
     sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
   };
 
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index eba8c8f41b49b40259c25138aa2aa0071f59701e..4306f7e9093531992a72323eb868cb13b1ac8098 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "hwinfo-${version}";
+  pname = "hwinfo";
   version = "21.67";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix
index 03373300a948185a0ae86ebd64ccb40528d6a7a4..9d89e0714c486334dd57facaa2a9edaf8f05c9dd 100644
--- a/pkgs/tools/system/illum/default.nix
+++ b/pkgs/tools/system/illum/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.4";
-  name = "illum-${version}";
+  pname = "illum";
 
   src = fetchgit {
     url = "https://github.com/jmesmon/illum.git";
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index ee9554cc09f93a7608f41aed520b75e0e2faef27..3c1e3e798623bb299997a20e749443f83f74addc 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "inxi-${version}";
+  pname = "inxi";
   version = "3.0.36-1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 22dd9289bfd48bb835b6c79595b3afc8838e95f1..274e65bb41dc7121b5cc0f60659f84d3eb096cb9 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "ioping-${version}";
+  pname = "ioping";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
index d7c1f89a78625e8f7b3cdf9ec774ab8ef2954f67..7e6854afe627b9b74c4eff937692183ddbc6a255 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/pkgs/tools/system/iops/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iops-${version}";
+  pname = "iops";
   version = "0.1";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/iops/${name}.tgz";
+    url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz";
     sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
   };
 
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index ad7715f0fe691b07bf4b94b48f20e378bb948cf9..83c0a287533a6681b9544064b7daa9a2f4874dcd 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -6,7 +6,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ior-${version}";
+  pname = "ior";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/LLNL/ior/archive/${version}.tar.gz";
diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index 35a006505434d30e732445554feb9dc8d55f9675..0a04581264e07e3932b0c1aa0826f3f82b8c8ce3 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -1,7 +1,7 @@
 { lib, systemd, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "journalbeat-${version}";
+  pname = "journalbeat";
   version = "5.6.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 4ec34a68122cd12223fd87220acc05c813c49ecb..064071a5ca450ba46c16f541d436f693eaaa8f75 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lockfileProgs, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "logcheck-${version}";
+  pname = "logcheck";
   version = "1.3.20";
   _name    = "logcheck_${version}";
 
diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index e01636f2944fc086634fec624b515163c905eee3..cee092f755f823d0767cca88daadd77106b97a60 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "logrotate-${version}";
+  pname = "logrotate";
   version = "3.15.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 39cd429e1f9320c8ae7314e21c8401c1988c6056..74bc177023fbdcc1b705060fcd292c5bb6107a3b 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lr-${version}";
+  pname = "lr";
   version = "1.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix
index d34fb939822d1c95f7d540b3b011db3e6441f1fd..ff6ccb534fb9a5200167f65807e3549a9bfae81d 100644
--- a/pkgs/tools/system/memtester/default.nix
+++ b/pkgs/tools/system/memtester/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "memtester-${version}";
+  pname = "memtester";
   version = "4.3.0";
 
   preConfigure = ''
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 5455728a10c291f8e28928179aa4fcb453fd8ac6..dc169ee23b473a16fe81c95cc76d1ebd89448f0f 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.16.0";
-  name = "netdata-${version}";
+  pname = "netdata";
 
   src = fetchurl {
     url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
index 5044e5c9a96a82e346a81988d51a9737065a71e3..1d8eeff209ede682fa0ef8b7567f954278fdadb3 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "nq-${version}";
+  pname = "nq";
   version = "0.3.1";
   src = fetchFromGitHub {
     owner = "chneukirchen";
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 19581c82c78f249665d63cee76fe7bf569204f35..0e7a5d4a3111e4d61e8d82825560da85bcf9a7d8 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "nvtop-${version}";
+  pname = "nvtop";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index b673c0f929a6a74b5c0e0057ae9b0e123ab7dcca..b5842ad37c318450d60de70f669a81ed94a71cbb 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "pcstat-unstable-${version}";
+  pname = "pcstat-unstable";
   version = "2017-05-28";
 
   goPackagePath = "github.com/tobert/pcstat";
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index b3909a79d942ca852cd7c3d5aecd97c5a55bbe66..4c011a0b212d3a7f9510ff5a14399b84a704ee9f 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -8,7 +8,6 @@
 stdenv.mkDerivation rec {
   pname = "plan9port";
   version = "2019-02-25";
-  name = "${pname}-${version}";
 
   src =  fetchFromGitHub {
     owner = "9fans";
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
index 234aacbbfdee97dc79cbe70377085b4036641b91..83d281642bd3654a0619686612e8136c18a00d12 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/pkgs/tools/system/psensor/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "psensor-${version}";
+  pname = "psensor";
 
   version = "1.2.0";
 
diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix
index 178e08938feab0a96c7d673f4edeafc242e9577d..4d413e60c77f3d6973bacd266d49999fe822a3ca 100644
--- a/pkgs/tools/system/psstop/default.nix
+++ b/pkgs/tools/system/psstop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "psstop-${version}";
+  pname = "psstop";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix
index ee7626d271267623e0f86440fd876505b0d80882..73c1b48815595899d0538cdab62d89e5d5fb7995 100644
--- a/pkgs/tools/system/rofi-systemd/default.nix
+++ b/pkgs/tools/system/rofi-systemd/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rofi-systemd-${version}";
+  pname = "rofi-systemd";
   version = "0.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 131ba53f584706743bea7d80012f10229822e825..78306907079e16ffc52fd9f1d923663b24f31324 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "runit-${version}";
+  pname = "runit";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "http://smarden.org/runit/${name}.tar.gz";
+    url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
     sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
-  sourceRoot = "admin/${name}";
+  sourceRoot = "admin/${pname}-${version}";
 
   doCheck = true;
 
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 5d4ed355ba9d1e96d59eae71a7df74900e906766..063a338f6e8d0b0e5f7ac622c3703fbd466d247a 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,7 +1,6 @@
 { stdenv, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "s-tui";
   version = "0.8.3";
 
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix
index ed4fe7a684827bbc1103a0fe177dd00e15629620..571f70e0756c1c67dbd20d34511fc8e50dca4431 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/pkgs/tools/system/safe-rm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, perl, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "safe-rm-${version}";
+  pname = "safe-rm";
   version = "0.12";
 
   src = fetchgit {
     url = "https://gitorious.org/safe-rm/mainline.git";
-    rev = "refs/tags/${name}";
+    rev = "refs/tags/${pname}-${version}";
     sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
   };
 
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix
index d6e8f4f1bb9fbb5a62c605254f6cf0644920a267..036e3a83cf28a597deddd9a3dc153a0a786ebeae 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/pkgs/tools/system/setserial/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, groff }:
 
 stdenv.mkDerivation rec {
-  name = "setserial-${version}";
+  pname = "setserial";
   version = "2.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/setserial/${name}.tar.gz";
+    url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz";
     sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
   };
 
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index d35f56e251973c5975e9188e8c2c90abd2d20156..7c90d41da18e1c0957e3a5e96a84c90af62854d8 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "4.6.5";
-  name = "sleuthkit-${version}";
+  pname = "sleuthkit";
 
   src = fetchFromGitHub {
     owner = "sleuthkit";
     repo = "sleuthkit";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c";
   };
 
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 05d96afded14ffab88ff904a074293fc8e9c6f85..2da76cce0cdd9b4ab9189366d06ccd30b49ad41f 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -13,10 +13,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "smartmontools-${version}";
+  pname = "smartmontools";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
+    url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz";
     sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5";
   };
 
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index 15a18a453f00194d60f5296305bb95262a9755ce..9f2cc225747296806513f4ebe806dfae4827a762 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "socklog-${version}";
+  pname = "socklog";
   version = "2.1.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index f407be7c58544c1c54e90e45f95e7b6a77544ac1..9697748e056d2cbc1a4b31d5373f937c6fa32cda 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "suid-chroot-${version}";
+  pname = "suid-chroot";
   version = "1.0.2";
 
   src = fetchurl {
     sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx";
-    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2";
+    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${pname}-${version}.tar.bz2";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix
index 81e3a2b8792b732cb4ee7996576fed689aac8e0d..3834b3762f03a5f605504ea25573e4bb4b217e0f 100644
--- a/pkgs/tools/system/supervise/default.nix
+++ b/pkgs/tools/system/supervise/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "supervise-${version}";
+  pname = "supervise";
   version = "1.4.0";
 
   src = fetchzip {
diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix
index 240ad9de19d16ca2776782ce6ff0737da7465f39..93a6bbf0c75b4e7fecaf27c481d8888361bd700a 100644
--- a/pkgs/tools/system/symlinks/default.nix
+++ b/pkgs/tools/system/symlinks/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "symlinks-${version}";
+  pname = "symlinks";
   version = "1.4.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 1f444ca5cd8119e61495f6842356348f8e12845d..881fda241ed79253d1f3754c15dd7f7fceec82f4 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "syslog-ng-incubator-${version}";
+  pname = "syslog-ng-incubator";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "balabit";
     repo = "syslog-ng-incubator";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
   };
 
diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk-photorec/default.nix
index 5342cf857acc0efc2f85276f7d9e86a2dc36e318..06f6751213b28019d59da11858d9d1c41c6856b8 100644
--- a/pkgs/tools/system/testdisk-photorec/default.nix
+++ b/pkgs/tools/system/testdisk-photorec/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "testdisk-photorec-${version}";
+  pname = "testdisk-photorec";
   version = "7.0";
   src = fetchurl {
     url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2";
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 2a98a2f889e80e7fbb9684d0789646dce1d32da3..3429419052fe0bed0f089854f75d09074cb4c964 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, dbus, dbus-glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "thermald-${version}";
+  pname = "thermald";
   version = "1.9";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index dc63b97056a75dade5133cd22953dbba26f01277..8c803400584473437ea73ea94baff0e8dc331263 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -2,7 +2,7 @@
 , smartSupport ? false, libatasmart }:
 
 stdenv.mkDerivation rec {
-  name = "thinkfan-${version}";
+  pname = "thinkfan";
   version = "0.9.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index a69a527f68fd77195cddfa4d6a852daa0597ec77..0163d550217334da6c39b336c77943e52244342d 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -24,7 +24,8 @@ let
     ""; # use linux flags by default
 in
 stdenv.mkDerivation {
-  name = "tree-${version}";
+  pname = "tree";
+  inherit version;
 
   src = fetchurl {
     url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz";
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 849baa7159ae037ea339f4a46715f27782da530c..71a5726759c701e5649e92afc4bb6e3f5b7785fc 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "uptimed-${version}";
+  pname = "uptimed";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index 32cf56a1d74e3f3d9ff1e76bc8c7ae60a1367936..06ae286266249a2881b82ca527c79525c5badc5e 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pciutils, libx86, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "vbetool-${version}";
+  pname = "vbetool";
   version = "1.1";
 
   src = fetchurl {
-    url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+    url = "https://www.codon.org.uk/~mjg59/vbetool/download/${pname}-${version}.tar.gz";
     sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
   };
 
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index b252b74a0bddc4281f8ed365662ff2a798cf18a4..85baa3d3f30cc9f515857d60817d24a97b037830 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "20180311";
   checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7";
 
-  name = "vboot_reference-${version}";
+  pname = "vboot_reference";
 
   src = fetchgit {
     url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
index ca35dae5827c833aaf1f2eb8edc9041cf084d5a1..da502946781be1dc9c4fcd8775c6a7bf043e885e 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -2,7 +2,7 @@
 , openssl, openwsman }:
 
 stdenv.mkDerivation rec {
-  name = "wsmancli-${version}";
+  pname = "wsmancli";
   version = "2.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index 519cae03c5a5adaef2dd5e19c597e0a110bfa21a..02d90472440475aff9bc3e8e530dbc4107018011 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "xe-${version}";
+  pname = "xe";
   version = "0.11";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix
index 10d3a47cc85eb8c397cc3c0002c636eef1d873c7..a37531572d7b83f58fceb1b47e8cade2b554f784 100644
--- a/pkgs/tools/text/agrep/default.nix
+++ b/pkgs/tools/text/agrep/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "agrep-${version}";
+  pname = "agrep";
   version = "3.41.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index f53a649cd7710c019ceeb6ef41613030feba4131..7dc07664fcefee6c7369131d399bcf9e9815cd17 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "aha-${version}";
+  pname = "aha";
   version = "0.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index 2ad91a3071ed5264164e72ddb95311197efad9d6..b9a4f6782076c89351cfbc02a17ccf19c8d4e3bf 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, boost, lua }:
 
 stdenv.mkDerivation rec {
-  name = "ansifilter-${version}";
+  pname = "ansifilter";
   version = "2.14";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix
index 20777f990e26fd741ddb2c72419a50d676ea3570..b01ce7773e30879f8471b6ae5c0cd618cc90e2a6 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/pkgs/tools/text/ascii/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ascii-${version}";
+  pname = "ascii";
   version = "3.18";
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/ascii/${name}.tar.gz";
+    url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz";
     sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j";
   };
 
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index 8a8eb3117f033831242ee1985c19873def71ccb5..16d5b9995c24f3c50638621c5ac03b484310be16 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "catdoc-${version}";
+  pname = "catdoc";
   version = "0.95";
 
   src = fetchurl {
-    url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz";
+    url = "http://ftp.wagner.pp.ru/pub/catdoc/${pname}-${version}.tar.gz";
     sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
   };
 
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix
index 9f6b7a7f122783fa289e0a9e353928677571ed97..3b80af365f657c9da20b8a243d0b48c74f39e7b9 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/pkgs/tools/text/cconv/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, autoreconfHook }:
 let version = "0.6.3"; in
   stdenv.mkDerivation {
-  name = "cconv-${version}";
+  pname = "cconv";
+  inherit version;
   
   src = fetchurl {
     url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index 56a8133bd3a82fef8468412029f4acba6467559e..521b4c5b284fece7e3d1d499a233be74b09d6d76 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -2,7 +2,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "codesearch-${version}";
+  pname = "codesearch";
   version = "20150717-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
 
diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix
index 604097fbe77801c9fcf7c782dabc13dc52edd121..9a405674dc7a043d44dfcf0a31df3d9c3e35a80e 100644
--- a/pkgs/tools/text/copyright-update/default.nix
+++ b/pkgs/tools/text/copyright-update/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "copyright-update-${version}";
+  pname = "copyright-update";
   version = "2016.1018";
 
   src = fetchFromGitHub {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
     owner = "jaalto";
     repo = "project--copyright-update";
     rev = "release/${version}";
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index 7404c887a46bbf085c07122a28483204be713285..5f6b0a8a605806faa781af914067ca8e8617dcab 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dadadodo-${version}";
+  pname = "dadadodo";
   version = "1.04";
 
   src = fetchurl {
-    url = "https://www.jwz.org/dadadodo/${name}.tar.gz";
+    url = "https://www.jwz.org/dadadodo/${pname}-${version}.tar.gz";
     sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
   };
 
diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix
index cfb627d704283a62e5d3ec10f6b7c5dc041d7ed3..f43cd94a83e762abf9f28e3d82b203696e37fd8c 100644
--- a/pkgs/tools/text/diction/default.nix
+++ b/pkgs/tools/text/diction/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "diction-${version}";
+  pname = "diction";
   version = "1.13";
 
   src = fetchurl {
-    url = "http://www.moria.de/~michael/diction/${name}.tar.gz";
+    url = "http://www.moria.de/~michael/diction/${pname}-${version}.tar.gz";
     sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9";
   };
 
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index dd0d1bbc94105719965879f89b4ee73ae758d295..bd72ec947143848da704f1302b040d0b3a7f9868 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-${version}";
+  pname = "dos2unix";
   version = "7.4.0";
 
   src = fetchurl {
-    url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
+    url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
     sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs";
   };
 
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index 098eee7cf720ac94b05292e002c889b847fd36d4..6cfb4721066c5c48f004d822a56d63ee8abbcb20 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, recode }:
 
 stdenv.mkDerivation rec {
-  name = "enca-${version}";
+  pname = "enca";
   version = "1.19";
 
   src = fetchurl {
-    url = "https://dl.cihar.com/enca/${name}.tar.xz";
+    url = "https://dl.cihar.com/enca/${pname}-${version}.tar.xz";
     sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s";
   };
 
diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix
index b4418e04f03b72c9d55d99985b7d53c42e8c5927..231a16bdc1b3770c1ad8c58ff48c7c6336b6b4c7 100644
--- a/pkgs/tools/text/esh/default.nix
+++ b/pkgs/tools/text/esh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "esh-${version}";
+  pname = "esh";
   version = "0.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix
index d61a7d184ea4cee490dda31d2eaea2162ce1a843..6e9ff5170f2bc086b2f8b5d5ee31bde890cbfec5 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/pkgs/tools/text/glogg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "glogg-${version}";
+  pname = "glogg";
   version = "1.1.4";
 
   src = fetchurl {
-    url = "https://glogg.bonnefon.org/files/${name}.tar.gz";
+    url = "https://glogg.bonnefon.org/files/${pname}-${version}.tar.gz";
     sha256 = "0nwnfk9bcz2k7rf08w2cb6qipzdhwmxznik44jxmn9gwxdrdq78c";
   };
 
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 702d1b4d89facbd3ea64b6cff096055947cef24c..87c8fdfd8903f68ad9e3c590cf3cc7e664064601 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -3,7 +3,8 @@
 let version = "3.3"; in
 
 stdenv.mkDerivation {
-  name = "gnugrep-${version}";
+  pname = "gnugrep";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 8a44e434d4c1c4ecf7e950122c246b77c74cb353..3d73bfba65769dba5562330bd3e0c9668f2d87c4 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "gnused-${version}";
+  pname = "gnused";
   version = "4.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 082c61635ba95cac5bd0c5a4ca47a14105e2f3a9..a3df961756750a12ca283038c6b3dc3a6fdfac41 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "groff-${version}";
+  pname = "groff";
   version = "1.22.3";
 
   src = fetchurl {
-    url = "mirror://gnu/groff/${name}.tar.gz";
+    url = "mirror://gnu/groff/${pname}-${version}.tar.gz";
     sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
   };
 
diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix
index a04a2c65e7c35cb1d506bbb5c52c68a18c1fff7d..58f1768bfa1f74d567ff3ea3b1cc095219c8b942 100644
--- a/pkgs/tools/text/gucci/default.nix
+++ b/pkgs/tools/text/gucci/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gucci-${version}";
+  pname = "gucci";
   version = "0.1.0";
 
   goPackagePath = "github.com/noqcks/gucci";
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 46fe9ab1cd72d9ee0d353210d1616d8a1cf52a7e..eb86bc79d5c1a5008be740a0feb229832f3f5250 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "highlight-${version}";
+  pname = "highlight";
   version = "3.53";
 
   src = fetchFromGitLab {
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 1974c0aa4f36581f3bcdcc0f0900e275d78ce243..e31db4378507c2ba10a2539cf9b31a919ae8fcf6 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "html-tidy-${version}";
+  pname = "html-tidy";
   version = "5.6.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index aec238cb4ccc089a074ae924e11a451b1bde7aba..dfbe6e7b6dc141931000520e64c57837b1f24e63 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "icdiff-${version}";
+  pname = "icdiff";
   version = "1.9.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix
index 46d290b79ffbaa1ca7ddbe7777ce91318035ad82..18336fcf059f2eec4a265d6391dd9982cc3bfa66 100644
--- a/pkgs/tools/text/jsawk/default.nix
+++ b/pkgs/tools/text/jsawk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:
 
 stdenv.mkDerivation rec {
-  name = "jsawk-${version}";
+  pname = "jsawk";
   version = "1.5-pre";
   src = fetchFromGitHub {
     owner = "micha";
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index 5eea33d13a47dbbfd2973a4a7780bfa98fe7a2a5..6be7106f2b957dc442c0b8d1077ec53d894eb77d 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, cmake, protobuf }:
 stdenv.mkDerivation rec {
   pname = "jumanpp";
-  name = "${pname}-${version}";
   version = "2.0.0-rc2";
 
   src = fetchurl {
-    url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
   };
   buildInputs = [ cmake protobuf ];
diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 7254660cb1ae8b6b23fb4a1f51557eefd9c81694..600907311ef26a99d4484f4f21b552c0edaad6b0 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name    = "kytea-${version}";
+  pname = "kytea";
   version = "0.4.7";
 
   src = fetchurl {
-    url    = "http://www.phontron.com/kytea/download/${name}.tar.gz";
+    url    = "http://www.phontron.com/kytea/download/${pname}-${version}.tar.gz";
     sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
   };
 
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 1ccba80cb3e67d9b902234f8d24a24fd66ea055a..f75099e630db7b9f075f33d7afd22e3b745f87da 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "LanguageTool-${version}";
+  pname = "LanguageTool";
   version = "4.6";
 
   src = fetchzip {
-    url = "https://www.languagetool.org/download/${name}.zip";
+    url = "https://www.languagetool.org/download/${pname}-${version}.zip";
     sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index 32aeed7499f30684f5857d847e0d22ad50f74bed..bca0a5e3857933118b0c7d29a2f87059de58be2a 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "5.6.2";
   pname = "link-grammar";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+    url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k";
   };
 
diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix
index ddc7f96ec26e9d16d199958d790358e6b5a6d627..91c958cf06757d9693d12f15d985c50bc64680b0 100644
--- a/pkgs/tools/text/mb2md/default.nix
+++ b/pkgs/tools/text/mb2md/default.nix
@@ -5,7 +5,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "3.20";
-  name = "mb2md-${version}";
+  pname = "mb2md";
 
   src = fetchurl {
     url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz";
diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix
index 9896b365a6a27842ce53677cb9288b9beba8b6d6..991d0735bab277fcd2ceda50cf4cb7064d1303d3 100644
--- a/pkgs/tools/text/mecab/ipadic.nix
+++ b/pkgs/tools/text/mecab/ipadic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mecab-nodic }:
 
 stdenv.mkDerivation rec {
-  name = "mecab-ipadic-${version}";
+  pname = "mecab-ipadic";
   version = "2.7.0-20070801";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index 3e0bee3b9b98d402a22a48d74b77a4dfd5078eef..9de7efa3a8160f8716886e82c388f1e5da84ffc3 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "miller-${version}";
+  pname = "miller";
 
   version = "5.4.0";
 
diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix
index 4e3be9e17e0ca152e399524fa94059aeca01fda5..0a9b3777783bc9fffca378c9acf35d8341782863 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/pkgs/tools/text/mir-qualia/default.nix
@@ -1,7 +1,7 @@
 { lib, pythonPackages, fetchurl }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mir.qualia-${version}";
+  pname = "mir.qualia";
   version = "2.0.0";
   doCheck = false; # 2.0.0-released pytests are broken
 
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 1320f824fdf36f66aae34c1aba2a25b6845c6b13..415ff0b31b75cb10ee3879da1d844881bbdc6d7a 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -2,7 +2,7 @@
 
 
 stdenv.mkDerivation rec {
-  name = "numdiff-${version}";
+  pname = "numdiff";
   version = "5.9.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
index 48abee01830689c4882c1ee43c8e12d1814d1680..69277d0412dfcc192b5d3b73971557be059619da 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "odt2txt-${version}";
+  pname = "odt2txt";
   version = "0.5";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix
index b51f811644d1031016424986315431dd434fcaf3..9407e68ed165e74319241ad245bf2ebf4dc41ba9 100644
--- a/pkgs/tools/text/peco/default.nix
+++ b/pkgs/tools/text/peco/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "peco-${version}";
+  pname = "peco";
   version = "0.5.3";
 
   goPackagePath = "github.com/peco/peco";
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index 4b30387f7ac5ad52968559c15fdbbb36261ae1e7..342377b85aea9c61848e98730d712ab9bb57a9c5 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "the_platinum_searcher-${version}";
+  pname = "the_platinum_searcher";
   version = "2.1.5";
   rev = "v${version}";
 
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix
index ccfeabaa73bd0fdb446c327ce38e52ea1048a033..efe19a1b5ceff20d41a26203fa029a49c263b3cb 100644
--- a/pkgs/tools/text/podiff/default.nix
+++ b/pkgs/tools/text/podiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "podiff-${version}";
+  pname = "podiff";
   version = "1.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index a5864fbc051ce2c067a86765d3a7240689ab3e24..e1ac2248d22426195a283e02f9ffabbb5e990c63 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -3,7 +3,7 @@
   nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "poedit-${version}";
+  pname = "poedit";
   version = "2.2.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index c536cbbaaad42961cc24bb046cfdc452a30d052c..27e9c80bc7d57feac0d715ab9e8adba522e1a1eb 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonApplication, click, future, six }:
 
 buildPythonApplication rec {
-  name = "proselint-${version}";
+  pname = "proselint";
   version = "0.10.2";
 
   doCheck = false; # fails to pass because it tries to run in home directory
 
   src = fetchurl {
-    url = "mirror://pypi/p/proselint/${name}.tar.gz";
+    url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz";
     sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs";
   };
 
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index e3970c0590277386d56a2add58446f1d6f127f1b..9cf9349badb2f664bb29258f5154441f5f93c02f 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, qt4, perl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qshowdiff-${version}";
+  pname = "qshowdiff";
   version = "1.2";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index 9e3e4d5b41d5fa560ca1c72352c9aebf7577fefd..25e9c07f351e7756a8cbf67ca74a54a957ccb459 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "reckon-${version}";
+  pname = "reckon";
   version = (import ./gemset.nix).reckon.version;
 
   env = bundlerEnv {
-    name = "${name}-gems";
+    name = "${pname}-${version}-gems";
 
     gemdir = ./.;
   };
diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix
index bdbc97124433dad267b59efd5d4f957201e9fd29..7ac3790f8a980d45b521526c6e45bea5dd5d14e9 100644
--- a/pkgs/tools/text/rpl/default.nix
+++ b/pkgs/tools/text/rpl/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "rpl";
   version = "1.5.7";
 
diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix
index 8aadbb0b80622c29f2c96dc41b77166b7bd01e90..83ac2d4d766dce2307596873aa6ae289075eaac9 100644
--- a/pkgs/tools/text/rst2html5/default.nix
+++ b/pkgs/tools/text/rst2html5/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-
-  name = "${pname}-${version}";
   pname = "rst2html5";
   version = "1.9.4";
 
   src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
     sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73";
   };
 
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix
index 2df6cbb27a2d4cf20bd86fa52fa8ceea2131fb1a..5df4e90ff1aa6591396085aa85d2e393bcda05f1 100644
--- a/pkgs/tools/text/schema2ldif/default.nix
+++ b/pkgs/tools/text/schema2ldif/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec {
-  name = "schema2ldif-${version}";
+  pname = "schema2ldif";
   version = "1.3";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 12b57cb82dfd4a65c6ea47b61c94deaa6fe2a470..6f29cbc18f2388a9db1e8d80010f06273285027d 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "shfmt-${version}";
+  pname = "shfmt";
   version = "2.6.4";
 
   goPackagePath = "mvdan.cc/sh";
diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix
index 97c677a7f701d742170c17df21f1a10bc4890ca8..f657df5b780b83785098b38ea41869621cb8445a 100644
--- a/pkgs/tools/text/shocco/default.nix
+++ b/pkgs/tools/text/shocco/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perlPackages, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "shocco-${version}";
+  pname = "shocco";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index 421715f7c33ca781cc498e044d2b13116bb19d73..c2a4cf22ea6dde868a07fb05d50a695edf38a1d5 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "sift-${version}";
+  pname = "sift";
   version = "0.9.0";
   rev = "v${version}";
 
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 72dfa684160b05b7eda69dd88715ae108bf157cb..b37dbbf68366995e1e8d147156aaaf788409478a 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
 stdenv.mkDerivation rec {
-  name = "silver-searcher-${version}";
+  pname = "silver-searcher";
   version = "2.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index 592f9b8f1885e2c6f837d82d5c834b5ccd11433a..100124043ed7a9203f79382e3ccfbf77aa0d6e41 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "2.6";
-  name = "txt2tags-${version}";
+  pname = "txt2tags";
 
   dontBuild = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://txt2tags.googlecode.com/files/${name}.tgz";
+    url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz";
     sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530";
   };
 
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
index 361b6782526b3b9ab0126598bacebd2c5d6ab329..93611ec5531d3b50d612b711e49123cb1dd870f0 100644
--- a/pkgs/tools/text/unrtf/default.nix
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "unrtf-${version}";
+  pname = "unrtf";
   version = "0.21.9";
 
   src = fetchurl {
-    url = "https://www.gnu.org/software/unrtf/${name}.tar.gz";
+    url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz";
     sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
   };
 
diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix
index b1671ad38b53731e54f73c87d03d3827211669f3..923adf8571d1ec19464f253f61e6f7005fa5f1ef 100644
--- a/pkgs/tools/text/untex/default.nix
+++ b/pkgs/tools/text/untex/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "untex-${version}";
+  pname = "untex";
   version = "1.3";
 
   src = fetchurl {
-    url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz";
+    url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz";
     sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv";
   };
 
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 20cd5066e808efbd4a44cd484794f3cd9e0bdffc..7b08cffe42db032c65c24224d6118bd1555575b8 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.29";
-  name = "wgetpaste-${version}";
+  pname = "wgetpaste";
 
   src = fetchurl {
-    url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
+    url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2";
     sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22";
   };
   # currently zsh-autocompletion support is not installed
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 66dfa1c6b34810a3256a6db067ce38fb98904ff4..92ad2e005884b5fef301b5f47ed9b4cd4d265031 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg }:
 
 stdenv.mkDerivation rec {
-  name = "xidel-${version}";
+  pname = "xidel";
   version = "0.9.6";
 
   ## Source archive lacks file (manageUtils.sh), using pre-built package for now.
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index 0650270bb6a094d2fd214c26cea3bdaf7555963d..c373f068961e02f9d1f38bfb61821fbca2d3d35a 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "basex-${version}";
+  pname = "basex";
   version = "8.6.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 8851b8a2725c0332aef22efaaac9962bda70928b..ed19e1144691dbb442c9d18a4fc834deb5e7ac9a 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "html-xml-utils-${version}";
+  pname = "html-xml-utils";
   version = "7.7";
 
   src = fetchurl {
-    url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
+    url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
     sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr";
   };
 
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index f764a2fac07d3c60b6432ff65bc3a1def0cf1843..388dcc6b583f0e804a3bba47b0c1cff36427cd3f 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
 
 stdenv.mkDerivation rec {
-  name = "jing-trang-${version}";
+  pname = "jing-trang";
   version = "20151127";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix
index fef8b9db2ffdd012a69aa4a5027f2b18731674d9..21869cef4ee42ab5fc2991d9c9362f6d052d42cd 100644
--- a/pkgs/tools/text/xml/rnv/default.nix
+++ b/pkgs/tools/text/xml/rnv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, expat }:
 
 stdenv.mkDerivation rec {
-  name = "rnv-${version}";
+  pname = "rnv";
   version = "1.7.11";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix
index fc11e210c3cc0a462415c4ab82154418aef8cfd5..093f1b0aec7f25caf4a6712d9fc6232a5a50db22 100644
--- a/pkgs/tools/text/xml/rxp/default.nix
+++ b/pkgs/tools/text/xml/rxp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation rec {
-  name = "rxp-${version}";
+  pname = "rxp";
   version = "1.5.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix
index 5982aa3828ef5915c4dffaf932d8e697bb97c750..8dfec26e81165ba2b3c7ea356640bc9b139fe6d9 100644
--- a/pkgs/tools/text/xml/xmlformat/default.nix
+++ b/pkgs/tools/text/xml/xmlformat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
-  name = "xmlformat-${version}";
+  pname = "xmlformat";
   version = "1.04";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 55619b416320c165852586f5bfd964d642bc34f7..6e66090d88f06f8d4044143cb7916e436cdbc45d 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   version = "2.0.0";
-  name = "xurls-${version}";
+  pname = "xurls";
 
   src = fetchFromGitHub {
     owner = "mvdan";
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index c9a6b7b3d795671972fd65ab87f6b530cd8c77c5..27334bf09b4c4cd616751abbb2bf0b6c98f7524d 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -16,13 +16,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "zimwriterfs-${version}";
+  pname = "zimwriterfs";
   version = "1.0";
 
   src = fetchFromGitHub {
     owner = "wikimedia";
     repo = "openzim";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19";
   };
 
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix
index fd2cf133c0accee5268baa43675aa7cdce71655e..cb667e6b1218293895f87628932831d78fea873b 100644
--- a/pkgs/tools/typesetting/djvu2pdf/default.nix
+++ b/pkgs/tools/typesetting/djvu2pdf/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.2";
-  name = "djvu2pdf-${version}";
+  pname = "djvu2pdf";
 
   src = fetchurl {
     url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz";
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index 9240926ab5b43627c325872d8a7de3499fe0f517..a72ca698077431957755342d5941cd29f430187d 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ant, jdk, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "fop-${version}";
+  pname = "fop";
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz";
+    url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz";
     sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5";
   };
 
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
index a255779c08a3be327016baa08784c02e98798be7..c214bd3cac7e40bcad0cc22f4e4426f59619db07 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.3.0";
-  name = "git-latexdiff-${version}";
+  pname = "git-latexdiff";
 
   src = fetchFromGitLab {
     sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9";
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index d6c4fedc1434cec96bc6226409d288b78fdba48b..7fca57ab9d26155c7c3b782ae891b32474facf4f 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -8,7 +8,7 @@ assert stdenv.isDarwin -> SystemConfiguration != null
 
 stdenv.mkDerivation rec {
   version = "1.8.29";
-  name = "htmldoc-${version}";
+  pname = "htmldoc";
   src = fetchurl {
     url = "https://github.com/michaelrsweet/htmldoc/releases/download"
       + "/release-${version}/htmldoc-${version}-source.tar.gz";
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix
index fc43ed0abe27d08ef12910bbe093d5f5b59fe5ca..2c0e2f29d24f249aab10bff1b079a7a3bb410424 100644
--- a/pkgs/tools/typesetting/kindlegen/default.nix
+++ b/pkgs/tools/typesetting/kindlegen/default.nix
@@ -23,7 +23,8 @@ let
   }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported");
 
 in stdenv.mkDerivation rec {
-  name = "kindlegen-${version}";
+  pname = "kindlegen";
+  inherit version;
 
   src = fetchurl {
     inherit url;
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix
index 2b7a6f3ffb4473cd35997f8600e8020c2f06c416..064e75ecbdc10c5ded62b98ab89237a8c14e3605 100644
--- a/pkgs/tools/typesetting/mmark/default.nix
+++ b/pkgs/tools/typesetting/mmark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "mmark-${version}";
+  pname = "mmark";
   version = "1.3.6";
   rev = "v${version}";
 
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
index 3a7d7be006a108ff01d9307110f06be41511005f..cd78f63ef78c0ecfb9a34d3c4842d6d7ed1cbd8f 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation rec {
-  name = "multimarkdown-${version}";
+  pname = "multimarkdown";
   version = "4.7.1";
 
   src = fetchgit {
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index c53e8573c90f17c9adb1619eafb5f4edb623142b..9f62671a4facfedacb7ac3581816d1e5a97ede36 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
 
-  name = "odpdown-${version}";
+  pname = "odpdown";
   version = "0.4.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 42f984b8cc60badc6e4ac4e10aff205109076491..a6f38ad0bc2c5a1dbb3c2b4b9183f43b21ffec0d 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "0.9.13";
-  name = "pdf2djvu-${version}";
+  pname = "pdf2djvu";
 
   src = fetchurl {
-    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
+    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz";
     sha256 = "0qscmfii1pvnb8g7kbl1rdiqyic6ybfiw4kwvy35qqi967c1daz0";
   };
 
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix
index 3e40c9caf28ee9769b39b86d5ff8da1a0c4b4aae..c8e27fb5a6e7ac1d1cbb44cdb2e3602a46f910e9 100644
--- a/pkgs/tools/typesetting/pdf2odt/default.nix
+++ b/pkgs/tools/typesetting/pdf2odt/default.nix
@@ -14,7 +14,7 @@ let
   ];
 
 in stdenv.mkDerivation rec {
-  name = "pdf2odt-${version}";
+  pname = "pdf2odt";
   version = "20170207";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 38382689edcec93f26f8f3a8bd4f0e1cc84776a4..20da90961dda3f31219f2cc7aa3b5ddfbfad7d4a 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "pdfgrep-${version}";
+  pname = "pdfgrep";
   version = "2.1.2";
 
   src = fetchurl {
-    url = "https://pdfgrep.org/download/${name}.tar.gz";
+    url = "https://pdfgrep.org/download/${pname}-${version}.tar.gz";
     sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf";
   };
 
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 0a0f593eaa3b38ee1633decfbd9692e777589189..6a2ebb089d218521375d15893a9590f876def18b 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -29,7 +29,7 @@ let
   });
 in
   stdenv.mkDerivation rec {
-    name = "satysfi-${version}";
+    pname = "satysfi";
     version = "0.0.3";
     src = fetchFromGitHub {
       owner = "gfngfn";
diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 3145d580dc6202442c21a1e987c9555adf0ce152..9b6951001507623afe1eb2bebb834ff0dce08c66 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "scdoc-${version}";
+  pname = "scdoc";
   version = "1.9.7";
 
   src = fetchurl {
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 966d657ae7d0a1d61a5b5d7a69b635bb58c42f5d..3b6ec809869d473c1c45c90f3af450ab4c6cae97 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "sile-${version}";
+  pname = "sile";
   version = "0.9.5.1";
 
   src = fetchurl {
-    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
     sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0";
   };
 
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
index 355d7a055e8f58604b0e2078bec8ef743fe27cd5..b06b2e25fcc2c680dc809e327596903a7517f104 100644
--- a/pkgs/tools/typesetting/skribilo/default.nix
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -10,11 +10,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "skribilo-${version}";
+  pname = "skribilo";
   version = "0.9.4";
 
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz";
+    url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
     sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf";
   };
 
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix
index 1cb7b9ce9759f821a56a01e2959967fd9036a063..e1bd3922ff3ab025eb42bf54e3c1b1a97bb07857 100644
--- a/pkgs/tools/typesetting/sshlatex/default.nix
+++ b/pkgs/tools/typesetting/sshlatex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sshlatex-${version}";
+  pname = "sshlatex";
   version = "0.8";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix
index b60cbcf22ad09e274c121344ae784c3e669291d1..a03432b729ad4a76d35e3e9e971ebf1604240b0c 100644
--- a/pkgs/tools/typesetting/ted/default.nix
+++ b/pkgs/tools/typesetting/ted/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "ted";
   version = "2.23";
 
   src = fetchurl {
-    url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz";
+    url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz";
     sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z";
   };
 
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 5444914f7a4e7b534b9651f8ba3d8b4f844735b7..2513d48796e1974fad868bff94585ecd62935b65 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -2,7 +2,6 @@
  
 let auctex = stdenv.mkDerivation ( rec {
   version = "12.1";
-  name = "${pname}-${version}";
 
   # Make this a valid tex(live-new) package;
   # the pkgs attribute is provided with a hack below.
@@ -13,7 +12,7 @@ let auctex = stdenv.mkDerivation ( rec {
   outputs = [ "out" "tex" ];
 
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69";
   };
 
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 57347a12021461784ee8daeb777b35f9c3e9ab1a..c27c68741fc7cecd93b68bffbbcff86438bf5ae1 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -91,7 +91,8 @@ texliveYear = year;
 
 
 core = stdenv.mkDerivation rec {
-  name = "texlive-bin-${version}";
+  pname = "texlive-bin";
+  inherit version;
 
   inherit (common) src patches postPatch preAutoreconf postAutoreconf;
 
@@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec {
 
 inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
-  name = "texlive-core-big.bin-${version}";
+  pname = "texlive-core-big.bin";
+  inherit version;
 
   inherit (common) src patches postPatch preAutoreconf postAutoreconf;
 
@@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
 
 
 dvisvgm = stdenv.mkDerivation {
-  name = "texlive-dvisvgm.bin-${version}";
+  pname = "texlive-dvisvgm.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation {
 
 
 dvipng = stdenv.mkDerivation {
-  name = "texlive-dvipng.bin-${version}";
+  pname = "texlive-dvipng.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -318,7 +322,8 @@ latexindent = perlPackages.buildPerlPackage rec {
 inherit biber;
 bibtexu = bibtex8;
 bibtex8 = stdenv.mkDerivation {
-  name = "texlive-bibtex-x.bin-${version}";
+  pname = "texlive-bibtex-x.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -335,7 +340,8 @@ bibtex8 = stdenv.mkDerivation {
 
 
 xdvi = stdenv.mkDerivation {
-  name = "texlive-xdvi.bin-${version}";
+  pname = "texlive-xdvi.bin";
+  inherit version;
 
   inherit (common) src;
 
@@ -363,7 +369,8 @@ xdvi = stdenv.mkDerivation {
 {
 
 xindy = stdenv.mkDerivation {
-  name = "texlive-xindy.bin-${version}";
+  pname = "texlive-xindy.bin";
+  inherit version;
 
   inherit (common) src;
 
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 906d9be0f1eccf6db76e6a7dd2043c6f4037f9de..a08f32ce9c2988aba91c1724e7d8e90db61c4d9d 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "tikzit-${version}";
+  pname = "tikzit";
   version = "2.1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 523a34c0b5692eb38f7aa0a4ecb335ac5ab6d156..df9a607d4f272dc99b12f09a4a5e59062d608566 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -2,7 +2,7 @@
 , glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "xmlroff-${version}";
+  pname = "xmlroff";
   version = "0.6.2";
 
   src = fetchurl {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace "docs" ""
   '';
 
-  sourceRoot = "${name}/xmlroff/";
+  sourceRoot = "${pname}-${version}/xmlroff/";
 
   patches = [./xmlroff.patch];
 
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 711a3c00a1221b00f494e3c45a254cb925059fe4..b136e9c5ab75dce9adbedb0fb7659697dbdc64f4 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
 
 stdenv.mkDerivation rec {
-  name = "atomicparsley-${version}";
+  pname = "atomicparsley";
   version = "0.9.6";
 
   src = fetchhg {
diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix
index 4f5a348b144e43516728e46b853ce6279611e4fa..5594143bfbce2477eeb908ad19f0a5331077d8be 100644
--- a/pkgs/tools/video/bento4/default.nix
+++ b/pkgs/tools/video/bento4/default.nix
@@ -2,7 +2,7 @@
 , cmake
 }:
 stdenv.mkDerivation rec {
-  name = "bento4-${version}";
+  pname = "bento4";
   version = "1.5.1-628";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 8be0287303779af3880f16bfc7fb4e2a37773084..af56ba3e7ebb2dd20b71587c1ed976007c7702b1 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -10,7 +10,7 @@ assert opensslSupport -> openssl != null && !gnutlsSupport;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rtmpdump-${version}";
+  pname = "rtmpdump";
   version = "2015-12-30";
 
   src = fetchgit {
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index a50c7539fe05c6e288e379bb4f3573b46f633856..d75405ab309fd0db4a2480efe5ed18caafe333df 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "swftools-${version}";
+  pname = "swftools";
   version = "0.9.2";
 
   src = fetchurl {
-    url = "http://www.swftools.org/${name}.tar.gz";
+    url = "http://www.swftools.org/${pname}-${version}.tar.gz";
     sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z";
   };
 
diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix
index c51c23d62f029733e0e4fd363b6586d3c70dde3a..a87015ecf96bffa657c0bbde69e51f25fe2c5f7a 100644
--- a/pkgs/tools/video/untrunc/default.nix
+++ b/pkgs/tools/video/untrunc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, gcc, libav_12, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "untrunc-${version}";
+  pname = "untrunc";
   version = "2018.01.13";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix
index e995f9e3a4f6997c5416e48c134c803ab8014d3f..8fca318529ff603446465f20c06c63b5279a0ca5 100644
--- a/pkgs/tools/video/yamdi/default.nix
+++ b/pkgs/tools/video/yamdi/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yamdi-${version}";
+  pname = "yamdi";
   version = "1.9";
 
   # Source repo is also available here:
diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index 6ed545deb677cf64a9924098545d4d015e6780b2..e7c391806aa9e6d2ba7f8fb2e2e0a8a3a84806a7 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "amazon-ecs-cli-${version}";
+  pname = "amazon-ecs-cli";
   version = "1.15.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 37c3248b83e5de1892582b81cf6aee169c7902de..57a68b8680961b6496bcd0d898eadf74ec94c5ee 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "awless-${version}";
+  pname = "awless";
   version = "0.1.11";
 
   goPackagePath = "github.com/wallix/awless";
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 178720436a6f5e8f3c265ec3306fef8e6566f698..76813f4f246c7ea0a3efe25b4cc726cda1a31a73 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -3,7 +3,8 @@
 let version = "0.7.9";
 
 in pythonPackages.buildPythonApplication rec {
-  name = "cloud-init-${version}";
+  pname = "cloud-init";
+  inherit version;
   namePrefix = "";
 
   src = fetchurl {
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
index 5774267121136d4bab595143c785112cecc3b381..1c7613b4893fac854257e5b35303ba95ed4b330a 100644
--- a/pkgs/tools/virtualization/cloudmonkey/default.nix
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -3,8 +3,6 @@
 with python2Packages;
 
 buildPythonApplication rec {
-
-  name = "${pname}-${version}";
   pname = "cloudmonkey";
   version = "5.3.3";
 
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index c79c2e7cb35375bc8b8b3db187cf00622bf30837..a781f3a442490503521835093b0aa0aebfa29b85 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -7,7 +7,7 @@ let binPath = stdenv.lib.makeBinPath [
 ];
 in
 buildGoPackage rec {
-  name = "distrobuilder-${version}";
+  pname = "distrobuilder";
   version = "2019_10_07";
   rev = "d686c88c21838f5505c3ec14711b2413604d7f5c";
 
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index 674673f260ce628c3211908fd0295d468054853a..e8172066800d6872334fdc4fa40d494725cee299 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ec2-ami-tools-${version}";
+  pname = "ec2-ami-tools";
 
   version = "1.5.7";
 
   buildInputs = [ unzip makeWrapper ];
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip";
+    url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
     sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias";
   };
 
diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
index 7251b418d4e040c4865ddfdf74aa5655451cb87c..0daa01f85bb39e930bb220e84af601a0af36fc28 100644
--- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "google-compute-engine-oslogin-${version}";
+  pname = "google-compute-engine-oslogin";
   version = "1.5.3";
   # from packages/google-compute-engine-oslogin/packaging/debian/changelog
 
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 0db43ccfcfddf0a5e8b11021b8424edead3dd090..5abdcc23a74cce4b1c24efb09b3578d063fd3c18 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -11,7 +11,7 @@
 }:
 
 buildPythonApplication rec {
-  name = "google-compute-engine-${version}";
+  pname = "google-compute-engine";
   version = "20190124";
   namePrefix = "";
 
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index f2fdbcc670d9069b881eb23dfcb0fdb830ebf1b0..0d239547752a0087d1a48cae843173faa583ceac 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildGoPackage }:
   
 buildGoPackage rec {
-  name = "govc-${version}";
+  pname = "govc";
   version = "0.20.0";
 
   goPackagePath = "github.com/vmware/govmomi";
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
index 66618e59122a0552117e7584af28c16d42f8c877..8dbeecc56054f27741eed323fd07f155978f2507 100644
--- a/pkgs/tools/virtualization/marathonctl/default.nix
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "marathonctl-unstable-${version}";
+  pname = "marathonctl-unstable";
   version = "2017-03-06";
 
   goPackagePath = "github.com/shoenig/marathonctl";
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index 2699a7a1f36b6baee2d0fd2a045c936fca75212d..79dd4e4551adcc7ce26762b876811ecaee62ab8d 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "rootlesskit-${version}";
+  pname = "rootlesskit";
   version = "0.3.0-alpha.2";
   goPackagePath = "github.com/rootless-containers/rootlesskit";
 
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index dfb1467b54d5987976f92a7b64df1d8cc206f4bb..4a81e8fe48b179ecfb59678ac9035f90b7abd9e5 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation (rec {
   pname = "xe-guest-utilities";
-  name = "${pname}-${version}";
   version = "6.2.0";
   meta = {
     description = "Citrix XenServer Tools";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c22dab6847b58359d6eeedd14e6ac6912664835d..ce548576820d3f6fa07a783174a3b0f043a54dee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13176,7 +13176,7 @@ in
       inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
-      harfbuzz = harfbuzzFull;
+      inherit harfbuzz;
       inherit libGL;
       inherit perl;
       inherit gtk3;
@@ -14410,8 +14410,8 @@ in
   perl530Packages = recurseIntoAttrs perl530.pkgs;
   perldevelPackages = perldevel.pkgs;
 
-  perl = perl528;
-  perlPackages = perl528Packages;
+  perl = perl530;
+  perlPackages = perl530Packages;
 
   ack = perlPackages.ack;
 
@@ -18982,7 +18982,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
-    keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole
+    keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
@@ -19035,8 +19035,6 @@ in
     ffmpeg = ffmpeg_2;
   };
 
-  kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
-
   kitty = callPackage ../applications/misc/kitty {
     harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
@@ -21574,10 +21572,6 @@ in
 
   yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
 
-  yakuake = libsForQt5.callPackage ../applications/misc/yakuake {
-    inherit (kdeApplications) konsole;
-  };
-
   yarp = callPackage ../applications/science/robotics/yarp {};
 
   yarssr = callPackage ../applications/misc/yarssr { };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 87c9bd3bacfb88e9174587244522add1ce1390b6..2d34bdaabc005ea2c87b9d269beb14a8201bc3ad 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -132,7 +132,7 @@ with self; {
   };
 
   vicious = toLuaModule(stdenv.mkDerivation rec {
-    name = "vicious-${version}";
+    pname = "vicious";
     version = "2.3.1";
 
     src = fetchFromGitHub {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 442df5ec7158a8fb6059b4164fb104f98bb9b197..fb9132731fc291eec27c8f4c6058c7f2f275425e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6206,6 +6206,9 @@ let
       url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz;
       sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa";
     };
+    postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+      sed -i '/use IO::File/d' Makefile.PL
+    '';
   };
 
   FCGIClient = buildPerlModule {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eaf7cd0ae863d4d8cab11c64aa11e8acab13408..7482ec7a9b2fafbf1e6d74e160097c7e746d192a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -865,6 +865,8 @@ in {
 
   pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
 
+  pybids = callPackage ../development/python-modules/pybids { };
+
   pybind11 = callPackage ../development/python-modules/pybind11 { };
 
   pybullet = callPackage ../development/python-modules/pybullet { };
@@ -1410,6 +1412,8 @@ in {
     gui = false;
   };
 
+  delegator-py = callPackage ../development/python-modules/delegator-py { };
+
   deluge-client = callPackage ../development/python-modules/deluge-client { };
 
   arrow = callPackage ../development/python-modules/arrow { };
@@ -1506,6 +1510,8 @@ in {
 
   bidict = callPackage ../development/python-modules/bidict { };
 
+  bids-validator = callPackage ../development/python-modules/bids-validator { };
+
   binwalk = callPackage ../development/python-modules/binwalk { };
 
   binwalk-full = appendToName "full" (self.binwalk.override {
@@ -1973,12 +1979,15 @@ in {
 
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };
 
-  pytest = self.pytest_4;
-
-  pytest_4 = callPackage ../development/python-modules/pytest {
-    # hypothesis tests require pytest that causes dependency cycle
-    hypothesis = self.hypothesis.override { doCheck = false; };
-  };
+  pytest = if isPy3k then
+    callPackage ../development/python-modules/pytest {
+      # hypothesis tests require pytest that causes dependency cycle
+      hypothesis = self.hypothesis.override { doCheck = false; };
+    }
+  else callPackage ../development/python-modules/pytest/2.nix {
+      # hypothesis tests require pytest that causes dependency cycle
+      hypothesis = self.hypothesis.override { doCheck = false; };
+    };
 
   pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { };
 
@@ -3945,6 +3954,8 @@ in {
 
   ntplib = callPackage ../development/python-modules/ntplib { };
 
+  num2words = callPackage ../development/python-modules/num2words { };
+
   numba = callPackage ../development/python-modules/numba { };
 
   numcodecs = callPackage ../development/python-modules/numcodecs { };
@@ -4123,7 +4134,10 @@ in {
 
   pathlib2 = callPackage ../development/python-modules/pathlib2 { };
 
-  pathpy = callPackage ../development/python-modules/path.py { };
+  pathpy = if isPy3k then
+    callPackage ../development/python-modules/path.py { }
+  else
+    callPackage ../development/python-modules/path.py/2.nix { };
 
   paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
 
@@ -4795,10 +4809,10 @@ in {
   scipy = let
     scipy_ = callPackage ../development/python-modules/scipy { };
     scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec {
-      version = "1.2.1";
+      version = "1.2.2";
       src = oldAttrs.src.override {
         inherit version;
-        sha256 = "0g5a03jkjiqlh6h9yz508p5c9ni43735m01fivjvn6dlpjxd31g0";
+        sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1";
       };
     });
   in if pythonOlder "3.5" then scipy_1_2 else scipy_;