diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix
index a185c09bda6..cfcadd75740 100644
--- a/pkgs/tools/security/apg/default.nix
+++ b/pkgs/tools/security/apg/default.nix
@@ -1,8 +1,10 @@
 { lib, stdenv, fetchurl, openssl }:
 stdenv.mkDerivation rec {
-  name = "apg-2.3.0b";
+  pname = "apg";
+  version = "2.3.0b";
+
   src = fetchurl {
-    url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz";
+    url = "http://www.adel.nursat.kz/apg/download/apg-${version}.tar.gz";
     sha256 = "14lbq81xrcsmpk1b9qmqyz7n6ypf08zcxvcvp6f7ybcyf0lj1rfi";
   };
   configurePhase = ''
diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix
index bf5f26f7044..2972fc9ae55 100644
--- a/pkgs/tools/security/ccrypt/default.nix
+++ b/pkgs/tools/security/ccrypt/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, perl}:
 
-stdenv.mkDerivation {
-  name = "ccrypt-1.11";
+stdenv.mkDerivation rec {
+  pname = "ccrypt";
+  version = "1.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz";
+    url = "mirror://sourceforge/ccrypt/ccrypt-${version}.tar.gz";
     sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i";
   };
 
diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix
index 2f89c3ea585..13ac6d67feb 100644
--- a/pkgs/tools/security/chaps/default.nix
+++ b/pkgs/tools/security/chaps/default.nix
@@ -23,7 +23,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "chaps-0.42-6812";
+  pname = "chaps";
   version = "0.42-6812";
 
   src = fetchFromGitHub {
@@ -59,25 +59,25 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp ${name}/out/chapsd $out/bin/.
-    cp ${name}/out/chaps_client $out/bin/.
+    cp ${pname}-${version}/out/chapsd $out/bin/.
+    cp ${pname}-${version}/out/chaps_client $out/bin/.
 
     mkdir -p $out/lib
-    cp ${name}/out/libchaps.so.* $out/lib/.
+    cp ${pname}-${version}/out/libchaps.so.* $out/lib/.
     mkdir -p $out/lib/security
-    cp ${name}/out/pam_chaps.so $out/lib/security/.
+    cp ${pname}-${version}/out/pam_chaps.so $out/lib/security/.
 
     mkdir -p $out/include
-    cp -r ${name}/out/chaps $out/include/.
+    cp -r ${pname}-${version}/out/chaps $out/include/.
 
     mkdir -p $out/etc/dbus-1/system.d
-    cp ${name}/out/org.chromium.Chaps.conf $out/etc/dbus-1/system.d/.
+    cp ${pname}-${version}/out/org.chromium.Chaps.conf $out/etc/dbus-1/system.d/.
     mkdir -p $out/etc/dbus-1/system-services
-    cp ${name}/platform2/chaps/org.chromium.Chaps.service $out/etc/dbus-1/system-services/.
+    cp ${pname}-${version}/platform2/chaps/org.chromium.Chaps.service $out/etc/dbus-1/system-services/.
 
     mkdir -p $out/usr/share/pam-configs/chaps
     mkdir -p $out/usr/share/man/man8
-    cp ${name}/man/* $out/usr/share/man/man8/.
+    cp ${pname}-${version}/man/* $out/usr/share/man/man8/.
     '';
 
   meta = with lib; {
diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
index cab059ca33e..3e45759c51d 100644
--- a/pkgs/tools/security/dirmngr/default.nix
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -2,9 +2,10 @@
 , libiconv}:
 
 stdenv.mkDerivation rec {
-  name = "dirmngr-1.1.1";
+  pname = "dirmngr";
+  version = "1.1.1";
   src = fetchurl {
-    url = "mirror://gnupg/dirmngr/${name}.tar.bz2";
+    url = "mirror://gnupg/dirmngr/dirmngr-${version}.tar.bz2";
     sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
   };
   buildInputs = [ libgpgerror libgcrypt libassuan libksba
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index ca4666d9f07..c4e90bd94bb 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,7 +1,8 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "hologram-2018-03-19";
+  pname = "hologram";
+  version = "2018-03-19";
   rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix
index dd73e1624c7..d7a303a3672 100644
--- a/pkgs/tools/security/mbox/default.nix
+++ b/pkgs/tools/security/mbox/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, openssl, which }:
 
 stdenv.mkDerivation {
-  name = "mbox-20140526";
+  pname = "mbox";
+  version = "20140526";
 
   src = fetchFromGitHub {
     owner = "tsgates";
diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix
index 05aa8323cc9..4b96f2b42c2 100644
--- a/pkgs/tools/security/meo/default.nix
+++ b/pkgs/tools/security/meo/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }:
 
 stdenv.mkDerivation {
-  name = "meo-20121113";
+  pname = "meo";
+  version = "20121113";
 
   src = fetchhg {
     url = "http://oss.stamfest.net/hg/meo";
diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix
index 59b48f1881d..21c9586cd6c 100644
--- a/pkgs/tools/security/mkrand/default.nix
+++ b/pkgs/tools/security/mkrand/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "mkrand-0.1.0";
+stdenv.mkDerivation rec {
+  pname = "mkrand";
+  version = "0.1.0";
 
   src = fetchurl {
-    url = "https://github.com/mknight-tag/MKRAND/releases/download/v0.1.0/mkrand-0.1.0.tar.gz";
+    url = "https://github.com/mknight-tag/MKRAND/releases/download/v${version}/mkrand-${version}.tar.gz";
     sha256 = "1irwyv2j5c3606k3qbq77yrd65y27rcq3jdlp295rz875q8iq9fs";
   };
 
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
index dc3f2a8904b..02be5103cbf 100644
--- a/pkgs/tools/security/mktemp/default.nix
+++ b/pkgs/tools/security/mktemp/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, groff }:
 
-stdenv.mkDerivation {
-  name = "mktemp-1.7";
+stdenv.mkDerivation rec {
+  pname = "mktemp";
+  version = "1.7";
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
   NROFF = "${groff}/bin/nroff";
@@ -12,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz";
+    url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-${version}.tar.gz";
     sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f";
   };
 
diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix
index 0462db8859c..01e208958a5 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/pkgs/tools/security/munge/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "munge-0.5.14";
+  pname = "munge";
+  version = "0.5.14";
 
   src = fetchFromGitHub {
     owner = "dun";
     repo = "munge";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j";
   };
 
diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix
index 1944e5187d2..face92a00af 100644
--- a/pkgs/tools/security/pamtester/default.nix
+++ b/pkgs/tools/security/pamtester/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pam }:
 
 stdenv.mkDerivation rec {
-  name = "pamtester-0.1.2";
+  pname = "pamtester";
+  version = "0.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pamtester/${name}.tar.gz";
+    url = "mirror://sourceforge/pamtester/pamtester-${version}.tar.gz";
     sha256 = "1mdj1wj0adcnx354fs17928yn2xfr1hj5mfraq282dagi873sqw3";
   };
 
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index c84b9472e96..fc410f19843 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, autoreconfHook}:
-stdenv.mkDerivation {
-  name = "pwgen-2.08";
+stdenv.mkDerivation rec {
+  pname = "pwgen";
+  version = "2.08";
 
   src = fetchurl {
-    url = "https://github.com/tytso/pwgen/archive/v2.08.tar.gz";
+    url = "https://github.com/tytso/pwgen/archive/v${version}.tar.gz";
     sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f";
   };
 
diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index f8e78c66979..d87580975f1 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "super-3.30.0";
+  pname = "super";
+  version = "3.30.0";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://www.ucolick.org/~will/RUE/super/${name}-tar.gz";
+    name = "super-${version}.tar.gz";
+    url = "https://www.ucolick.org/~will/RUE/super/super-${version}-tar.gz";
     sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy";
   };
 
diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index fbe396f1fdf..9a363eb8706 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "acct-6.6.4";
+  pname = "acct";
+  version = "6.6.4";
 
   src = fetchurl {
-    url = "mirror://gnu/acct/${name}.tar.gz";
+    url = "mirror://gnu/acct/acct-${version}.tar.gz";
     sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac";
   };
 
diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix
index ac2fb338d3d..61be7e5a4a9 100644
--- a/pkgs/tools/system/actkbd/default.nix
+++ b/pkgs/tools/system/actkbd/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "actkbd-0.2.8";
+  pname = "actkbd";
+  version = "0.2.8";
 
   src = fetchurl {
-    url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2";
+    url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-${version}.tar.bz2";
     sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm";
   };
 
diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix
index 79bb3f79a99..ddea8881ca7 100644
--- a/pkgs/tools/system/bar/default.nix
+++ b/pkgs/tools/system/bar/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "bar-1.11.1";
+stdenv.mkDerivation rec {
+  pname = "bar";
+  version = "1.11.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/clpbar/clpbar/bar-1.11.1/bar_1.11.1.tar.gz";
+    url = "mirror://sourceforge/project/clpbar/clpbar/bar-${version}/bar_${version}.tar.gz";
     sha256 = "00v5cb6vzizyyhflgr62d3k8dqc0rg6wdgfyyk11c0s0r32mw3zs";
   };
 
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index d1b8d2d6afd..8f8421781e3 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -1,9 +1,11 @@
 {lib, stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}:
 
-stdenv.mkDerivation {
-  name = "cron-4.1";
+stdenv.mkDerivation rec {
+  pname = "cron";
+  version = "4.1";
+
   src = fetchurl {
-    url = "ftp://ftp.isc.org/isc/cron/cron_4.1.shar";
+    url = "ftp://ftp.isc.org/isc/cron/cron_${version}.shar";
     sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4";
   };
 
diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix
index e5d5026e629..7dc6e1fc123 100644
--- a/pkgs/tools/system/dcfldd/default.nix
+++ b/pkgs/tools/system/dcfldd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dcfldd-1.3.4-1";
+  pname = "dcfldd";
+  version = "1.3.4-1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dcfldd/${name}.tar.gz";
+    url = "mirror://sourceforge/dcfldd/dcfldd-${version}.tar.gz";
     sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m";
   };
 
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 7e96a4c01f7..6191947ac32 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.25";
+  pname = "ddrescue";
+  version = "1.25";
 
   src = fetchurl {
-    url = "mirror://gnu/ddrescue/${name}.tar.lz";
+    url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz";
     sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf";
   };
 
diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix
index 6c8e9c56cdc..41b28e6fca0 100644
--- a/pkgs/tools/system/ddrescueview/default.nix
+++ b/pkgs/tools/system/ddrescueview/default.nix
@@ -6,7 +6,6 @@ let
 in stdenv.mkDerivation rec {
   pname = "ddrescueview";
   version = "${versionBase}${versionSuffix}";
-  name = "ddrescueview-0.4alpha4";
 
   src = fetchurl {
     name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz";
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index 94a6b34ff53..4073034a9b9 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "dog-1.7";
+stdenv.mkDerivation rec {
+  pname = "dog";
+  version = "1.7";
 
   src = fetchurl {
-    url = "http://archive.debian.org/debian/pool/main/d/dog/dog_1.7.orig.tar.gz";
+    url = "http://archive.debian.org/debian/pool/main/d/dog/dog_${version}.orig.tar.gz";
     sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056";
   };
 
diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix
index 4ad654783df..e12fedd6eec 100644
--- a/pkgs/tools/system/fdisk/default.nix
+++ b/pkgs/tools/system/fdisk/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, parted, libuuid, gettext, guile }:
 
 stdenv.mkDerivation rec {
-  name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
+  pname = "gnufdisk";
+  version = "2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
 
   src = fetchurl {
-    url = "mirror://gnu/fdisk/${name}.tar.gz";
+    url = "mirror://gnu/fdisk/gnufdisk-${version}.tar.gz";
     sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3";
   };
 
diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix
index d9c639ab1c4..5fc242d533b 100644
--- a/pkgs/tools/system/gdmap/default.nix
+++ b/pkgs/tools/system/gdmap/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gtk2, pkg-config, libxml2, intltool, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "gdmap-0.8.1";
+  pname = "gdmap";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gdmap/${name}.tar.gz";
+    url = "mirror://sourceforge/gdmap/gdmap-${version}.tar.gz";
     sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
   };
 
diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix
index 374bcf0e314..15b658c9916 100644
--- a/pkgs/tools/system/gt5/default.nix
+++ b/pkgs/tools/system/gt5/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "gt5-1.4.0";
+  pname = "gt5";
+  version = "1.4.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gt5/${name}.tar.gz";
+    url = "mirror://sourceforge/gt5/gt5-${version}.tar.gz";
     sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq";
   };
 
diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix
index 5e9796396a9..f4de055a60a 100644
--- a/pkgs/tools/system/idle3tools/default.nix
+++ b/pkgs/tools/system/idle3tools/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "idle3-tools-0.9.1";
+stdenv.mkDerivation rec {
+  pname = "idle3-tools";
+  version = "0.9.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/idle3-tools/idle3-tools-0.9.1.tgz";
+    url = "mirror://sourceforge/idle3-tools/idle3-tools-${version}.tgz";
     sha256 = "00ia7xq9yldxyl9gz0mr4xa568nav14p0fnv82f2rbbkg060cy4p";
   };
 
diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix
index 2df4acba9b5..cc986d45356 100644
--- a/pkgs/tools/system/incron/default.nix
+++ b/pkgs/tools/system/incron/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchFromGitHub, bash }:
 
 stdenv.mkDerivation rec {
-  name = "incron-0.5.12";
+  pname = "incron";
+  version = "0.5.12";
   src = fetchFromGitHub {
     owner = "ar-";
     repo = "incron";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "11d5f98cjafiv9h9zzzrw2s06s2fvdg8gp64km7mdprd2xmy6dih";
   };
 
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index e7d6130ffa6..416fab94ddc 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }:
 
 let
-  pkgname = "ipmitool";
+  pname = "ipmitool";
   version = "1.8.18";
 in
 stdenv.mkDerivation {
-  name = "${pkgname}-${version}";
+  inherit pname version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m";
   };
 
diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix
index 80f808214bc..722e5a9afde 100644
--- a/pkgs/tools/system/loadwatch/default.nix
+++ b/pkgs/tools/system/loadwatch/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, ... }:
 
 stdenv.mkDerivation {
-  name = "loadwatch-1.1-1-g6d2544c";
+  pname = "loadwatch";
+  version = "1.1-1-g6d2544c";
   src = fetchgit {
     url = "git://woffs.de/git/fd/loadwatch.git";
     sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b";
diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index 798e3b3e883..4c12c9eb27d 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchFromGitHub, buildGoPackage, m4 }:
 
 buildGoPackage rec {
-  name = "localtime-2017-11-07";
+  pname = "localtime";
+  version = "2017-11-07";
 
   src = fetchFromGitHub {
     owner = "Stebalien";
diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index b8175b51483..485df4231ec 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, guile, which, ed, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "mcron-1.0.6";
+  pname = "mcron";
+  version = "1.0.6";
 
   src = fetchurl {
-    url = "mirror://gnu/mcron/${name}.tar.gz";
+    url = "mirror://gnu/mcron/mcron-${version}.tar.gz";
     sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy";
   };
 
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 8a2a3406c3e..9e176677c76 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -6,10 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.27.2";
+  pname = "monit";
+  version = "5.27.2";
 
   src = fetchurl {
-    url = "${meta.homepage}dist/${name}.tar.gz";
+    url = "${meta.homepage}dist/monit-${version}.tar.gz";
     sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw=";
   };
 
diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix
index d5fd86f231a..173de5f607f 100644
--- a/pkgs/tools/system/opencl-info/default.nix
+++ b/pkgs/tools/system/opencl-info/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }:
 
 stdenv.mkDerivation {
-  name = "opencl-info-2014-02-21";
+  pname = "opencl-info";
+  version = "2014-02-21";
 
   src = fetchFromGitHub {
     owner = "marchv";
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 8c017c42d7a..95fd4f52c39 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -5,10 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.7.0"; # with release-date database
+  pname = "pciutils";
+  version = "3.7.0"; # with release-date database
 
   src = fetchurl {
-    url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
+    url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz";
     sha256 = "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x";
   };
 
diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix
index 9afb1933e17..685697f861f 100644
--- a/pkgs/tools/system/rowhammer-test/default.nix
+++ b/pkgs/tools/system/rowhammer-test/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "rowhammer-test-20150811";
+  pname = "rowhammer-test";
+  version = "20150811";
 
   src = fetchFromGitHub {
     owner = "google";
diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix
index 5533c9a57ff..1c0bedff474 100644
--- a/pkgs/tools/system/safecopy/default.nix
+++ b/pkgs/tools/system/safecopy/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "safecopy-1.7";
+  pname = "safecopy";
+  version = "1.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/safecopy/safecopy/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/safecopy/safecopy/safecopy-${version}/safecopy-${version}.tar.gz";
     sha256 = "1zf4kk9r8za9pn4hzy1y3j02vrhl1rxfk5adyfq0w0k48xfyvys2";
   };
 
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index d0084e1f4d8..31c58bbbaaf 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sg3_utils-1.45";
+  pname = "sg3_utils";
+  version = "1.45";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/sg/p/${name}.tgz";
+    url = "http://sg.danny.cz/sg/p/sg3_utils-${version}.tgz";
     sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb";
   };