diff --git a/pkgs/development/libraries/gtk-libs-1.x/default.nix b/pkgs/development/libraries/gtk-libs/1.x/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-1.x/default.nix
rename to pkgs/development/libraries/gtk-libs/1.x/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk-libs/1.x/gdk-pixbuf/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
rename to pkgs/development/libraries/gtk-libs/1.x/gdk-pixbuf/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix b/pkgs/development/libraries/gtk-libs/1.x/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
rename to pkgs/development/libraries/gtk-libs/1.x/glib/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch b/pkgs/development/libraries/gtk-libs/1.x/glib/gcc34.patch
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch
rename to pkgs/development/libraries/gtk-libs/1.x/glib/gcc34.patch
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh b/pkgs/development/libraries/gtk-libs/1.x/gtk+/builder.sh
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
rename to pkgs/development/libraries/gtk-libs/1.x/gtk+/builder.sh
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/1.x/gtk+/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs/1.x/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/atk/default.nix b/pkgs/development/libraries/gtk-libs/2.10/atk/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/atk/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/atk/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/default.nix b/pkgs/development/libraries/gtk-libs/2.10/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix b/pkgs/development/libraries/gtk-libs/2.10/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/glib/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.10/glibmm/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/glibmm/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/glibmm/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.10/gtk+/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs/2.10/gtkmm/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/gtkmm/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/gtkmm/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.10/pango/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
rename to pkgs/development/libraries/gtk-libs/2.10/pango/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/atk/default.nix b/pkgs/development/libraries/gtk-libs/2.6/atk/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/atk/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/atk/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/default.nix b/pkgs/development/libraries/gtk-libs/2.6/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix b/pkgs/development/libraries/gtk-libs/2.6/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/glib/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.6/glibmm/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/glibmm/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.6/gtk+/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs/2.6/gtkmm/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/gtkmm/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.6/pango/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
rename to pkgs/development/libraries/gtk-libs/2.6/pango/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix b/pkgs/development/libraries/gtk-libs/2.8/atk/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/atk/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/default.nix b/pkgs/development/libraries/gtk-libs/2.8/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs/2.8/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/glib/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.8/glibmm/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/glibmm/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.8/gtk+/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs/2.8/gtkmm/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/gtkmm/default.nix
diff --git a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.8/pango/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
rename to pkgs/development/libraries/gtk-libs/2.8/pango/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c12d83bf49ca..f2ead2f6a330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1951,7 +1951,7 @@ rec {
       #installLocales = false;
     });
 
-  glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
+  glibmm = import ../development/libraries/gtk-libs/2.6/glibmm {
     inherit fetchurl stdenv pkgconfig libsigcxx;
     inherit (gtkLibs26) glib;
   };
@@ -1991,30 +1991,30 @@ rec {
 
   gtkLibs = recurseIntoAttrs gtkLibs210;
 
-  gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
+  gtkLibs1x = import ../development/libraries/gtk-libs/1.x {
     inherit fetchurl stdenv x11 libtiff libjpeg libpng;
   };
 
-  gtkLibs210 = import ../development/libraries/gtk-libs-2.10 {
+  gtkLibs210 = import ../development/libraries/gtk-libs/2.10 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng cairo;
     inherit (xlibs) libXinerama libXrandr;
     xineramaSupport = true;
   };
 
-  gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {
+  gtkLibs26 = import ../development/libraries/gtk-libs/2.6 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
 
-  gtkLibs28 = import ../development/libraries/gtk-libs-2.8 {
+  gtkLibs28 = import ../development/libraries/gtk-libs/2.8 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng cairo;
     inherit (xlibs) libXinerama;
     xineramaSupport = true;
   };
 
-  gtkmm = import ../development/libraries/gtk-libs-2.6/gtkmm {
+  gtkmm = import ../development/libraries/gtk-libs/2.6/gtkmm {
     inherit fetchurl stdenv pkgconfig libsigcxx;
     inherit (gtkLibs26) gtk atk;
     inherit glibmm;