diff --git a/configure.ac b/configure.ac
index 1f42d1dc80..08b7a1b99b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,7 +426,7 @@ AG_GST_CHECK_PLUGIN(audiorate)
 AG_GST_CHECK_PLUGIN(audiotestsrc)
 AG_GST_CHECK_PLUGIN(encoding)
 AG_GST_CHECK_PLUGIN(ffmpegcolorspace)
-AG_GST_CHECK_PLUGIN(colorspace)
+AG_GST_CHECK_PLUGIN(videoconvert)
 AG_GST_CHECK_PLUGIN(gdp)
 AG_GST_CHECK_PLUGIN(playback)
 AG_GST_CHECK_PLUGIN(audioresample)
@@ -863,7 +863,7 @@ gst/audioconvert/Makefile
 gst/audiorate/Makefile
 gst/audiotestsrc/Makefile
 gst/encoding/Makefile
-gst/colorspace/Makefile
+gst/videoconvert/Makefile
 gst/ffmpegcolorspace/Makefile
 gst/gdp/Makefile
 gst/playback/Makefile
diff --git a/gst/colorspace/Makefile.am b/gst/colorspace/Makefile.am
deleted file mode 100644
index c5f5bd4cba..0000000000
--- a/gst/colorspace/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-plugin_LTLIBRARIES = libgstcolorspace.la
-
-ORC_SOURCE=gstcolorspaceorc
-include $(top_srcdir)/common/orc.mak
-
-libgstcolorspace_la_SOURCES = gstcolorspace.c colorspace.c
-nodist_libgstcolorspace_la_SOURCES = $(ORC_NODIST_SOURCES)
-libgstcolorspace_la_CFLAGS = \
-	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CFLAGS) \
-	$(ORC_CFLAGS)
-libgstcolorspace_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-	$(GST_BASE_LIBS) \
-	$(GST_LIBS) \
-	$(ORC_LIBS)
-libgstcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcolorspace_la_LIBTOOLFLAGS = --tag=disable-static
-
-noinst_HEADERS = gstcolorspace.h colorspace.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstcolorspace -:SHARED libgstcolorspace \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstcolorspace_la_SOURCES) \
-	           $(nodist_libgstcolorspace_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstcolorspace_la_CFLAGS) \
-	 -:LDFLAGS $(libgstcolorspace_la_LDFLAGS) \
-	           $(libgstcolorspace_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/videoconvert/Makefile.am b/gst/videoconvert/Makefile.am
new file mode 100644
index 0000000000..2e2a25b952
--- /dev/null
+++ b/gst/videoconvert/Makefile.am
@@ -0,0 +1,35 @@
+plugin_LTLIBRARIES = libgstvideoconvert.la
+
+ORC_SOURCE=gstvideoconvertorc
+include $(top_srcdir)/common/orc.mak
+
+libgstvideoconvert_la_SOURCES = gstvideoconvert.c videoconvert.c
+nodist_libgstvideoconvert_la_SOURCES = $(ORC_NODIST_SOURCES)
+libgstvideoconvert_la_CFLAGS = \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_CFLAGS) \
+	$(ORC_CFLAGS)
+libgstvideoconvert_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS) \
+	$(ORC_LIBS)
+libgstvideoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvideoconvert_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = gstvideoconvert.h videoconvert.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+	androgenizer \
+	-:PROJECT libgstvideoconvert -:SHARED libgstvideoconvert \
+	 -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+	 -:SOURCES $(libgstvideoconvert_la_SOURCES) \
+	           $(nodist_libgstvideoconvert_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideoconvert_la_CFLAGS) \
+	 -:LDFLAGS $(libgstvideoconvert_la_LDFLAGS) \
+	           $(libgstvideoconvert_la_LIBADD) \
+	           -ldl \
+	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+	> $@
diff --git a/gst/colorspace/gstcolorspace.c b/gst/videoconvert/gstvideoconvert.c
similarity index 79%
rename from gst/colorspace/gstcolorspace.c
rename to gst/videoconvert/gstvideoconvert.c
index bbd50bb664..3a8bc8545b 100644
--- a/gst/colorspace/gstcolorspace.c
+++ b/gst/videoconvert/gstvideoconvert.c
@@ -21,14 +21,14 @@
  */
 
 /**
- * SECTION:element-colorspace
+ * SECTION:element-videoconvert
  *
- * Convert video frames between a great variety of colorspace formats.
+ * Convert video frames between a great variety of videoconvert formats.
  *
  * <refsect2>
  * <title>Example launch line</title>
  * |[
- * gst-launch -v videotestsrc ! video/x-raw-yuv,format=\(fourcc\)YUY2 ! colorspace ! ximagesink
+ * gst-launch -v videotestsrc ! video/x-raw-yuv,format=\(fourcc\)YUY2 ! videoconvert ! ximagesink
  * ]|
  * </refsect2>
  */
@@ -37,14 +37,14 @@
 #  include "config.h"
 #endif
 
-#include "gstcolorspace.h"
+#include "gstvideoconvert.h"
 #include <gst/video/video.h>
 
 #include <string.h>
 
-GST_DEBUG_CATEGORY (colorspace_debug);
-#define GST_CAT_DEFAULT colorspace_debug
-GST_DEBUG_CATEGORY (colorspace_performance);
+GST_DEBUG_CATEGORY (videoconvert_debug);
+#define GST_CAT_DEFAULT videoconvert_debug
+GST_DEBUG_CATEGORY (videoconvert_performance);
 
 enum
 {
@@ -77,32 +77,32 @@ enum
   GST_VIDEO_CAPS_r210";"                                                \
   GST_VIDEO_CAPS_ARGB_64
 
-static GstStaticPadTemplate gst_csp_src_template =
+static GstStaticPadTemplate gst_video_convert_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS (CSP_VIDEO_CAPS)
     );
 
-static GstStaticPadTemplate gst_csp_sink_template =
+static GstStaticPadTemplate gst_video_convert_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS (CSP_VIDEO_CAPS)
     );
 
-GType gst_csp_get_type (void);
+GType gst_video_convert_get_type (void);
 
