diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index e3d039e42232d..6d69c22a6da22 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -5,7 +5,8 @@
 let
   libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
 in stdenv.mkDerivation {
-  name = "gobby-unstable-2018-04-03";
+  pname = "gobby-unstable";
+  version = "2018-04-03";
   src = fetchFromGitHub {
     owner = "gobby";
     repo = "gobby";
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index 0b2e5bc377747..1b684c3ce6a0c 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }:
 
 stdenv.mkDerivation {
-  name = "meh-unstable-2015-04-11";
+  pname = "meh-unstable";
+  version = "2015-04-11";
 
   src = fetchFromGitHub {
     owner = "jhawthorn";
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index 9fec8b99c1bd0..be5994a87dad0 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
 
 stdenv.mkDerivation {
-  name = "photoflow-unstable-2018-08-28";
+  pname = "photoflow-unstable";
+  version = "2018-08-28";
 
   src = fetchFromGitHub {
     owner = "aferrero2707";
diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix
index 1eda11890e795..7ecd794c7d915 100644
--- a/pkgs/applications/misc/colort/default.nix
+++ b/pkgs/applications/misc/colort/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "colort-unstable-2017-03-12";
+  pname = "colort-unstable";
+  version = "2017-03-12";
 
   src = fetchFromGitHub {
     owner = "neeasade";
diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix
index eacc4b5758c36..54720803c1c21 100644
--- a/pkgs/applications/misc/mpvc/default.nix
+++ b/pkgs/applications/misc/mpvc/default.nix
@@ -1,7 +1,8 @@
 { stdenv, socat, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "mpvc-unstable-2017-03-18";
+  pname = "mpvc-unstable";
+  version = "2017-03-18";
 
   src = fetchFromGitHub {
     owner = "wildefyr";
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 8e990b6dffba5..3689b2a7b0970 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -2,7 +2,8 @@
 
 
 mkDerivation {
-  name = "openbrf-unstable-2016-01-09";
+  pname = "openbrf-unstable";
+  version = "2016-01-09";
 
   src = fetchFromGitHub {
     owner = "cfcohen";
diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix
index 180b66fda8ce4..4700df44d2dda 100644
--- a/pkgs/applications/misc/speedread/default.nix
+++ b/pkgs/applications/misc/speedread/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "speedread-unstable-2016-09-21";
+  pname = "speedread-unstable";
+  version = "2016-09-21";
 
   src = fetchFromGitHub {
     owner  = "pasky";
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
index e3db746ee028e..479a377db759b 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, libX11}:
 
 stdenv.mkDerivation {
-  name = "xrq-unstable-2016-01-15";
+  pname = "xrq-unstable";
+  version = "2016-01-15";
 
   src = fetchFromGitHub {
 	  owner = "arianon";
diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix
index 27adb2cefc5fc..510439219c882 100644
--- a/pkgs/applications/networking/irc/qweechat/default.nix
+++ b/pkgs/applications/networking/irc/qweechat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
+  pname = "qweechat-unstable";
   version = "2016-07-29";
-  name = "qweechat-unstable-${version}";
   namePrefix = "";
 
- src = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "weechat";
     repo = "qweechat";
     rev = "f5e54d01691adb3abef47e051a6412186c33313c";
diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix
index 273d2d8c8e37c..7686d397f3a16 100644
--- a/pkgs/applications/radio/kalibrate-hackrf/default.nix
+++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }:
 
 stdenv.mkDerivation {
-  name = "kalibrate-hackrf-unstable-20160827";
+  pname = "kalibrate-hackrf-unstable";
+  version = "20160827";
 
   # There are no tags/releases, so use the latest commit from git master.
   # Currently, the latest commit is from 2016-07-03.
diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix
index 7502a4ffd2abf..d4ff634bb155f 100644
--- a/pkgs/applications/science/biology/EZminc/default.nix
+++ b/pkgs/applications/science/biology/EZminc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }:
 
 stdenv.mkDerivation rec {
-  pname = "EZminc";
-  name  = "${pname}-unstable-2019-03-12";
+  pname = "EZminc-unstable";
+  version = "2019-03-12";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
-    repo   = pname;
+    repo   = "EZminc";
     rev    = "5e3333ee356f914d34d66d33ea8df809c7f7fa51";
     sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4";
   };
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/BIC-MNI/${pname}";
+    homepage = "https://github.com/BIC-MNI/EZminc";
     description = "Collection of Perl and shell scripts for processing MINC files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index c1cf9034c02a3..f495fbc041df0 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "aspino-unstable-2017-03-09";
+  pname = "aspino-unstable";
+  version = "2017-03-09";
 
   src = fetchFromGitHub {
     owner = "alviano";
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index efdd86f0ab2dc..cfda82ae4890b 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -3,7 +3,8 @@
 , gmp, mpfr, glog, gflags, libjpeg_turbo }:
 
 stdenv.mkDerivation {
-  name = "openmvs-unstable-2018-05-26";
+  pname = "openmvs-unstable";
+  version = "2018-05-26";
 
   src = fetchFromGitHub {
     owner = "cdcseacave";
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
index e52e33ec544ad..cd853c2c685eb 100644
--- a/pkgs/applications/window-managers/bspwm/unstable.nix
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
 
 stdenv.mkDerivation {
-  name = "bspwm-unstable-2016-09-30";
+  pname = "bspwm-unstable";
+  version = "2016-09-30";
 
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index 9b9b2dea13283..6308a37090926 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a";
-  name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}";
+  pname = "i3lock-fancy-unstable";
+  version = "2018-11-25";
   src = fetchFromGitHub {
     owner = "meskarune";
     repo = "i3lock-fancy";
-    inherit rev;
+    rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a";
     sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1";
   };
   patchPhase = ''
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index a70e5a4dc5c08..dd4f52225ce87 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, perl, libxcb, libXft }:
 
 stdenv.mkDerivation {
-  name = "lemonbar-xft-unstable-2016-02-17";
+  pname = "lemonbar-xft-unstable";
+  version = "2016-02-17";
 
   src = fetchFromGitHub {
     owner  = "krypt-n";
diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix
index 4f5b2e972e13f..d96c7ac877a2c 100644
--- a/pkgs/data/misc/brise/default.nix
+++ b/pkgs/data/misc/brise/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, librime }:
 
 stdenv.mkDerivation {
-  name = "brise-unstable-2017-09-16";
+  pname = "brise-unstable";
+  version = "2017-09-16";
 
   src = fetchFromGitHub {
     owner = "rime";
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index fd3ade0c64b50..7ec2e40e45d4e 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -1,8 +1,7 @@
 {stdenv, fetchgit, coq, python27}:
 
 stdenv.mkDerivation rec {
-
-  name = "coq-fiat-${coq.coq-version}-unstable-${version}";
+  pname = "coq-fiat-unstable";
   version = "2016-10-24";
 
   src = fetchgit {
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index a1924f59a8db0..2939b1fcfebd7 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, fetchpatch, premake4 }:
 
 stdenv.mkDerivation {
-  name = "bootil-unstable-2015-12-17";
+  pname = "bootil-unstable";
+  version = "2015-12-17";
 
   meta = {
     description = "Garry Newman's personal utility library";
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index c2cb8a836bfab..aec495b26c704 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
 
 stdenv.mkDerivation {
-  name = "tremor-unstable-2018-03-16";
+  pname = "tremor-unstable";
+  version = "2018-03-16";
 
   src = fetchgit {
     url = "https://git.xiph.org/tremor.git";
diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix
index 1591a1efd17a2..85671b5f1c9de 100644
--- a/pkgs/development/misc/rpiboot/unstable.nix
+++ b/pkgs/development/misc/rpiboot/unstable.nix
@@ -1,10 +1,8 @@
 { stdenv, fetchFromGitHub, libusb1 }:
 
-let
+stdenv.mkDerivation {
+  pname = "rpiboot-unstable";
   version = "2018-03-27";
-  name = "rpiboot-unstable-${version}";
-in stdenv.mkDerivation {
-  inherit name;
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix
index 8e8f438b5e1a7..1814f1bc53e5a 100644
--- a/pkgs/development/tools/analysis/pev/default.nix
+++ b/pkgs/development/tools/analysis/pev/default.nix
@@ -1,6 +1,7 @@
 { stdenv, openssl, fetchFromGitHub }:
 stdenv.mkDerivation {
-  name = "pev-unstable-2018-07-22";
+  pname = "pev-unstable";
+  version = "2018-07-22";
   buildInputs = [ openssl ];
   src = fetchFromGitHub {
     owner = "merces";
diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix
index e6c562721c280..9cf8c701d4e3b 100644
--- a/pkgs/development/tools/kexpand/default.nix
+++ b/pkgs/development/tools/kexpand/default.nix
@@ -1,7 +1,8 @@
 { buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
-  name = "kexpand-unstable-2017-05-12";
+  pname = "kexpand-unstable";
+  version = "2017-05-12";
 
   goPackagePath = "github.com/kopeio/kexpand";
 
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index b789a99578dd0..90c8501491c55 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
-  name = "manul-unstable-2016-09-30";
+  pname = "manul-unstable";
+  version = "2016-09-30";
 
   goPackagePath = "github.com/kovetskiy/manul";
   excludedPackages = "tests";
diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix
index aad53a7915a5b..5c72767b443fa 100644
--- a/pkgs/games/gmad/default.nix
+++ b/pkgs/games/gmad/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, premake4, bootil }:
 
 stdenv.mkDerivation rec {
-  name = "gmad-unstable-2015-04-16";
+  pname = "gmad-unstable";
+  version = "2015-04-16";
 
   meta = {
     description = "Garry's Mod Addon Creator and Extractor";
diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
index 9b68a49266f57..0af9d94d0805e 100644
--- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub }:
 with stdenv.lib;
 stdenv.mkDerivation {
-  name = "rtl8192su-unstable-2016-10-05";
+  pname = "rtl8192su-unstable";
+  version = "2016-10-05";
 
   src = fetchFromGitHub {
     owner = "chunkeey";
diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 0f244c4d6866b..2634979791900 100644
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, zsh }:
 
 stdenv.mkDerivation {
-  name = "lambda-mod-zsh-theme-unstable-2019-04-17";
+  pname = "lambda-mod-zsh-theme-unstable";
+  version = "2019-04-17";
 
   src = fetchFromGitHub {
     owner = "halfo";
diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix
index 023bf4577740d..6d15fac20ac16 100644
--- a/pkgs/tools/audio/picotts/default.nix
+++ b/pkgs/tools/audio/picotts/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
 
 stdenv.mkDerivation {
-  name = "picotts-unstable-2018-10-19";
+  pname = "picotts-unstable";
+  version = "2018-10-19";
   src = fetchFromGitHub {
     repo = "picotts";
     owner = "naggety";
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix
index 8a7423eea1f4c..79fcd217211a0 100644
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh";
   };
   # # See "12.2. Package naming"
-  # name = "skktools-unstable-${version}";
+  # pname = "skktools-unstable";
   # version = "2017-03-05";
   # src = fetchFromGitHub {
   #   owner = "skk-dev";
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index 6c2cbd2574427..9aadb50728f5c 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub } :
 
 stdenv.mkDerivation rec {
-  pname = "fasd";
-  name = "${pname}-unstable-2016-08-11";
+  pname = "fasd-unstable";
+  version = "2016-08-11";
 
   src = fetchFromGitHub {
     owner = "clvv";
-    repo = pname;
+    repo = "fasd";
     rev = "90b531a5daaa545c74c7d98974b54cbdb92659fc";
     sha256 = "0i22qmhq3indpvwbxz7c472rdyp8grag55x7iyjz8gmyn8gxjc11";
   };
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/clvv/${pname}";
+    homepage = "https://github.com/clvv/fasd";
     description = "Quick command-line access to files and directories for POSIX shells";
     license = stdenv.lib.licenses.mit;
 
diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
index 0b5deccaa904c..ce08b9f40ad44 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "git-fire-unstable-2017-08-27";
+  pname = "git-fire-unstable";
+  version = "2017-08-27";
 
   src = fetchFromGitHub {
     owner = "qw3rtman";
diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index 73907e233ab04..7646a4226e538 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage {
-  name = "loop-unstable-2018-12-04";
+  pname = "loop-unstable";
+  version = "2018-12-04";
 
   src = fetchFromGitHub {
     owner = "Miserlou";
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix
index 00f1899f97afb..d70c1b89fddf6 100644
--- a/pkgs/tools/misc/xdxf2slob/default.nix
+++ b/pkgs/tools/misc/xdxf2slob/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication {
-  name = "xdxf2slob-unstable-2015-06-30";
+  pname = "xdxf2slob-unstable";
+  version = "2015-06-30";
 
   src = fetchFromGitHub {
     owner = "itkach";