diff --git a/basis/gst/Gst-0.10.gir b/basis/gstreamer/Gst-0.10.gir
similarity index 100%
rename from basis/gst/Gst-0.10.gir
rename to basis/gstreamer/Gst-0.10.gir
diff --git a/basis/gst/authors.txt b/basis/gstreamer/authors.txt
similarity index 100%
rename from basis/gst/authors.txt
rename to basis/gstreamer/authors.txt
diff --git a/basis/gst/ffi/ffi.factor b/basis/gstreamer/ffi/ffi.factor
similarity index 89%
rename from basis/gst/ffi/ffi.factor
rename to basis/gstreamer/ffi/ffi.factor
index 0bb365a755..ac31e7d0c5 100644
--- a/basis/gst/ffi/ffi.factor
+++ b/basis/gstreamer/ffi/ffi.factor
@@ -4,10 +4,10 @@ USING: alien alien.syntax alien.libraries combinators kernel
 system
 gobject-introspection glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
-IN: gst.ffi
+IN: gstreamer.ffi
 
 <<
-"gst" {
+"gstreamer" {
     { [ os winnt? ] [ drop ] }
     { [ os macosx? ] [ drop ] }
     { [ os unix? ] [ "libgstreamer-0.10.so" cdecl add-library ] }
@@ -23,5 +23,5 @@ TYPEDEF: void* xmlNodePtr
 TYPEDEF: void* xmlDocPtr
 TYPEDEF: void* xmlNsPtr
 
-GIR: vocab:gst/Gst-0.10.gir
+GIR: vocab:gstreamer/Gst-0.10.gir
 
diff --git a/basis/gst/gst.factor b/basis/gstreamer/gstreamer.factor
similarity index 71%
rename from basis/gst/gst.factor
rename to basis/gstreamer/gstreamer.factor
index 073b022b95..174fbc6dca 100644
--- a/basis/gst/gst.factor
+++ b/basis/gstreamer/gstreamer.factor
@@ -1,5 +1,5 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: gst.ffi ;
-IN: gst
+USING: gstreamer.ffi ;
+IN: gstreamer
 
diff --git a/basis/gst/summary.txt b/basis/gstreamer/summary.txt
similarity index 100%
rename from basis/gst/summary.txt
rename to basis/gstreamer/summary.txt
diff --git a/basis/gst/tags.txt b/basis/gstreamer/tags.txt
similarity index 100%
rename from basis/gst/tags.txt
rename to basis/gstreamer/tags.txt
diff --git a/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor b/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor
index c772fd11da..7508386e2c 100644
--- a/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor
+++ b/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.strings fry byte-arrays classes.struct
 io.encodings.utf8 kernel locals math prettyprint 
-gst.ffi glib.ffi gobject.ffi gtk.ffi ;
+gstreamer.ffi glib.ffi gobject.ffi gtk.ffi ;
 IN: gir.samples.lowlevel.gstreamer
 
 ! CONSTANT: uri "http://www.xiph.org/vorbis/listen/compilation-ogg-q4.ogg"