diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 90a9469ee54..c2aefd64c79 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -29,7 +29,7 @@ let
 in {
 
   de = buildDict {
-    shortName = "de-20030222-1";
+    shortName = "de-20030222_1";
     fullName = "German";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
@@ -38,7 +38,7 @@ in {
   };
     
   en = buildDict {
-    shortName = "en-6.0-0";
+    shortName = "en-6.0_0";
     fullName = "English";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2;
@@ -47,7 +47,7 @@ in {
   };
     
   es = buildDict {
-    shortName = "es-0.50-2";
+    shortName = "es-0.50_2";
     fullName = "Spanish";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/es/aspell-es-0.50-2.tar.bz2;
@@ -56,7 +56,7 @@ in {
   };
     
   eo = buildDict {
-    shortName = "eo-0.50-2";
+    shortName = "eo-0.50_2";
     fullName = "Esperanto";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/eo/aspell-eo-0.50-2.tar.bz2;
@@ -65,7 +65,7 @@ in {
   };
 
   fr = buildDict {
-    shortName = "fr-0.50-3";
+    shortName = "fr-0.50_3";
     fullName = "French";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2;
@@ -74,7 +74,7 @@ in {
   };
     
   it = buildDict {
-    shortName = "it-0.53-0";
+    shortName = "it-0.53_0";
     fullName = "Italian";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/it/aspell-it-0.53-0.tar.bz2;
@@ -83,7 +83,7 @@ in {
   };
     
   la = buildDict {
-    shortName = "la-20020503-0";
+    shortName = "la-20020503_0";
     fullName = "Latin";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2;
@@ -92,7 +92,7 @@ in {
   };
     
   nl = buildDict {
-    shortName = "nl-0.50-2";
+    shortName = "nl-0.50_2";
     fullName = "Dutch";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2;
@@ -105,7 +105,7 @@ in {
   };
     
   pl = buildDict {
-    shortName = "pl-6.0_20061121";
+    shortName = "pl-6.0_20061121_0";
     fullName = "Polish";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
@@ -114,7 +114,7 @@ in {
   };
      
   ru = buildDict {
-    shortName = "ru-0.99f7-1";
+    shortName = "ru-0.99f7_1";
     fullName = "Russian";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2;
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index e259e22ff01..41a6b8501ec 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }:
 
 stdenv.mkDerivation rec {
-  name = "smpeg-svn-${version}";
+  name = "smpeg-svn${version}";
   version = "390";
 
   src = fetchsvn {
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 9f53d36bb63..51666e3ba6d 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "snapshot-20130424-2245-stable";
-  name = "x264-${version}";
+  name = "x264-20130424_2245";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index a306a424ee1..50ebb1b068a 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -2,7 +2,7 @@
 , crypto ? false, libgcrypt, gnutls, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  pname = "ntfs-3g_ntfsprogs";
+  pname = "ntfs-3g";
   version = "2012.1.15";
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
 
   src = fetchurl {
-    url = "http://tuxera.com/opensource/${name}.tgz";
+    url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
     sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg";
   };
 
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index df75e7b3389..eb9aa5feaa3 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "hddtemp-0.3-beta15";
+  name = "hddtemp-0.3_beta15";
 
   db = fetchurl{
     url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 25732afa8b1..f971eb7b866 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -2,7 +2,7 @@
 
 let date = "2009-07-04"; in
   stdenv.mkDerivation rec {
-    name = "html-tidy-${date}";
+    name = "html-tidy-20090704";
 
     # According to http://tidy.sourceforge.net/, there are no new
     # release tarballs, so one has to either get the code from CVS or