diff --git a/pkgs/desktops/gnome/GConf/default.nix b/pkgs/desktops/gnome/GConf.nix
similarity index 100%
rename from pkgs/desktops/gnome/GConf/default.nix
rename to pkgs/desktops/gnome/GConf.nix
diff --git a/pkgs/desktops/gnome/ORBit2/default.nix b/pkgs/desktops/gnome/ORBit2.nix
similarity index 100%
rename from pkgs/desktops/gnome/ORBit2/default.nix
rename to pkgs/desktops/gnome/ORBit2.nix
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6484f7adcfa3..f433658cf683 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -22,86 +22,86 @@ rec {
 
   gtk = gtkLibs.gtk;
 
-  esound = (import ./esound) {
+  esound = (import ./esound.nix) {
     inherit fetchurl stdenv audiofile;
     input = platform.esound;
   };
 
-  libIDL = (import ./libIDL) {
+  libIDL = (import ./libIDL.nix) {
     inherit fetchurl stdenv pkgconfig glib;
     input = platform.libIDL;
     lex = flex;
     yacc = bison;
   };
 
-  ORBit2 = (import ./ORBit2) {
+  ORBit2 = (import ./ORBit2.nix) {
     inherit fetchurl stdenv pkgconfig glib libIDL popt;
     input = platform.ORBit2;
   };
 
-  GConf = (import ./GConf) {
+  GConf = (import ./GConf.nix) {
     inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt;
     input = platform.GConf;
   };
 
-  gnomemimedata = (import ./gnome-mime-data) {
+  gnomemimedata = (import ./gnome-mime-data.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser;
     input = platform.gnomemimedata;
   };
 
-  gnomevfs = (import ./gnome-vfs) {
+  gnomevfs = (import ./gnome-vfs.nix) {
     inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf
             libbonobo gnomemimedata popt perlXMLParser gettext bzip2;
     input = platform.gnomevfs;
   };
 
-  gail = (import ./gail) {
+  gail = (import ./gail.nix) {
     inherit fetchurl stdenv pkgconfig;
     inherit gtk atk libgnomecanvas;
     input = platform.gail;
   };
 
-  libgnome = (import ./libgnome) {
+  libgnome = (import ./libgnome.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs
             libbonobo GConf popt zlib esound;
     input = platform.libgnome;
   };
 
-  libart_lgpl = (import ./libart_lgpl) {
+  libart_lgpl = (import ./libart_lgpl.nix) {
     inherit fetchurl stdenv;
     input = platform.libart_lgpl;
   };
 
-  libglade = (import ./libglade) {
+  libglade = (import ./libglade.nix) {
     inherit fetchurl stdenv pkgconfig gtk libxml2;
     input = platform.libglade;
   };
 
-  libgnomecanvas = (import ./libgnomecanvas) {
+  libgnomecanvas = (import ./libgnomecanvas.nix) {
     inherit fetchurl stdenv pkgconfig gtk libglade;
     libart = libart_lgpl;
     input = platform.libgnomecanvas;
   };
 
-  libbonobo = (import ./libbonobo) {
+  libbonobo = (import ./libbonobo.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex;
     yacc = bison;
     input = platform.libbonobo;
   };
 
-  libbonoboui = (import ./libbonoboui) {
+  libbonoboui = (import ./libbonoboui.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade
             libgnome libgnomecanvas gettext;
     input = platform.libbonoboui;
   };
 
-  libgnomeui = (import ./libgnomeui) {
+  libgnomeui = (import ./libgnomeui.nix) {
     inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas
             libbonoboui libglade libjpeg esound gnomekeyring;
     input = platform.libgnomeui;
   };
 
-  intltool = (import ./intltool) {
+  intltool = (import ./intltool.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser;
     input = platform.intltool;
   };
@@ -113,7 +113,7 @@ rec {
     inherit fetchurl;
   };
 
-  libgnomeprint = (import ./libgnomeprint) {
+  libgnomeprint = (import ./libgnomeprint.nix) {
     inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt
          bison flex;
     inherit glib pango;
@@ -121,13 +121,13 @@ rec {
     input = desktop.libgnomeprint;
   };
 
-  libgnomeprintui = (import ./libgnomeprintui) {
+  libgnomeprintui = (import ./libgnomeprintui.nix) {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig;
     inherit gtk libgnomeprint libgnomecanvas gnomeicontheme;
     input = desktop.libgnomeprintui;
   };
 
-  gtkhtml = (import ./gtkhtml) {
+  gtkhtml = (import ./gtkhtml.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext;
     inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme;
     input = desktop.gtkhtml;
@@ -135,53 +135,53 @@ rec {
 
   libgtkhtml = gtkhtml;
 
-  gnomeicontheme = (import ./gnome-icon-theme) {
+  gnomeicontheme = (import ./gnome-icon-theme.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser;
     input = desktop.gnomeicontheme;
   };
 
-  gnomekeyring = (import ./gnome-keyring) {
+  gnomekeyring = (import ./gnome-keyring.nix) {
     inherit fetchurl stdenv pkgconfig glib gtk;
     input = desktop.gnomekeyring;
   };
 
-  gtksourceview = (import ./gtksourceview) {
+  gtksourceview = (import ./gtksourceview.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2
             libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */
             GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */;
     input = desktop.gtksourceview;
   };
 
-  scrollkeeper = (import ./scrollkeeper) {
+  scrollkeeper = (import ./scrollkeeper.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser
             libxml2 libxslt docbook_xml_dtd_42;
     input = desktop.scrollkeeper;
   };
 
-  gnomedesktop = (import ./gnome-desktop) {
+  gnomedesktop = (import ./gnome-desktop.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk
             libgnomeui scrollkeeper libjpeg;
     input = desktop.gnomedesktop;
   };
 
-  libwnck = (import ./libwnck) {
+  libwnck = (import ./libwnck.nix) {
     inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext;
     input = desktop.libwnck;
   };
 
-  gnomepanel = (import ./gnome-panel) {
+  gnomepanel = (import ./gnome-panel.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2
             libgnome libgnomeui gnomedesktop libglade libwnck
             libjpeg libpng scrollkeeper libXmu;
     input = desktop.gnomepanel;
   };
 
-  libsoup = (import ./libsoup) {
+  libsoup = (import ./libsoup.nix) {
     inherit stdenv fetchurl pkgconfig libxml2 glib;
     input = desktop.libsoup;
   };
   
-  startupnotification = (import ./startup-notification) {
+  startupnotification = (import ./startup-notification.nix) {
     inherit stdenv fetchurl pkgconfig x11;
     input = desktop.startupnotification;
   };
diff --git a/pkgs/desktops/gnome/esound/default.nix b/pkgs/desktops/gnome/esound.nix
similarity index 100%
rename from pkgs/desktops/gnome/esound/default.nix
rename to pkgs/desktops/gnome/esound.nix
diff --git a/pkgs/desktops/gnome/gail/default.nix b/pkgs/desktops/gnome/gail.nix
similarity index 100%
rename from pkgs/desktops/gnome/gail/default.nix
rename to pkgs/desktops/gnome/gail.nix
diff --git a/pkgs/desktops/gnome/gnome-desktop/default.nix b/pkgs/desktops/gnome/gnome-desktop.nix
similarity index 100%
rename from pkgs/desktops/gnome/gnome-desktop/default.nix
rename to pkgs/desktops/gnome/gnome-desktop.nix
diff --git a/pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch b/pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch
similarity index 100%
rename from pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch
rename to pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch
diff --git a/pkgs/desktops/gnome/gnome-icon-theme/default.nix b/pkgs/desktops/gnome/gnome-icon-theme.nix
similarity index 100%
rename from pkgs/desktops/gnome/gnome-icon-theme/default.nix
rename to pkgs/desktops/gnome/gnome-icon-theme.nix
diff --git a/pkgs/desktops/gnome/gnome-keyring/default.nix b/pkgs/desktops/gnome/gnome-keyring.nix
similarity index 100%
rename from pkgs/desktops/gnome/gnome-keyring/default.nix
rename to pkgs/desktops/gnome/gnome-keyring.nix
diff --git a/pkgs/desktops/gnome/gnome-mime-data/default.nix b/pkgs/desktops/gnome/gnome-mime-data.nix
similarity index 100%
rename from pkgs/desktops/gnome/gnome-mime-data/default.nix
rename to pkgs/desktops/gnome/gnome-mime-data.nix
diff --git a/pkgs/desktops/gnome/gnome-panel/default.nix b/pkgs/desktops/gnome/gnome-panel.nix
similarity index 100%
rename from pkgs/desktops/gnome/gnome-panel/default.nix
rename to pkgs/desktops/gnome/gnome-panel.nix
diff --git a/pkgs/desktops/gnome/gnome-vfs/default.nix b/pkgs/desktops/gnome/gnome-vfs.nix
similarity index 100%
rename from pkgs/desktops/gnome/gnome-vfs/default.nix
rename to pkgs/desktops/gnome/gnome-vfs.nix
diff --git a/pkgs/desktops/gnome/gtkhtml/default.nix b/pkgs/desktops/gnome/gtkhtml.nix
similarity index 100%
rename from pkgs/desktops/gnome/gtkhtml/default.nix
rename to pkgs/desktops/gnome/gtkhtml.nix
diff --git a/pkgs/desktops/gnome/gtksourceview/default.nix b/pkgs/desktops/gnome/gtksourceview.nix
similarity index 100%
rename from pkgs/desktops/gnome/gtksourceview/default.nix
rename to pkgs/desktops/gnome/gtksourceview.nix
diff --git a/pkgs/desktops/gnome/intltool/default.nix b/pkgs/desktops/gnome/intltool.nix
similarity index 100%
rename from pkgs/desktops/gnome/intltool/default.nix
rename to pkgs/desktops/gnome/intltool.nix
diff --git a/pkgs/desktops/gnome/libIDL/default.nix b/pkgs/desktops/gnome/libIDL.nix
similarity index 100%
rename from pkgs/desktops/gnome/libIDL/default.nix
rename to pkgs/desktops/gnome/libIDL.nix
diff --git a/pkgs/desktops/gnome/libart_lgpl/default.nix b/pkgs/desktops/gnome/libart_lgpl.nix
similarity index 100%
rename from pkgs/desktops/gnome/libart_lgpl/default.nix
rename to pkgs/desktops/gnome/libart_lgpl.nix
diff --git a/pkgs/desktops/gnome/libbonobo/default.nix b/pkgs/desktops/gnome/libbonobo.nix
similarity index 100%
rename from pkgs/desktops/gnome/libbonobo/default.nix
rename to pkgs/desktops/gnome/libbonobo.nix
diff --git a/pkgs/desktops/gnome/libbonoboui/default.nix b/pkgs/desktops/gnome/libbonoboui.nix
similarity index 100%
rename from pkgs/desktops/gnome/libbonoboui/default.nix
rename to pkgs/desktops/gnome/libbonoboui.nix
diff --git a/pkgs/desktops/gnome/libglade/default.nix b/pkgs/desktops/gnome/libglade.nix
similarity index 100%
rename from pkgs/desktops/gnome/libglade/default.nix
rename to pkgs/desktops/gnome/libglade.nix
diff --git a/pkgs/desktops/gnome/libgnome/default.nix b/pkgs/desktops/gnome/libgnome.nix
similarity index 100%
rename from pkgs/desktops/gnome/libgnome/default.nix
rename to pkgs/desktops/gnome/libgnome.nix
diff --git a/pkgs/desktops/gnome/libgnomecanvas/default.nix b/pkgs/desktops/gnome/libgnomecanvas.nix
similarity index 100%
rename from pkgs/desktops/gnome/libgnomecanvas/default.nix
rename to pkgs/desktops/gnome/libgnomecanvas.nix
diff --git a/pkgs/desktops/gnome/libgnomeprint/default.nix b/pkgs/desktops/gnome/libgnomeprint.nix
similarity index 100%
rename from pkgs/desktops/gnome/libgnomeprint/default.nix
rename to pkgs/desktops/gnome/libgnomeprint.nix
diff --git a/pkgs/desktops/gnome/libgnomeprintui/default.nix b/pkgs/desktops/gnome/libgnomeprintui.nix
similarity index 100%
rename from pkgs/desktops/gnome/libgnomeprintui/default.nix
rename to pkgs/desktops/gnome/libgnomeprintui.nix
diff --git a/pkgs/desktops/gnome/libgnomeui/default.nix b/pkgs/desktops/gnome/libgnomeui.nix
similarity index 100%
rename from pkgs/desktops/gnome/libgnomeui/default.nix
rename to pkgs/desktops/gnome/libgnomeui.nix
diff --git a/pkgs/desktops/gnome/libgtkhtml/default.nix b/pkgs/desktops/gnome/libgtkhtml.nix
similarity index 100%
rename from pkgs/desktops/gnome/libgtkhtml/default.nix
rename to pkgs/desktops/gnome/libgtkhtml.nix
diff --git a/pkgs/desktops/gnome/libsoup/default.nix b/pkgs/desktops/gnome/libsoup.nix
similarity index 100%
rename from pkgs/desktops/gnome/libsoup/default.nix
rename to pkgs/desktops/gnome/libsoup.nix
diff --git a/pkgs/desktops/gnome/libwnck/default.nix b/pkgs/desktops/gnome/libwnck.nix
similarity index 100%
rename from pkgs/desktops/gnome/libwnck/default.nix
rename to pkgs/desktops/gnome/libwnck.nix
diff --git a/pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch b/pkgs/desktops/gnome/no-kerberos.patch
similarity index 100%
rename from pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch
rename to pkgs/desktops/gnome/no-kerberos.patch
diff --git a/pkgs/desktops/gnome/scrollkeeper/default.nix b/pkgs/desktops/gnome/scrollkeeper.nix
similarity index 100%
rename from pkgs/desktops/gnome/scrollkeeper/default.nix
rename to pkgs/desktops/gnome/scrollkeeper.nix
diff --git a/pkgs/desktops/gnome/startup-notification/default.nix b/pkgs/desktops/gnome/startup-notification.nix
similarity index 100%
rename from pkgs/desktops/gnome/startup-notification/default.nix
rename to pkgs/desktops/gnome/startup-notification.nix
diff --git a/pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch b/pkgs/desktops/gnome/xmlcatalog.patch
similarity index 100%
rename from pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch
rename to pkgs/desktops/gnome/xmlcatalog.patch