diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index e79038f688cc..e7957e866f1a 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -49,7 +49,7 @@ rec {
 		export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
             '') ["minInit" "doUnpack" "makeDocsWork"];
 
-  name = "Snd-" + version;
+  name = "snd-" + version;
   meta = {
     description = "Snd sound editor.";
     homepage = http://ccrma.stanford.edu/software/snd;
diff --git a/pkgs/applications/audio/sonic-visualizer/default.nix b/pkgs/applications/audio/sonic-visualizer/default.nix
index c06c73d8a0cf..08b300b1c115 100644
--- a/pkgs/applications/audio/sonic-visualizer/default.nix
+++ b/pkgs/applications/audio/sonic-visualizer/default.nix
@@ -1,11 +1,12 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
 args: with args;
+
 stdenv.mkDerivation {
 
 #TODO add plugins!
 
-  name = "sonic-visualizer";
+  name = "sonic-visualizer-1.6";
 
   src = fetchurl {
     url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2;
@@ -19,7 +20,6 @@ stdenv.mkDerivation {
     # portaudio
     pulseaudio
     libmad
-
     libogg # ?
     # fishsound
     liblo
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-    description = "view and analyse contents of music audio files";
+    description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     license = "GPLv2";
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index 9010c36a5a8b..b4279bccbe5c 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -1,7 +1,7 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name="xneur";
+  name = "xneur-0.8.0";
   src = fetchurl {
     url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/kphone/default.nix
index d26d28797a23..c631fb35c112 100644
--- a/pkgs/applications/networking/kphone/default.nix
+++ b/pkgs/applications/networking/kphone/default.nix
@@ -1,19 +1,19 @@
 args: with args;
+
 stdenv.mkDerivation {
-  name = "kphone";
+  name = "kphone-1.2";
 
   src = fetchurl {
     url = mirror://sourceforge/kphone/files/KPhone%20SI/KPhoneSIv1.2/kphoneSI_1.2.tar.gz;
     sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
   };
 
-  buildInputs = [autoconf automake libtool qt pkgconfig
-    openssl libpng alsaLib
-    libX11 libXext libXt libICE libSM libX11
+  buildInputs =
+    [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
+      libX11 libXext libXt libICE libSM libX11
     ];
-  preConfigure = ''
-    autoconf
-  '';
+    
+  preConfigure = "autoconf";
 
   meta = {
     description = "KPhone is a SIP UA for Linux";
diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/4.12.nix
index e39aa72e8cf7..6aa47a490bd6 100644
--- a/pkgs/applications/window-managers/fbpanel/4.12.nix
+++ b/pkgs/applications/window-managers/fbpanel/4.12.nix
@@ -12,7 +12,7 @@ args : with args;
 	}; /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "fbpanel";
+	name = "fbpanel-4.12";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 7acd9f827854..7a8d12dee505 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,5 +1,7 @@
-args: with args; stdenv.mkDerivation {
-  name = "icewm";
+args: with args;
+
+stdenv.mkDerivation {
+  name = "icewm-1.2.32";
 
   buildInputs = [ gettext libX11 libXft libXext libXinerama libXrandr libjpeg libtiff libungif libpng imlib ];
 
@@ -9,7 +11,7 @@ args: with args; stdenv.mkDerivation {
   };
 
   meta = {
-    description = "IceWM is a window manager for the X Window System.";
-    homepage = "http://www.icewm.org";
+    description = "A window manager for the X Window System";
+    homepage = http://www.icewm.org/;
   };
 }
diff --git a/pkgs/development/compilers/webdsl/default.nix b/pkgs/development/compilers/webdsl/default.nix
index 961f68b50302..6c878717220e 100644
--- a/pkgs/development/compilers/webdsl/default.nix
+++ b/pkgs/development/compilers/webdsl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, strategoPackages}:
 
 stdenv.mkDerivation rec {
-  name = "webdsl-9.7pre3056.tar.gz";
+  name = "webdsl-9.7pre3056";
 
   src = fetchurl {
     url = "http://hydra.nixos.org/build/71896/download/1/webdsl-9.7pre3056.tar.gz";
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 27075d1cca63..753c0f8ee778 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation rec {
-  name = "Yap-5.1.1";
+{ stdenv, fetchurl }:
+        
+stdenv.mkDerivation rec {
+  name = "yap-5.1.1";
 
-  src = args.fetchurl {
-    url = "http://downloads.sourceforge.net/yap/${name}.tar.gz";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/yap/Yap-5.1.1.tar.gz";
     sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
-      homepage = http://yap.sourceforge.net/;
-      license = "artistic";
+    description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
+    homepage = http://yap.sourceforge.net/;
+    license = "artistic";
   };
 }
diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix
index ec7f4adf0316..82367600467f 100644
--- a/pkgs/development/libraries/lib3ds/default.nix
+++ b/pkgs/development/libraries/lib3ds/default.nix
@@ -1,18 +1,19 @@
-args:
-args.stdenv.mkDerivation {
-  name = "lib3ds";
+{ stdenv, fetchurl, unzip }:
+        
+stdenv.mkDerivation rec {
+  name = "lib3ds-1.3.0";
 
-  src = args.fetchurl {
-    url = mirror://sourceforge/lib3ds/lib3ds-1.3.0.zip;
+  src = fetchurl {
+    url = "mirror://sourceforge/lib3ds/${name}.zip";
     sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m";
   };
 
-  buildInputs =(with args; [unzip]);
+  buildInputs = [ unzip ];
 
   meta = { 
-      description = "library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
-      homepage = http://lib3ds.sourceforge.net/;
-      license = "LGPL";
-    };
+    description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
+    homepage = http://lib3ds.sourceforge.net/;
+    license = "LGPL";
+  };
 }
 
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index d8f75d1b4c3e..a2235da408e3 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -1,19 +1,18 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "liblo";
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "liblo-0.26";
 
   src = fetchurl {
-    url = mirror://sourceforge/liblo/liblo/0.26/liblo-0.26.tar.gz;
+    url = "mirror://sourceforge/liblo/liblo/0.26/${name}.tar.gz";
     sha256 = "0n124fv9m8yjxs2yxnp3l1i30b8qgg1zx51y63ax12hpz04zndm6";
   };
 
-  buildInputs = [];
-
   meta = { 
     description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
     homepage = http://sourceforge.net/projects/liblo;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix
index 2009e92a54d4..20793eb3140f 100644
--- a/pkgs/development/libraries/liboop/default.nix
+++ b/pkgs/development/libraries/liboop/default.nix
@@ -1,14 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "liboop";
+  name = "liboop-1.0";
+  
   src = fetchurl {
     url = http://download.ofb.net/liboop/liboop.tar.gz;
     sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c";
   };
 
-  buildInputs = [];
-
   meta = {
     description = "`liboop', an event loop library.";
     homepage = http://liboop.ofb.net/;
diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index 6b9d70fb6be2..c968fd352eb8 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,23 +1,25 @@
-args:
-args.stdenv.mkDerivation {
-  name = "libQGLviewer";
+{ stdenv, fetchurl, qt4 }:
 
-  src = args.fetchurl {
-    url = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/libQGLViewer-2.2.6-3.tar.gz;
-    sha256 = "05vjl7af87dhzrdigm941by9c137g8wyca46h3pvhnmr4pgb0ic9";
+stdenv.mkDerivation rec {
+  name = "libQGLViewer-2.3.4";
+
+  src = fetchurl {
+    url = "http://www.libqglviewer.com/src/${name}.tar.gz";
+    sha256 = "01b9x2n3v5x3zkky2bjpgbhn5bglqn4gd7x5j5p7y2dw0jnzz7j0";
   };
 
-  buildInputs =(with args; [qt4]);
+  buildInputs = [ qt4 ];
 
-  buildPhase = "
-   cd QGLViewer
-   qmake PREFIX=\$out
-   make
-   ";
+  buildPhase =
+    ''
+      cd QGLViewer
+      qmake PREFIX=$out
+      make
+    '';
 
   meta = { 
-      description = "trackball-based 3D viewer qt widget including many useful features";
-      homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html;
-      license = "GPL2";
+    description = "trackball-based 3D viewer qt widget including many useful features";
+    homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index a57f7135cdb5..857197ea0c1b 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,9 +1,10 @@
 args: with args;
-stdenv.mkDerivation {
-  name = "libzrtpcpp-1.4.1.tar";
+
+stdenv.mkDerivation rec {
+  name = "libzrtpcpp-1.4.1";
 
   src = fetchurl {
-    url = mirror://gnu/ccrtp/libzrtpcpp-1.4.1.tar.gz;
+    url = "mirror://gnu/ccrtp/${name}.tar.gz";
     sha256 = "0gj5xiv15xnxdbppa06fy02j8jg0zm1capva4nhbpgzg08n7p8y0";
   };
 
diff --git a/pkgs/development/tools/misc/texitohtml/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
similarity index 52%
rename from pkgs/development/tools/misc/texitohtml/default.nix
rename to pkgs/development/tools/misc/texi2html/default.nix
index db200610a555..2089142284f4 100644
--- a/pkgs/development/tools/misc/texitohtml/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -1,9 +1,10 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "texi2html";
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "texi2html-1.82";
 
   src = fetchurl {
-    url = http://www.very-clever.com/download/nongnu/texi2html/texi2html-1.82.tar.bz2;
+    url = "http://www.very-clever.com/download/nongnu/texi2html/${name}.tar.bz2";
     sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n";
   };
 
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
     description = "Perl script which converts Texinfo source files to HTML output";
     homepage = http://www.nongnu.org/texi2html/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 397a6033d626..6939d4a86a6c 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk, glib, pango, libglade }:
 
 stdenv.mkDerivation rec {
-  name = "sysprof-1.0.10";
+  name = "sysprof-1.0.10-${kernel.version}";
 
   src = fetchurl {
     url = "http://www.daimi.au.dk/~sandmann/sysprof/${name}.tar.gz";
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index a3345f69bc02..19de62990e2c 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,24 +1,25 @@
-{stdenv, fetchurl, libX11, xextproto, libXtst, imake,
-libXi, libXext}:
-stdenv.mkDerivation {
-  name = "keynav";
+{ stdenv, fetchurl, libX11, xextproto, libXtst, imake, libXi, libXext }:
 
-  src = 
-	fetchurl {
-		url = http://www.semicomplete.com/files/keynav/keynav-20070903.tar.gz;
-		sha256 = "037mbgm78jwy0qd0z691pgx4zcpkk5544fx8ajm2mx4y80k2d9kk";
-	};
+stdenv.mkDerivation rec {
+  name = "keynav-20070903";
+
+  src = fetchurl {
+    url = "http://www.semicomplete.com/files/keynav/${name}.tar.gz";
+    sha256 = "037mbgm78jwy0qd0z691pgx4zcpkk5544fx8ajm2mx4y80k2d9kk";
+  };
 
   buildInputs = [libX11 xextproto libXtst imake libXi libXext];
 
-  NIX_LDFLAGS=" -lXext ";
+  NIX_LDFLAGS = "-lXext";
 
-  installPhase = "
-	mkdir -p \$out/bin \$out/share/keynav/doc;
-	cp keynav \$out/bin; cp keynavrc \$out/share/keynav/doc
-	";
+  installPhase =
+    ''
+      mkdir -p $out/bin $out/share/keynav/doc
+      cp keynav $out/bin
+      cp keynavrc $out/share/keynav/doc
+    '';
 
-  meta ={
-	description = "A tool to generate X11 mouse clicks from keyboard.";
+  meta = {
+    description = "A tool to generate X11 mouse clicks from keyboard.";
   };
 }
diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix
index 41dfca2f2c9d..1063cdd8ee67 100644
--- a/pkgs/tools/X11/xlaunch/default.nix
+++ b/pkgs/tools/X11/xlaunch/default.nix
@@ -1,4 +1,7 @@
 args: with args;
+
+# !!! What does this package do, and does it belong in Nixpkgs?
+
 stdenv.mkDerivation {
 	name = "xlaunch";
 	inherit xorgserver;
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index 4cceb720e192..c0e3b9ac2f93 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,6 +1,7 @@
 args: with args;
+
 stdenv.mkDerivation {
-  name = "xmacro";
+  name = "xmacro-0.3pre20000911";
 
   src = fetchurl {
     url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fc43f7e4e06..9ca7725f7b37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2969,8 +2969,8 @@ let
     inherit fetchurl stdenv ncurses lzma;
   };
 
-  texi2html = import ../development/tools/misc/texitohtml {
-    inherit fetchurl stdenv lib perl;
+  texi2html = import ../development/tools/misc/texi2html {
+    inherit fetchurl stdenv perl;
   };
 
   uisp = import ../development/tools/misc/uisp {
@@ -3807,7 +3807,7 @@ let
   };
 
   liblo = import ../development/libraries/liblo {
-    inherit fetchurl stdenv lib;
+    inherit fetchurl stdenv;
   };
 
   libev = builderDefsPackage ../development/libraries/libev {
@@ -7685,7 +7685,7 @@ let
     inherit (xlibs) libXmu;
   };
 
-  sndBase =  builderDefsPackage (import ../applications/audio/snd) {
+  sndBase = builderDefsPackage (import ../applications/audio/snd) {
     inherit fetchurl stdenv stringsWithDeps lib fftw;
     inherit pkgconfig gmp gettext;
     inherit (xlibs) libXpm libX11;
@@ -8587,8 +8587,7 @@ let
 
   keynav = import ../tools/X11/keynav {
     inherit stdenv fetchurl;
-    inherit (xlibs) libX11 xextproto libXtst
-    imake libXi libXext;
+    inherit (xlibs) libX11 xextproto libXtst imake libXi libXext;
   };
 
   lazylist = import ../misc/tex/lazylist {