diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
index 6ad66a24397..a89725f6e30 100644
--- a/pkgs/applications/altcoins/dapp.nix
+++ b/pkgs/applications/altcoins/dapp.nix
@@ -2,7 +2,7 @@
 , seth, git, solc, shellcheck, nodejs, hevm }:
 
 stdenv.mkDerivation rec {
-  name = "dapp";
+  name = "dapp-${version}";
   version = "0.5.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index c112384f3d8..d80e8b52182 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -25,7 +25,7 @@ let
     categories = "Network;";
   };
 
-  mist = stdenv.mkDerivation {
+  mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
     inherit name version;
 
     src = {
@@ -53,10 +53,10 @@ let
         --set-rpath "${atomEnv.libPath}:$out/lib/mist" \
         $out/lib/mist/mist
     '';
-  };
+  });
 in
 buildFHSUserEnv {
-  name = "mist";
+  name = "mist-${stdenv.lib.getVersion mist}";
 
   targetPkgs = pkgs: with pkgs; [
      mist
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index d02c551be8a..fd2c0993e75 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -9,7 +9,7 @@
 let fileversion = "3_1_0";
 in
 stdenv.mkDerivation rec {
-  name = "renoise";
+  name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}";
   buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
 
   src =
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index a27b5a41ac7..f1ec03cb42e 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -51,7 +51,7 @@ let
 
   in
   stdenv.mkDerivation {
-      inherit name;
+      name = "neovim-${stdenv.lib.getVersion neovim}";
       buildCommand = let bin="${neovim}/bin/nvim"; in ''
         if [ ! -x "${bin}" ]
         then
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 770eb63dc69..9bec148c7f2 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -9,9 +9,9 @@
 let
   version = "17.12.3";
 in mkDerivation rec {
-  name = "okteta";
+  name = "okteta-${version}";
   src = fetchurl {
-    url    = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz";
+    url    = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz";
     sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
   };
   meta = {
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index c3085519ec4..9b738fe3863 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  name = "gmailieer";
+  name = "gmailieer-${version}";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index a56c15bffb2..15e3d120f20 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip, jre }:
-stdenv.mkDerivation {
-  name = "atlassian-cli";
+stdenv.mkDerivation rec {
+  name = "atlassian-cli-${version}";
   version = "7.8.0";
   src = fetchzip {
-    url            = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip;
+    url            = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
     sha256         = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
     extraPostFetch = "chmod go-w $out";
   };
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index d8ce1d2c628..85a4aa02e44 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -57,6 +57,8 @@ let
       in
       stdenv.mkDerivation (args // {
 
+        name = "${args.name}-${lua.luaversion}";
+
         inherit preBuild postInstall;
 
         inherit luadeps runtimeDeps;
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 34ff510e1d8..2b25d99de2a 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -19,14 +19,13 @@ in
 stdenv.mkDerivation rec {
   major_version = "3";
   minor_version = "17";
-  version = "v${major_version}.${minor_version}";
-  tagged_version = "${major_version}_${minor_version}";
-  name = "simgrid";
+  version = "${major_version}.${minor_version}";
+  name = "simgrid-${version}";
 
   src = fetchFromGitHub {
     owner = "simgrid";
     repo = "simgrid";
-    rev = "v3_17";
+    rev = "v${major_version}_${minor_version}";
     sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
     #rev = "master";
     #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index 7bf83b5621b..0d772968416 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -8,7 +8,7 @@ in
   stdenv.mkDerivation {
     inherit version jarName;
 
-    name = "bfg-repo-cleaner";
+    name = "bfg-repo-cleaner-${version}";
 
     src = fetchurl {
       url = mavenUrl;
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index 0358f850c9a..ce251e11d32 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -10,7 +10,7 @@ let
     sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p";
   };
 in stdenv.mkDerivation {
-  name = "gitweb";
+  name = "gitweb-${stdenv.lib.getVersion git}";
 
   src = git.gitweb;
 
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index d0376ca7e3d..4d34e08529f 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -77,7 +77,7 @@ let
 
 # Lightworks expects some files in /usr/share/lightworks
 in buildFHSUserEnv rec {
-  name = "lightworks";
+  name = "lightworks-${stdenv.lib.getVersion lightworks}";
 
   targetPkgs = pkgs: [
       lightworks
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index d95aea26c8d..f990575def0 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "1.2.1";
 
-  name = "meslo-lg";
+  name = "meslo-lg-${version}";
 
   meslo-lg = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index 63dd315e8e4..1512ef39655 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "adobe-flex-sdk-4.0.0.14159-mpl";
+  name = "adobe-flex-sdk-4.0.0.14159";
 
   src = fetchurl {
     # This is the open source distribution
diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix
index 10c1107da02..57496d28860 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten/fastcomp/default.nix
@@ -15,7 +15,7 @@ let
       '';
     };
     emscriptenfastcomp = symlinkJoin {
-      name = "emscriptenfastcomp";
+      name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}";
       paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ];
       preferLocalBuild = false;
       allowSubstitutes = true;
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 5066b0a3250..2f60fb7391f 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";
+  name = "c-blosc-${version}";
   version = "1.11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 1a73a46d287..853d23c9745 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "frog";
+  name = "frog-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frog-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index 42d14d08335..61b4559ebab 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "frogdata";
+  name = "frogdata-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frogdata-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
index a6f5adb9559..395591be55b 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "libfolia";
+  name = "libfolia-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "libfolia-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
index 3bc78a96a06..b99cb4f595a 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mbt";
+  name = "mbt-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "mbt-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix
index 738e53556ba..779ec664996 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ticcutils";
+  name = "ticcutils-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ticcutils-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
index 3ab38a9e84a..c6c216f5abf 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "timbl";
+  name = "timbl-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timbl-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
index ee1579540c3..aeadb075953 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "timblserver";
+  name = "timblserver-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timblserver-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
index 8f917c2265d..ab047d0516e 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ucto";
+  name = "ucto-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ucto-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index 56b6448d253..7defa71fc0e 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "uctodata";
+  name = "uctodata-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "uctodata-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
index 34ab70e0adc..7863e596e1b 100644
--- a/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/pkgs/development/libraries/libblocksruntime/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, clang }:
 
 stdenv.mkDerivation {
-  name = "blocksruntime";
+  name = "blocksruntime-20140624";
 
   src = fetchFromGitHub {
     owner = "mackyle";
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 974563c9037..88fafaf3ae6 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "nlojet++";
+  name = "nlojet++-${version}";
   version = "4.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index a03ddb9b78a..1578593b8ae 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";
+  name = "qtinstaller-${version}";
 
   propagatedBuildInputs = [ qtdeclarative qttools ];
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 08c95b42277..aeab7b2a040 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "re2";
+  name = "re2-${version}";
   version = "20140304";
 
   src = fetchurl {
-    url = "https://re2.googlecode.com/files/${name}-${version}.tgz";
+    url = "https://re2.googlecode.com/files/${name}.tgz";
     sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb";
   };
 
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index f49456a86ea..399486c4d90 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -45,8 +45,8 @@ let
     };
   };
 
-in stdenv.mkDerivation {
-  name = "gn";
+in stdenv.mkDerivation rec {
+  name = "gn-${version}";
   version = "20180423";
   sourceRoot = ".";
 
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index fb84bbbf1df..3dc0d3fca88 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -2,7 +2,7 @@
 , beamPackages, z3, python27 }:
 
 stdenv.mkDerivation rec {
-  name = "cuter";
+  name = "cuter-${version}";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index 1d7b22ac5ee..62f33a2d251 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";
+  name = "imatix_gsl-${version}";
   version = "4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index da9b9df3cd4..1cf381beb61 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yuicompressor";
+  name = "yuicompressor-${version}";
   version = "2.4.8";
   src = fetchurl {
-    url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar";
+    url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildCommand = ''
     mkdir -p $out/{bin,lib}
     ln -s $src $out/lib/yuicompressor.jar
-    makeWrapper ${jre}/bin/java $out/bin/${name} --add-flags \
+    makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
 }
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 7a6d6c3861d..0f5ee05349d 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation rec {
 
-  name = "brlaser";
+  name = "brlaser-${version}";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "pdewacht";
     repo = "brlaser";
-    rev = "a52149823373e11f918d9e6a56eda7242935c99b";
-    sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6";
+    rev = "v${version}";
+    sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
   };
 
   buildInputs = [ cmake zlib cups ];
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index 6f9e4579a14..a80852bb027 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 {
-  name = "cups-toshiba-estudio";
+stdenv.mkDerivation rec {
+  name = "cups-toshiba-estudio-${version}";
   version = "7.51";
 
   src = fetchurl {
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
index cc1769b48df..200cc4bae05 100644
--- a/pkgs/misc/themes/gnome-breeze/default.nix
+++ b/pkgs/misc/themes/gnome-breeze/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnome-breeze";
+  name = "gnome-breeze-20160526";
   src = fetchgit {
     url = "https://github.com/dirruk1/gnome-breeze";
     sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 585144f74ed..9c133f9d5d9 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -95,7 +95,7 @@ let
     ];
   };
 in stdenv.mkDerivation {
-  name = "xquartz";
+  name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}";
 
   buildInputs = [ ruby makeWrapper ];
 
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 6596f1c34ff..93e7afdce41 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpDris2";
+  pname = "mpDris2";
+  name = "${pname}-${version}";
   version = "0.7";
 
   src = fetchurl {
-    url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz";
+    url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz";
     sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21";
   };
 
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 064c836f843..793e5c56e1f 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -3,10 +3,10 @@
 let version = "0.8"; in
 
 stdenv.mkDerivation rec {
-	name = "buildtorrent";
+	name = "buildtorrent-${version}";
 
 	src = fetchurl {
-		url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz";
+		url = "http://mathr.co.uk/blog/code/${name}.tar.gz";
 		sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
 	};
 
@@ -16,4 +16,4 @@ stdenv.mkDerivation rec {
 		license = stdenv.lib.licenses.gpl3Plus;
 		platforms = stdenv.lib.platforms.all;
 	};
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix
index 661f4f4f435..93c0f5e346b 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";
+  name = "notify-desktop-${version}";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix
index 6d5e826c7d7..65e5c9cd126 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/pkgs/tools/networking/dnstracer/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.9";
-  name = "dnstracer";
+  name = "dnstracer-${version}";
 
   src = fetchurl {
-    url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz";
+    url = "http://www.mavetju.org/download/${name}.tar.gz";
     sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f";
   };
 
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index ec6c9c19678..43aa44809ed 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.8";
-  name = "zerotierone";
+  name = "zerotierone-${version}";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index c4cb12cb693..c4af67b3b48 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, protobuf }:
 stdenv.mkDerivation rec {
-  name = "jumanpp";
+  name = "jumanpp-${version}";
   version = "2.0.0-rc2";
 
   src = fetchurl {
-    url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}-${version}.tar.xz";
+    url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz";
     sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
   };
   buildInputs = [ cmake protobuf ];