-static void gst_csp_set_property (GObject * object,
+static void gst_video_convert_set_property (GObject * object,
     guint property_id, const GValue * value, GParamSpec * pspec);
-static void gst_csp_get_property (GObject * object,
+static void gst_video_convert_get_property (GObject * object,
     guint property_id, GValue * value, GParamSpec * pspec);
 
-static gboolean gst_csp_set_caps (GstBaseTransform * btrans,
+static gboolean gst_video_convert_set_caps (GstBaseTransform * btrans,
     GstCaps * incaps, GstCaps * outcaps);
-static gboolean gst_csp_get_unit_size (GstBaseTransform * btrans,
+static gboolean gst_video_convert_get_unit_size (GstBaseTransform * btrans,
     GstCaps * caps, gsize * size);
-static GstFlowReturn gst_csp_transform (GstBaseTransform * btrans,
+static GstFlowReturn gst_video_convert_transform (GstBaseTransform * btrans,
     GstBuffer * inbuf, GstBuffer * outbuf);
 
 static GQuark _QRAWRGB;         /* "video/x-raw-rgb" */
@@ -130,7 +130,7 @@ dither_method_get_type (void)
 
 /* copies the given caps */
 static GstCaps *
-gst_csp_caps_remove_format_info (GstCaps * caps)
+gst_video_convert_caps_remove_format_info (GstCaps * caps)
 {
   GstStructure *yuvst, *rgbst, *grayst;
   gint i, n;
@@ -172,18 +172,18 @@ gst_csp_caps_remove_format_info (GstCaps * caps)
  * However, we should prefer passthrough, so if passthrough is possible,
  * put it first in the list. */
 static GstCaps *
-gst_csp_transform_caps (GstBaseTransform * btrans,
+gst_video_convert_transform_caps (GstBaseTransform * btrans,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter)
 {
   GstCaps *template;
   GstCaps *tmp, *tmp2;
   GstCaps *result;
 
-  template = gst_static_pad_template_get_caps (&gst_csp_src_template);
+  template = gst_static_pad_template_get_caps (&gst_video_convert_src_template);
   result = gst_caps_copy (caps);
 
   /* Get all possible caps that we can transform to */
-  tmp = gst_csp_caps_remove_format_info (caps);
+  tmp = gst_video_convert_caps_remove_format_info (caps);
 
   if (filter) {
     tmp2 = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
@@ -200,10 +200,10 @@ gst_csp_transform_caps (GstBaseTransform * btrans,
 }
 
 static gboolean
-gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
+gst_video_convert_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
     GstCaps * outcaps)
 {
-  GstCsp *space;
+  GstVideoConvert *space;
   GstVideoFormat in_format;
   GstVideoFormat out_format;
   gint in_height, in_width;
@@ -216,10 +216,10 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
   gboolean ret;
   ColorSpaceColorSpec in_spec, out_spec;
 
-  space = GST_CSP (btrans);
+  space = GST_VIDEO_CONVERT_CAST (btrans);
 
   if (space->convert) {
-    colorspace_convert_free (space->convert);
+    videoconvert_convert_free (space->convert);
   }
 
   /* input caps */
@@ -303,10 +303,10 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
   space->height = in_height;
   space->interlaced = in_interlaced;
 
-  space->convert = colorspace_convert_new (out_format, out_spec, in_format,
+  space->convert = videoconvert_convert_new (out_format, out_spec, in_format,
       in_spec, in_width, in_height);
   if (space->convert) {
-    colorspace_convert_set_interlaced (space->convert, in_interlaced);
+    videoconvert_convert_set_interlaced (space->convert, in_interlaced);
   }
   /* palette, only for from data */
   if (space->from_format == GST_VIDEO_FORMAT_RGB8_PALETTED &&
@@ -325,7 +325,7 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
     }
 
     data = gst_buffer_map (palette, NULL, NULL, GST_MAP_READ);
-    colorspace_convert_set_palette (space->convert, data);
+    videoconvert_convert_set_palette (space->convert, data);
     gst_buffer_unmap (palette, data, -1);
 
     gst_buffer_unref (palette);
@@ -333,7 +333,7 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
     const guint32 *palette;
     GstBuffer *p_buf;
 
-    palette = colorspace_convert_get_palette (space->convert);
+    palette = videoconvert_convert_get_palette (space->convert);
 
     p_buf = gst_buffer_new_and_alloc (256 * 4);
     gst_buffer_fill (p_buf, 0, palette, 256 * 4);
@@ -376,37 +376,37 @@ invalid_palette:
   }
 }
 
-#define gst_csp_parent_class parent_class
-G_DEFINE_TYPE (GstCsp, gst_csp, GST_TYPE_VIDEO_FILTER);
+#define gst_video_convert_parent_class parent_class
+G_DEFINE_TYPE (GstVideoConvert, gst_video_convert, GST_TYPE_VIDEO_FILTER);
 
 static void
-gst_csp_finalize (GObject * obj)
+gst_video_convert_finalize (GObject * obj)
 {
-  GstCsp *space = GST_CSP (obj);
+  GstVideoConvert *space = GST_VIDEO_CONVERT (obj);
 
   if (space->convert) {
-    colorspace_convert_free (space->convert);
+    videoconvert_convert_free (space->convert);
   }
 
   G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
-gst_csp_class_init (GstCspClass * klass)
+gst_video_convert_class_init (GstVideoConvertClass * klass)
 {
   GObjectClass *gobject_class = (GObjectClass *) klass;
   GstElementClass *gstelement_class = (GstElementClass *) klass;
   GstBaseTransformClass *gstbasetransform_class =
       (GstBaseTransformClass *) klass;
 
-  gobject_class->set_property = gst_csp_set_property;
-  gobject_class->get_property = gst_csp_get_property;
-  gobject_class->finalize = gst_csp_finalize;
+  gobject_class->set_property = gst_video_convert_set_property;
+  gobject_class->get_property = gst_video_convert_get_property;
+  gobject_class->finalize = gst_video_convert_finalize;
 
   gst_element_class_add_pad_template (gstelement_class,
-      gst_static_pad_template_get (&gst_csp_src_template));
+      gst_static_pad_template_get (&gst_video_convert_src_template));
   gst_element_class_add_pad_template (gstelement_class,
-      gst_static_pad_template_get (&gst_csp_sink_template));
+      gst_static_pad_template_get (&gst_video_convert_sink_template));
 
   gst_element_class_set_details_simple (gstelement_class,
       " Colorspace converter", "Filter/Converter/Video",
@@ -418,11 +418,13 @@ gst_csp_class_init (GstCspClass * klass)
   _QALPHAMASK = g_quark_from_string ("alpha_mask");
 
   gstbasetransform_class->transform_caps =
-      GST_DEBUG_FUNCPTR (gst_csp_transform_caps);
-  gstbasetransform_class->set_caps = GST_DEBUG_FUNCPTR (gst_csp_set_caps);
+      GST_DEBUG_FUNCPTR (gst_video_convert_transform_caps);
+  gstbasetransform_class->set_caps =
+      GST_DEBUG_FUNCPTR (gst_video_convert_set_caps);
   gstbasetransform_class->get_unit_size =
-      GST_DEBUG_FUNCPTR (gst_csp_get_unit_size);
-  gstbasetransform_class->transform = GST_DEBUG_FUNCPTR (gst_csp_transform);
+      GST_DEBUG_FUNCPTR (gst_video_convert_get_unit_size);
+  gstbasetransform_class->transform =
+      GST_DEBUG_FUNCPTR (gst_video_convert_transform);
 
   gstbasetransform_class->passthrough_on_same_caps = TRUE;
 
@@ -433,20 +435,19 @@ gst_csp_class_init (GstCspClass * klass)
 }
 
 static void
-gst_csp_init (GstCsp * space)
+gst_video_convert_init (GstVideoConvert * space)
 {
   space->from_format = GST_VIDEO_FORMAT_UNKNOWN;
   space->to_format = GST_VIDEO_FORMAT_UNKNOWN;
 }
 
 void
-gst_csp_set_property (GObject * object, guint property_id,
+gst_video_convert_set_property (GObject * object, guint property_id,
     const GValue * value, GParamSpec * pspec)
 {
-  GstCsp *csp;
+  GstVideoConvert *csp;
 
-  g_return_if_fail (GST_IS_CSP (object));
-  csp = GST_CSP (object);
+  csp = GST_VIDEO_CONVERT (object);
 
   switch (property_id) {
     case PROP_DITHER:
@@ -459,13 +460,12 @@ gst_csp_set_property (GObject * object, guint property_id,
 }
 
 void
-gst_csp_get_property (GObject * object, guint property_id,
+gst_video_convert_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
-  GstCsp *csp;
+  GstVideoConvert *csp;
 
-  g_return_if_fail (GST_IS_CSP (object));
-  csp = GST_CSP (object);
+  csp = GST_VIDEO_CONVERT (object);
 
   switch (property_id) {
     case PROP_DITHER:
@@ -478,7 +478,8 @@ gst_csp_get_property (GObject * object, guint property_id,
 }
 
 static gboolean
-gst_csp_get_unit_size (GstBaseTransform * btrans, GstCaps * caps, gsize * size)
+gst_video_convert_get_unit_size (GstBaseTransform * btrans, GstCaps * caps,
+    gsize * size)
 {
   gboolean ret = TRUE;
   GstVideoFormat format;
@@ -495,14 +496,14 @@ gst_csp_get_unit_size (GstBaseTransform * btrans, GstCaps * caps, gsize * size)
 }
 
 static GstFlowReturn
-gst_csp_transform (GstBaseTransform * btrans, GstBuffer * inbuf,
+gst_video_convert_transform (GstBaseTransform * btrans, GstBuffer * inbuf,
     GstBuffer * outbuf)
 {
-  GstCsp *space;
+  GstVideoConvert *space;
   guint8 *indata, *outdata;
   gsize insize, outsize;
 
-  space = GST_CSP (btrans);
+  space = GST_VIDEO_CONVERT_CAST (btrans);
 
   GST_DEBUG ("from %d -> to %d", space->from_format, space->to_format);
 
@@ -510,12 +511,12 @@ gst_csp_transform (GstBaseTransform * btrans, GstBuffer * inbuf,
           space->to_format == GST_VIDEO_FORMAT_UNKNOWN))
     goto unknown_format;
 
-  colorspace_convert_set_dither (space->convert, space->dither);
+  videoconvert_convert_set_dither (space->convert, space->dither);
 
   indata = gst_buffer_map (inbuf, &insize, NULL, GST_MAP_READ);
   outdata = gst_buffer_map (outbuf, &outsize, NULL, GST_MAP_WRITE);
 
-  colorspace_convert_convert (space->convert, outdata, indata);
+  videoconvert_convert_convert (space->convert, outdata, indata);
 
   gst_buffer_unmap (outbuf, outdata, outsize);
   gst_buffer_unmap (inbuf, indata, insize);
@@ -545,14 +546,15 @@ not_supported:
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (colorspace_debug, "colorspace", 0,
+  GST_DEBUG_CATEGORY_INIT (videoconvert_debug, "videoconvert", 0,
       "Colorspace Converter");
-  GST_DEBUG_CATEGORY_GET (colorspace_performance, "GST_PERFORMANCE");
+  GST_DEBUG_CATEGORY_GET (videoconvert_performance, "GST_PERFORMANCE");
 
-  return gst_element_register (plugin, "colorspace",
-      GST_RANK_NONE, GST_TYPE_CSP);
+  return gst_element_register (plugin, "videoconvert",
+      GST_RANK_NONE, GST_TYPE_VIDEO_CONVERT);
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "colorspace", "Colorspace conversion", plugin_init, VERSION, "LGPL", "", "")
+    "videoconvert", "Colorspace conversion", plugin_init, VERSION, "LGPL", "",
+    "")
diff --git a/gst/colorspace/gstcolorspace.h b/gst/videoconvert/gstvideoconvert.h
similarity index 59%
rename from gst/colorspace/gstcolorspace.h
rename to gst/videoconvert/gstvideoconvert.h
index 71245b831e..b41b4912ed 100644
--- a/gst/colorspace/gstcolorspace.h
+++ b/gst/videoconvert/gstvideoconvert.h
@@ -19,31 +19,32 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GST_COLORSPACE_H__
-#define __GST_COLORSPACE_H__
+#ifndef __GST_VIDEOCONVERT_H__
+#define __GST_VIDEOCONVERT_H__
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
-#include "colorspace.h"
+#include "videoconvert.h"
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_CSP 	      (gst_csp_get_type())
-#define GST_CSP(obj) 	      (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CSP,GstCsp))
-#define GST_CSP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CSP,GstCspClass))
-#define GST_IS_CSP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CSP))
-#define GST_IS_CSP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CSP))
+#define GST_TYPE_VIDEO_CONVERT	          (gst_video_convert_get_type())
+#define GST_VIDEO_CONVERT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_CONVERT,GstVideoConvert))
+#define GST_VIDEO_CONVERT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_CONVERT,GstVideoConvertClass))
+#define GST_IS_VIDEO_CONVERT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_CONVERT))
+#define GST_IS_VIDEO_CONVERT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_CONVERT))
+#define GST_VIDEO_CONVERT_CAST(obj)       ((GstVideoConvert *)(obj))
 
-typedef struct _GstCsp GstCsp;
-typedef struct _GstCspClass GstCspClass;
+typedef struct _GstVideoConvert GstVideoConvert;
+typedef struct _GstVideoConvertClass GstVideoConvertClass;
 
 /**
- * GstCsp:
+ * GstVideoConvert:
  *
  * Opaque object data structure.
  */
-struct _GstCsp {
+struct _GstVideoConvert {
   GstVideoFilter element;
 
   gint width, height;
@@ -55,15 +56,15 @@ struct _GstCsp {
   GstVideoFormat to_format;
   ColorSpaceColorSpec to_spec;
 
-  ColorspaceConvert *convert;
+  VideoConvert *convert;
   gboolean dither;
 };
 
-struct _GstCspClass
+struct _GstVideoConvertClass
 {
   GstVideoFilterClass parent_class;
 };
 
 G_END_DECLS
 
-#endif /* __GST_COLORSPACE_H__ */
+#endif /* __GST_VIDEOCONVERT_H__ */
diff --git a/gst/colorspace/gstcolorspaceorc-dist.c b/gst/videoconvert/gstvideoconvertorc-dist.c
similarity index 100%
rename from gst/colorspace/gstcolorspaceorc-dist.c
rename to gst/videoconvert/gstvideoconvertorc-dist.c
diff --git a/gst/colorspace/gstcolorspaceorc-dist.h b/gst/videoconvert/gstvideoconvertorc-dist.h
similarity index 100%
rename from gst/colorspace/gstcolorspaceorc-dist.h
rename to gst/videoconvert/gstvideoconvertorc-dist.h
diff --git a/gst/colorspace/gstcolorspaceorc.orc b/gst/videoconvert/gstvideoconvertorc.orc
similarity index 100%
rename from gst/colorspace/gstcolorspaceorc.orc
rename to gst/videoconvert/gstvideoconvertorc.orc
diff --git a/gst/colorspace/colorspace.c b/gst/videoconvert/videoconvert.c
similarity index 83%
rename from gst/colorspace/colorspace.c
rename to gst/videoconvert/videoconvert.c
index 8bcd2c4295..0bf684aada 100644
--- a/gst/colorspace/colorspace.c
+++ b/gst/videoconvert/videoconvert.c
@@ -22,27 +22,27 @@
 #include "config.h"
 #endif
 
-#include "colorspace.h"
+#include "videoconvert.h"
 #include <glib.h>
 #include <string.h>
-#include "gstcolorspaceorc.h"
+#include "gstvideoconvertorc.h"
 
 
-static void colorspace_convert_generic (ColorspaceConvert * convert,
+static void videoconvert_convert_generic (VideoConvert * convert,
     guint8 * dest, const guint8 * src);
-static void colorspace_convert_lookup_fastpath (ColorspaceConvert * convert);
-static void colorspace_convert_lookup_getput (ColorspaceConvert * convert);
-static void colorspace_dither_none (ColorspaceConvert * convert, int j);
-static void colorspace_dither_verterr (ColorspaceConvert * convert, int j);
-static void colorspace_dither_halftone (ColorspaceConvert * convert, int j);
+static void videoconvert_convert_lookup_fastpath (VideoConvert * convert);
+static void videoconvert_convert_lookup_getput (VideoConvert * convert);
+static void videoconvert_dither_none (VideoConvert * convert, int j);
+static void videoconvert_dither_verterr (VideoConvert * convert, int j);
+static void videoconvert_dither_halftone (VideoConvert * convert, int j);
 
 
-ColorspaceConvert *
-colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
+VideoConvert *
+videoconvert_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
     GstVideoFormat from_format, ColorSpaceColorSpec from_spec,
     int width, int height)
 {
-  ColorspaceConvert *convert;
+  VideoConvert *convert;
   int i;
 
   g_return_val_if_fail (!gst_video_format_is_rgb (to_format)
@@ -65,8 +65,8 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
       || (gst_video_format_is_gray (from_format) &&
           from_spec == COLOR_SPEC_GRAY), NULL);
 
-  convert = g_malloc (sizeof (ColorspaceConvert));
-  memset (convert, 0, sizeof (ColorspaceConvert));
+  convert = g_malloc (sizeof (VideoConvert));
+  memset (convert, 0, sizeof (VideoConvert));
 
   convert->to_format = to_format;
   convert->to_spec = to_spec;
@@ -74,8 +74,8 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
   convert->from_spec = from_spec;
   convert->height = height;
   convert->width = width;
-  convert->convert = colorspace_convert_generic;
-  convert->dither16 = colorspace_dither_none;
+  convert->convert = videoconvert_convert_generic;
+  convert->dither16 = videoconvert_dither_none;
 
   if (gst_video_format_get_component_depth (to_format, 0) > 8 ||
       gst_video_format_get_component_depth (from_format, 0) > 8) {
@@ -104,8 +104,8 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
         convert->src_stride[i], convert->src_offset[i]);
   }
 
-  colorspace_convert_lookup_fastpath (convert);
-  colorspace_convert_lookup_getput (convert);
+  videoconvert_convert_lookup_fastpath (convert);
+  videoconvert_convert_lookup_getput (convert);
 
   convert->tmpline = g_malloc (sizeof (guint8) * (width + 8) * 4);
   convert->tmpline16 = g_malloc (sizeof (guint16) * (width + 8) * 4);
@@ -137,7 +137,7 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
 }
 
 void
-colorspace_convert_free (ColorspaceConvert * convert)
+videoconvert_convert_free (VideoConvert * convert)
 {
   g_free (convert->palette);
   g_free (convert->tmpline);
@@ -148,31 +148,31 @@ colorspace_convert_free (ColorspaceConvert * convert)
 }
 
 void
-colorspace_convert_set_interlaced (ColorspaceConvert * convert,
+videoconvert_convert_set_interlaced (VideoConvert * convert,
     gboolean interlaced)
 {
   convert->interlaced = interlaced;
 }
 
 void
-colorspace_convert_set_dither (ColorspaceConvert * convert, int type)
+videoconvert_convert_set_dither (VideoConvert * convert, int type)
 {
   switch (type) {
     case 0:
     default:
-      convert->dither16 = colorspace_dither_none;
+      convert->dither16 = videoconvert_dither_none;
       break;
     case 1:
-      convert->dither16 = colorspace_dither_verterr;
+      convert->dither16 = videoconvert_dither_verterr;
       break;
     case 2:
-      convert->dither16 = colorspace_dither_halftone;
+      convert->dither16 = videoconvert_dither_halftone;
       break;
   }
 }
 
 void
-colorspace_convert_set_palette (ColorspaceConvert * convert,
+videoconvert_convert_set_palette (VideoConvert * convert,
     const guint32 * palette)
 {
   if (convert->palette == NULL) {
@@ -182,13 +182,13 @@ colorspace_convert_set_palette (ColorspaceConvert * convert,
 }
 
 const guint32 *
-colorspace_convert_get_palette (ColorspaceConvert * convert)
+videoconvert_convert_get_palette (VideoConvert * convert)
 {
   return convert->palette;
 }
 
 void
-colorspace_convert_convert (ColorspaceConvert * convert,
+videoconvert_convert_convert (VideoConvert * convert,
     guint8 * dest, const guint8 * src)
 {
   convert->convert (convert, dest, src);
@@ -200,8 +200,7 @@ colorspace_convert_convert (ColorspaceConvert * convert,
   ((dir) + convert-> dir ## _offset[(comp)] + convert-> dir ## _stride[(comp)] * (line))
 
 static void
-getline_I420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_I420 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -210,8 +209,7 @@ getline_I420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_I420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_I420 (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 1, j >> 1),
@@ -219,8 +217,7 @@ putline_I420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_YV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_YV12 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_I420 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -229,8 +226,7 @@ getline_YV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_YV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_YV12 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_I420 (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 1, j >> 1),
@@ -238,50 +234,43 @@ putline_YV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_YUY2 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_YUY2 (dest, FRAME_GET_LINE (src, 0, j), convert->width / 2);
 }
 
 static void
-putline_YUY2 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_YUY2 (FRAME_GET_LINE (dest, 0, j), src, convert->width / 2);
 }
 
 static void
-getline_UYVY (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_UYVY (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_UYVY (dest, FRAME_GET_LINE (src, 0, j), convert->width / 2);
 }
 
 static void
-putline_UYVY (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_UYVY (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_UYVY (FRAME_GET_LINE (dest, 0, j), src, convert->width / 2);
 }
 
 static void
-getline_YVYU (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_YVYU (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_YVYU (dest, FRAME_GET_LINE (src, 0, j), convert->width / 2);
 }
 
 static void
-putline_YVYU (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_YVYU (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_YVYU (FRAME_GET_LINE (dest, 0, j), src, convert->width / 2);
 }
 
 static void
-getline_v308 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_v308 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -294,8 +283,7 @@ getline_v308 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_v308 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_v308 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -307,23 +295,20 @@ putline_v308 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_AYUV (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   memcpy (dest, FRAME_GET_LINE (src, 0, j), convert->width * 4);
 }
 
 static void
-putline_AYUV (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   memcpy (FRAME_GET_LINE (dest, 0, j), src, convert->width * 4);
 }
 
 #if 0
 static void
-getline_v410 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_v410 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -337,8 +322,7 @@ getline_v410 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 #endif
 
 static void
-getline_v210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_v210 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -404,8 +388,7 @@ getline_v210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_v210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_v210 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -444,7 +427,7 @@ putline_v210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline16_v210 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
+getline16_v210 (VideoConvert * convert, guint16 * dest, const guint8 * src,
     int j)
 {
   int i;
@@ -510,7 +493,7 @@ getline16_v210 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
 }
 
 static void
-putline16_v210 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
+putline16_v210 (VideoConvert * convert, guint8 * dest, const guint16 * src,
     int j)
 {
   int i;
@@ -550,8 +533,7 @@ putline16_v210 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
 }
 
 static void
-getline_v216 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_v216 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -564,8 +546,7 @@ getline_v216 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_v216 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_v216 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -578,7 +559,7 @@ putline_v216 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline16_v216 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
+getline16_v216 (VideoConvert * convert, guint16 * dest, const guint8 * src,
     int j)
 {
   int i;
@@ -592,7 +573,7 @@ getline16_v216 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
 }
 
 static void
-putline16_v216 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
+putline16_v216 (VideoConvert * convert, guint8 * dest, const guint16 * src,
     int j)
 {
   int i;
@@ -606,8 +587,7 @@ putline16_v216 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
 }
 
 static void
-getline_Y41B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_Y41B (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_YUV9 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -616,8 +596,7 @@ getline_Y41B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_Y41B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_Y41B (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destlineY = FRAME_GET_LINE (dest, 0, j);
@@ -662,8 +641,7 @@ putline_Y41B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_Y42B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_Y42B (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -672,8 +650,7 @@ getline_Y42B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_Y42B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_Y42B (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 1, j),
@@ -681,8 +658,7 @@ putline_Y42B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_Y444 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_Y444 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -690,8 +666,7 @@ getline_Y444 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_Y444 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_Y444 (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 1, j),
@@ -699,36 +674,31 @@ putline_Y444 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_Y800 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_Y800 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_Y800 (dest, FRAME_GET_LINE (src, 0, j), convert->width);
 }
 
 static void
-putline_Y800 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_Y800 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_Y800 (FRAME_GET_LINE (dest, 0, j), src, convert->width);
 }
 
 static void
-getline_Y16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_Y16 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_Y16 (dest, FRAME_GET_LINE (src, 0, j), convert->width);
 }
 
 static void
-putline_Y16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_Y16 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_Y16 (FRAME_GET_LINE (dest, 0, j), src, convert->width);
 }
 
 static void
-getline_RGB16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_RGB16 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j);
@@ -741,8 +711,7 @@ getline_RGB16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_RGB16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_RGB16 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j);
@@ -754,8 +723,7 @@ putline_RGB16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_BGR16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_BGR16 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j);
@@ -768,8 +736,7 @@ getline_BGR16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_BGR16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_BGR16 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j);
@@ -781,8 +748,7 @@ putline_BGR16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_RGB15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_RGB15 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j);
@@ -795,8 +761,7 @@ getline_RGB15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_RGB15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_RGB15 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j);
@@ -808,8 +773,7 @@ putline_RGB15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_BGR15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_BGR15 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j);
@@ -822,8 +786,7 @@ getline_BGR15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_BGR15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_BGR15 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j);
@@ -835,50 +798,43 @@ putline_BGR15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_BGRA (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_BGRA (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_BGRA (dest, FRAME_GET_LINE (src, 0, j), convert->width);
 }
 
 static void
-putline_BGRA (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_BGRA (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_BGRA (FRAME_GET_LINE (dest, 0, j), src, convert->width);
 }
 
 static void
-getline_ABGR (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_ABGR (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_ABGR (dest, FRAME_GET_LINE (src, 0, j), convert->width);
 }
 
 static void
-putline_ABGR (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_ABGR (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_ABGR (FRAME_GET_LINE (dest, 0, j), src, convert->width);
 }
 
 static void
-getline_RGBA (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_RGBA (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_RGBA (dest, FRAME_GET_LINE (src, 0, j), convert->width);
 }
 
 static void
-putline_RGBA (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_RGBA (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_RGBA (FRAME_GET_LINE (dest, 0, j), src, convert->width);
 }
 
 static void
-getline_RGB (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_RGB (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -891,8 +847,7 @@ getline_RGB (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_RGB (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_RGB (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -904,8 +859,7 @@ putline_RGB (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_BGR (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_BGR (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -918,8 +872,7 @@ getline_BGR (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_BGR (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_BGR (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -931,8 +884,7 @@ putline_BGR (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_NV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_NV12 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_NV12 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -940,16 +892,14 @@ getline_NV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_NV12 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_NV12 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_NV12 (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 1, j >> 1), src, convert->width / 2);
 }
 
 static void
-getline_NV21 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_NV21 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_NV21 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -957,16 +907,14 @@ getline_NV21 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_NV21 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_NV21 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_NV21 (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 2, j >> 1), src, convert->width / 2);
 }
 
 static void
-getline_UYVP (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_UYVP (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
 
@@ -992,8 +940,7 @@ getline_UYVP (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_UYVP (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_UYVP (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
 
@@ -1016,8 +963,7 @@ putline_UYVP (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_A420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_A420 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_A420 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -1027,8 +973,7 @@ getline_A420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_A420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_A420 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_putline_A420 (FRAME_GET_LINE (dest, 0, j),
       FRAME_GET_LINE (dest, 1, j >> 1),
@@ -1037,8 +982,7 @@ putline_A420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_RGB8P (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_RGB8P (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -1052,8 +996,7 @@ getline_RGB8P (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_RGB8P (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_RGB8P (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -1071,8 +1014,7 @@ putline_RGB8P (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 
 
 static void
-getline_YUV9 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_YUV9 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   cogorc_getline_YUV9 (dest,
       FRAME_GET_LINE (src, 0, j),
@@ -1081,8 +1023,7 @@ getline_YUV9 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_YUV9 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_YUV9 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destY = FRAME_GET_LINE (dest, 0, j);
@@ -1127,8 +1068,7 @@ putline_YUV9 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_IYU1 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_IYU1 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -1175,8 +1115,7 @@ getline_IYU1 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_IYU1 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_IYU1 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -1215,8 +1154,7 @@ putline_IYU1 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline_AY64 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_AY64 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j);
@@ -1226,8 +1164,7 @@ getline_AY64 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_AY64 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_AY64 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j);
@@ -1237,22 +1174,21 @@ putline_AY64 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline16_AY64 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
+getline16_AY64 (VideoConvert * convert, guint16 * dest, const guint8 * src,
     int j)
 {
   memcpy (dest, FRAME_GET_LINE (src, 0, j), convert->width * 8);
 }
 
 static void
-putline16_AY64 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
+putline16_AY64 (VideoConvert * convert, guint8 * dest, const guint16 * src,
     int j)
 {
   memcpy (FRAME_GET_LINE (dest, 0, j), src, convert->width * 8);
 }
 
 static void
-getline_r210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+getline_r210 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   const guint8 *srcline = FRAME_GET_LINE (src, 0, j);
@@ -1267,8 +1203,7 @@ getline_r210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-putline_r210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
-    int j)
+putline_r210 (VideoConvert * convert, guint8 * dest, const guint8 * src, int j)
 {
   int i;
   guint8 *destline = FRAME_GET_LINE (dest, 0, j);
@@ -1285,7 +1220,7 @@ putline_r210 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
 }
 
 static void
-getline16_r210 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
+getline16_r210 (VideoConvert * convert, guint16 * dest, const guint8 * src,
     int j)
 {
   int i;
@@ -1301,7 +1236,7 @@ getline16_r210 (ColorspaceConvert * convert, guint16 * dest, const guint8 * src,
 }
 
 static void
-putline16_r210 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
+putline16_r210 (VideoConvert * convert, guint8 * dest, const guint16 * src,
     int j)
 {
   int i;
@@ -1316,7 +1251,7 @@ putline16_r210 (ColorspaceConvert * convert, guint8 * dest, const guint16 * src,
 }
 
 static void
-getline16_convert (ColorspaceConvert * convert, guint16 * dest,
+getline16_convert (VideoConvert * convert, guint16 * dest,
     const guint8 * src, int j)
 {
   int i;
@@ -1327,7 +1262,7 @@ getline16_convert (ColorspaceConvert * convert, guint16 * dest,
 }
 
 static void
-putline16_convert (ColorspaceConvert * convert, guint8 * dest,
+putline16_convert (VideoConvert * convert, guint8 * dest,
     const guint16 * src, int j)
 {
   int i;
@@ -1340,16 +1275,16 @@ putline16_convert (ColorspaceConvert * convert, guint8 * dest,
 typedef struct
 {
   GstVideoFormat format;
-  void (*getline) (ColorspaceConvert * convert, guint8 * dest,
+  void (*getline) (VideoConvert * convert, guint8 * dest,
       const guint8 * src, int j);
-  void (*putline) (ColorspaceConvert * convert, guint8 * dest,
+  void (*putline) (VideoConvert * convert, guint8 * dest,
       const guint8 * src, int j);
-  void (*getline16) (ColorspaceConvert * convert, guint16 * dest,
+  void (*getline16) (VideoConvert * convert, guint16 * dest,
       const guint8 * src, int j);
-  void (*putline16) (ColorspaceConvert * convert, guint8 * dest,
+  void (*putline16) (VideoConvert * convert, guint8 * dest,
       const guint16 * src, int j);
-} ColorspaceLine;
-static const ColorspaceLine lines[] = {
+} VideoLine;
+static const VideoLine lines[] = {
   {GST_VIDEO_FORMAT_I420, getline_I420, putline_I420},
   {GST_VIDEO_FORMAT_YV12, getline_YV12, putline_YV12},
   {GST_VIDEO_FORMAT_YUY2, getline_YUY2, putline_YUY2},
@@ -1400,7 +1335,7 @@ static const ColorspaceLine lines[] = {
 };
 
 static void
-matrix_rgb_to_yuv_bt470_6 (ColorspaceConvert * convert)
+matrix_rgb_to_yuv_bt470_6 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1423,7 +1358,7 @@ matrix_rgb_to_yuv_bt470_6 (ColorspaceConvert * convert)
 }
 
 static void
-matrix_rgb_to_yuv_bt709 (ColorspaceConvert * convert)
+matrix_rgb_to_yuv_bt709 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1446,7 +1381,7 @@ matrix_rgb_to_yuv_bt709 (ColorspaceConvert * convert)
 }
 
 static void
-matrix_yuv_bt470_6_to_rgb (ColorspaceConvert * convert)
+matrix_yuv_bt470_6_to_rgb (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1469,7 +1404,7 @@ matrix_yuv_bt470_6_to_rgb (ColorspaceConvert * convert)
 }
 
 static void
-matrix_yuv_bt709_to_rgb (ColorspaceConvert * convert)
+matrix_yuv_bt709_to_rgb (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1492,7 +1427,7 @@ matrix_yuv_bt709_to_rgb (ColorspaceConvert * convert)
 }
 
 static void
-matrix_yuv_bt709_to_yuv_bt470_6 (ColorspaceConvert * convert)
+matrix_yuv_bt709_to_yuv_bt470_6 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1515,7 +1450,7 @@ matrix_yuv_bt709_to_yuv_bt470_6 (ColorspaceConvert * convert)
 }
 
 static void
-matrix_yuv_bt470_6_to_yuv_bt709 (ColorspaceConvert * convert)
+matrix_yuv_bt470_6_to_yuv_bt709 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1538,13 +1473,13 @@ matrix_yuv_bt470_6_to_yuv_bt709 (ColorspaceConvert * convert)
 }
 
 static void
-matrix_identity (ColorspaceConvert * convert)
+matrix_identity (VideoConvert * convert)
 {
   /* do nothing */
 }
 
 static void
-matrix16_rgb_to_yuv_bt470_6 (ColorspaceConvert * convert)
+matrix16_rgb_to_yuv_bt470_6 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1567,7 +1502,7 @@ matrix16_rgb_to_yuv_bt470_6 (ColorspaceConvert * convert)
 }
 
 static void
-matrix16_rgb_to_yuv_bt709 (ColorspaceConvert * convert)
+matrix16_rgb_to_yuv_bt709 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1590,7 +1525,7 @@ matrix16_rgb_to_yuv_bt709 (ColorspaceConvert * convert)
 }
 
 static void
-matrix16_yuv_bt470_6_to_rgb (ColorspaceConvert * convert)
+matrix16_yuv_bt470_6_to_rgb (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1613,7 +1548,7 @@ matrix16_yuv_bt470_6_to_rgb (ColorspaceConvert * convert)
 }
 
 static void
-matrix16_yuv_bt709_to_rgb (ColorspaceConvert * convert)
+matrix16_yuv_bt709_to_rgb (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1636,7 +1571,7 @@ matrix16_yuv_bt709_to_rgb (ColorspaceConvert * convert)
 }
 
 static void
-matrix16_yuv_bt709_to_yuv_bt470_6 (ColorspaceConvert * convert)
+matrix16_yuv_bt709_to_yuv_bt470_6 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1659,7 +1594,7 @@ matrix16_yuv_bt709_to_yuv_bt470_6 (ColorspaceConvert * convert)
 }
 
 static void
-matrix16_yuv_bt470_6_to_yuv_bt709 (ColorspaceConvert * convert)
+matrix16_yuv_bt470_6_to_yuv_bt709 (VideoConvert * convert)
 {
   int i;
   int r, g, b;
@@ -1682,7 +1617,7 @@ matrix16_yuv_bt470_6_to_yuv_bt709 (ColorspaceConvert * convert)
 }
 
 static void
-matrix16_identity (ColorspaceConvert * convert)
+matrix16_identity (VideoConvert * convert)
 {
   /* do nothing */
 }
@@ -1690,7 +1625,7 @@ matrix16_identity (ColorspaceConvert * convert)
 
 
 static void
-colorspace_convert_lookup_getput (ColorspaceConvert * convert)
+videoconvert_convert_lookup_getput (VideoConvert * convert)
 {
   int i;
 
@@ -1752,7 +1687,7 @@ colorspace_convert_lookup_getput (ColorspaceConvert * convert)
 }
 
 static void
-colorspace_convert_generic (ColorspaceConvert * convert, guint8 * dest,
+videoconvert_convert_generic (VideoConvert * convert, guint8 * dest,
     const guint8 * src)
 {
   int j;
@@ -1784,12 +1719,12 @@ colorspace_convert_generic (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-colorspace_dither_none (ColorspaceConvert * convert, int j)
+videoconvert_dither_none (VideoConvert * convert, int j)
 {
 }
 
 static void
-colorspace_dither_verterr (ColorspaceConvert * convert, int j)
+videoconvert_dither_verterr (VideoConvert * convert, int j)
 {
   int i;
   guint16 *tmpline = convert->tmpline16;
@@ -1802,7 +1737,7 @@ colorspace_dither_verterr (ColorspaceConvert * convert, int j)
 }
 
 static void
-colorspace_dither_halftone (ColorspaceConvert * convert, int j)
+videoconvert_dither_halftone (VideoConvert * convert, int j)
 {
   int i;
   guint16 *tmpline = convert->tmpline16;
@@ -1825,8 +1760,7 @@ colorspace_dither_halftone (ColorspaceConvert * convert, int j)
 /* Fast paths */
 
 static void
-convert_I420_YUY2 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_I420_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   int i;
 
@@ -1841,8 +1775,7 @@ convert_I420_YUY2 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_I420_UYVY (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_I420_UYVY (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   int i;
 
@@ -1857,8 +1790,7 @@ convert_I420_UYVY (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_I420_AYUV (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_I420_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   int i;
 
@@ -1873,8 +1805,7 @@ convert_I420_AYUV (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_I420_Y42B (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_I420_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_memcpy_2d (FRAME_GET_LINE (dest, 0, 0), convert->dest_stride[0],
       FRAME_GET_LINE (src, 0, 0), convert->src_stride[0],
@@ -1892,8 +1823,7 @@ convert_I420_Y42B (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_I420_Y444 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_I420_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_memcpy_2d (FRAME_GET_LINE (dest, 0, 0), convert->dest_stride[0],
       FRAME_GET_LINE (src, 0, 0), convert->src_stride[0],
@@ -1913,8 +1843,7 @@ convert_I420_Y444 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_YUY2_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   int i;
 
@@ -1929,8 +1858,7 @@ convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_YUY2_AYUV (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_YUY2_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_YUY2_AYUV (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -1938,8 +1866,7 @@ convert_YUY2_AYUV (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_YUY2_Y42B (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_YUY2_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_YUY2_Y42B (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
@@ -1949,8 +1876,7 @@ convert_YUY2_Y42B (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_YUY2_Y444 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_YUY2_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_YUY2_Y444 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
@@ -1961,8 +1887,7 @@ convert_YUY2_Y444 (ColorspaceConvert * convert, guint8 * dest,
 
 
 static void
-convert_UYVY_I420 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_UYVY_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   int i;
 
@@ -1977,8 +1902,7 @@ convert_UYVY_I420 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_UYVY_AYUV (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_UYVY_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_UYVY_AYUV (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -1986,8 +1910,7 @@ convert_UYVY_AYUV (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_UYVY_YUY2 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_UYVY_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_UYVY_YUY2 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -1995,8 +1918,7 @@ convert_UYVY_YUY2 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_UYVY_Y42B (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_UYVY_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_UYVY_Y42B (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
@@ -2006,8 +1928,7 @@ convert_UYVY_Y42B (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_UYVY_Y444 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_UYVY_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_UYVY_Y444 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
@@ -2017,8 +1938,7 @@ convert_UYVY_Y444 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_I420 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_I420 (FRAME_GET_LINE (dest, 0, 0),
       2 * convert->dest_stride[0], FRAME_GET_LINE (dest, 0, 1),
@@ -2030,8 +1950,7 @@ convert_AYUV_I420 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_YUY2 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_YUY2 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2039,8 +1958,7 @@ convert_AYUV_YUY2 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_UYVY (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_UYVY (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_UYVY (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2048,8 +1966,7 @@ convert_AYUV_UYVY (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_Y42B (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_Y42B (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
@@ -2059,8 +1976,7 @@ convert_AYUV_Y42B (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_Y444 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_Y444 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
@@ -2070,8 +1986,7 @@ convert_AYUV_Y444 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y42B_I420 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y42B_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_memcpy_2d (FRAME_GET_LINE (dest, 0, 0), convert->dest_stride[0],
       FRAME_GET_LINE (src, 0, 0), convert->src_stride[0],
@@ -2091,8 +2006,7 @@ convert_Y42B_I420 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y42B_Y444 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y42B_Y444 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_memcpy_2d (FRAME_GET_LINE (dest, 0, 0), convert->dest_stride[0],
       FRAME_GET_LINE (src, 0, 0), convert->src_stride[0],
@@ -2108,8 +2022,7 @@ convert_Y42B_Y444 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y42B_YUY2 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y42B_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_Y42B_YUY2 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2119,8 +2032,7 @@ convert_Y42B_YUY2 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y42B_UYVY (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y42B_UYVY (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_Y42B_UYVY (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2130,8 +2042,7 @@ convert_Y42B_UYVY (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y42B_AYUV (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y42B_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_Y42B_AYUV (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2141,8 +2052,7 @@ convert_Y42B_AYUV (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y444_I420 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y444_I420 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_memcpy_2d (FRAME_GET_LINE (dest, 0, 0), convert->dest_stride[0],
       FRAME_GET_LINE (src, 0, 0), convert->src_stride[0],
@@ -2162,8 +2072,7 @@ convert_Y444_I420 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y444_Y42B (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y444_Y42B (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_memcpy_2d (FRAME_GET_LINE (dest, 0, 0), convert->dest_stride[0],
       FRAME_GET_LINE (src, 0, 0), convert->src_stride[0],
@@ -2179,8 +2088,7 @@ convert_Y444_Y42B (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y444_YUY2 (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y444_YUY2 (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_Y444_YUY2 (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2190,8 +2098,7 @@ convert_Y444_YUY2 (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y444_UYVY (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y444_UYVY (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_Y444_UYVY (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2201,8 +2108,7 @@ convert_Y444_UYVY (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_Y444_AYUV (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_Y444_AYUV (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_Y444_AYUV (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2213,8 +2119,7 @@ convert_Y444_AYUV (ColorspaceConvert * convert, guint8 * dest,
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 static void
-convert_AYUV_ARGB (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_ARGB (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_ARGB (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2222,8 +2127,7 @@ convert_AYUV_ARGB (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_BGRA (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_BGRA (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_BGRA (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2231,8 +2135,7 @@ convert_AYUV_BGRA (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_ABGR (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_ABGR (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_ABGR (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2240,8 +2143,7 @@ convert_AYUV_ABGR (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_AYUV_RGBA (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_AYUV_RGBA (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   cogorc_convert_AYUV_RGBA (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
@@ -2249,8 +2151,7 @@ convert_AYUV_RGBA (ColorspaceConvert * convert, guint8 * dest,
 }
 
 static void
-convert_I420_BGRA (ColorspaceConvert * convert, guint8 * dest,
-    const guint8 * src)
+convert_I420_BGRA (VideoConvert * convert, guint8 * dest, const guint8 * src)
 {
   int i;
   int quality = 0;
@@ -2293,10 +2194,9 @@ typedef struct
   GstVideoFormat to_format;
   ColorSpaceColorSpec to_spec;
   gboolean keeps_color_spec;
-  void (*convert) (ColorspaceConvert * convert, guint8 * dest,
-      const guint8 * src);
-} ColorspaceTransform;
-static const ColorspaceTransform transforms[] = {
+  void (*convert) (VideoConvert * convert, guint8 * dest, const guint8 * src);
+} VideoTransform;
+static const VideoTransform transforms[] = {
   {GST_VIDEO_FORMAT_I420, COLOR_SPEC_NONE, GST_VIDEO_FORMAT_YUY2,
       COLOR_SPEC_NONE, TRUE, convert_I420_YUY2},
   {GST_VIDEO_FORMAT_I420, COLOR_SPEC_NONE, GST_VIDEO_FORMAT_UYVY,
@@ -2382,7 +2282,7 @@ static const ColorspaceTransform transforms[] = {
 };
 
 static void
-colorspace_convert_lookup_fastpath (ColorspaceConvert * convert)
+videoconvert_convert_lookup_fastpath (VideoConvert * convert)
 {
   int i;
 
diff --git a/gst/colorspace/colorspace.h b/gst/videoconvert/videoconvert.h
similarity index 58%
rename from gst/colorspace/colorspace.h
rename to gst/videoconvert/videoconvert.h
index 05bcc18670..d3eea70c5e 100644
--- a/gst/colorspace/colorspace.h
+++ b/gst/videoconvert/videoconvert.h
@@ -1,4 +1,4 @@
-/* Colorspace conversion functions
+/* Video conversion functions
  * Copyright (C) 2010 David Schleef <ds@schleef.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
 
 G_BEGIN_DECLS
 
-typedef struct _ColorspaceConvert ColorspaceConvert;
-typedef struct _ColorspaceFrame ColorspaceComponent;
+typedef struct _VideoConvert VideoConvert;
+typedef struct _VideoFrame VideoComponent;
 
 typedef enum {
   COLOR_SPEC_NONE = 0,
@@ -41,12 +41,12 @@ typedef enum {
   DITHER_HALFTONE
 } ColorSpaceDitherMethod;
 
-struct _ColorspaceComponent {
+struct _VideoComponent {
   int offset;
   int stride;
 };
 
-struct _ColorspaceConvert {
+struct _VideoConvert {
   gint width, height;
   gboolean interlaced;
   gboolean use_16bit;
@@ -67,28 +67,28 @@ struct _ColorspaceConvert {
   int src_offset[4];
   int src_stride[4];
 
-  void (*convert) (ColorspaceConvert *convert, guint8 *dest, const guint8 *src);
-  void (*getline) (ColorspaceConvert *convert, guint8 *dest, const guint8 *src, int j);
-  void (*putline) (ColorspaceConvert *convert, guint8 *dest, const guint8 *src, int j);
-  void (*matrix) (ColorspaceConvert *convert);
+  void (*convert) (VideoConvert *convert, guint8 *dest, const guint8 *src);
+  void (*getline) (VideoConvert *convert, guint8 *dest, const guint8 *src, int j);
+  void (*putline) (VideoConvert *convert, guint8 *dest, const guint8 *src, int j);
+  void (*matrix) (VideoConvert *convert);
 
-  void (*getline16) (ColorspaceConvert *convert, guint16 *dest, const guint8 *src, int j);
-  void (*putline16) (ColorspaceConvert *convert, guint8 *dest, const guint16 *src, int j);
-  void (*matrix16) (ColorspaceConvert *convert);
-  void (*dither16) (ColorspaceConvert *convert, int j);
+  void (*getline16) (VideoConvert *convert, guint16 *dest, const guint8 *src, int j);
+  void (*putline16) (VideoConvert *convert, guint8 *dest, const guint16 *src, int j);
+  void (*matrix16) (VideoConvert *convert);
+  void (*dither16) (VideoConvert *convert, int j);
 };
 
-ColorspaceConvert * colorspace_convert_new (GstVideoFormat to_format,
+VideoConvert * videoconvert_convert_new (GstVideoFormat to_format,
     ColorSpaceColorSpec from_spec, GstVideoFormat from_format,
     ColorSpaceColorSpec to_spec, int width, int height);
-void colorspace_convert_set_dither (ColorspaceConvert * convert, int type);
-void colorspace_convert_set_interlaced (ColorspaceConvert *convert,
+void videoconvert_convert_set_dither (VideoConvert * convert, int type);
+void videoconvert_convert_set_interlaced (VideoConvert *convert,
     gboolean interlaced);
-void colorspace_convert_set_palette (ColorspaceConvert *convert,
+void videoconvert_convert_set_palette (VideoConvert *convert,
     const guint32 *palette);
-const guint32 * colorspace_convert_get_palette (ColorspaceConvert *convert);
-void colorspace_convert_free (ColorspaceConvert * convert);
-void colorspace_convert_convert (ColorspaceConvert * convert,
+const guint32 * videoconvert_convert_get_palette (VideoConvert *convert);
+void videoconvert_convert_free (VideoConvert * convert);
+void videoconvert_convert_convert (VideoConvert * convert,
     guint8 *dest, const guint8 *src);
 
 
diff --git a/gst/colorspace/colorspace.vcproj b/gst/videoconvert/videoconvert.vcproj
similarity index 100%
rename from gst/colorspace/colorspace.vcproj
rename to gst/videoconvert/videoconvert.vcproj