diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index e3398285c2..c321864ffb 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -286,8 +286,8 @@ GST_AUDIO_SRC_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>gstbaseaudiosink</FILE>
-<INCLUDE>gst/audio/gstbaseaudiosink.h</INCLUDE>
+<FILE>gstaudiobasesink</FILE>
+<INCLUDE>gst/audio/gstaudiobasesink.h</INCLUDE>
 GstAudioBaseSink
 GstAudioBaseSinkClass
 GstAudioBaseSinkSlaveMethod
@@ -315,8 +315,8 @@ GST_TYPE_AUDIO_BASE_SINK_SLAVE_METHOD
 </SECTION>
 
 <SECTION>
-<FILE>gstbaseaudiosrc</FILE>
-<INCLUDE>gst/audio/gstbaseaudiosrc.h</INCLUDE>
+<FILE>gstaudiobasesrc</FILE>
+<INCLUDE>gst/audio/gstaudiobasesrc.h</INCLUDE>
 GstAudioBaseSrc
 GstAudioBaseSrcClass
 GstAudioBaseSrcSlaveMethod
diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types
index 48cd414612..37e13234ec 100644
--- a/docs/libs/gst-plugins-base-libs.types
+++ b/docs/libs/gst-plugins-base-libs.types
@@ -13,9 +13,9 @@ gst_audio_filter_get_type
 gst_audio_sink_get_type
 #include <gst/audio/gstaudiosrc.h>
 gst_audio_src_get_type
-#include <gst/audio/gstbaseaudiosink.h>
+#include <gst/audio/gstaudiobasesink.h>
 gst_audio_base_sink_get_type
-#include <gst/audio/gstbaseaudiosrc.h>
+#include <gst/audio/gstaudiobasesrc.h>
 gst_audio_base_src_get_type
 #include <gst/audio/gstaudioringbuffer.h>
 gst_audio_ring_buffer_get_type
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index fd3df0693b..12acda66fb 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -25,8 +25,8 @@ libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \
 	multichannel.c \
 	gstaudiodecoder.c \
 	gstaudioencoder.c \
-	gstbaseaudiosink.c \
-	gstbaseaudiosrc.c \
+	gstaudiobasesink.c \
+	gstaudiobasesrc.c \
 	gstaudiofilter.c \
 	gstaudiosink.c \
 	gstaudiosrc.c \
@@ -41,8 +41,8 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
 	gstaudiofilter.h \
 	gstaudiodecoder.h \
 	gstaudioencoder.h \
-	gstbaseaudiosink.h \
-	gstbaseaudiosrc.h \
+	gstaudiobasesink.h \
+	gstaudiobasesrc.h \
 	gstaudiosink.h \
 	gstaudiosrc.h \
 	mixerutils.h \
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstaudiobasesink.c
similarity index 98%
rename from gst-libs/gst/audio/gstbaseaudiosink.c
rename to gst-libs/gst/audio/gstaudiobasesink.c
index fcec55a92f..b4ff504d45 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstaudiobasesink.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2005 Wim Taymans <wim@fluendo.com>
  *
- * gstbaseaudiosink.c:
+ * gstaudiobasesink.c:
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,7 +21,7 @@
  */
 
 /**
- * SECTION:gstbaseaudiosink
+ * SECTION:gstaudiobasesink
  * @short_description: Base class for audio sinks
  * @see_also: #GstAudioSink, #GstAudioRingBuffer.
  *
@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#include "gstbaseaudiosink.h"
+#include "gstaudiobasesink.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_audio_base_sink_debug);
 #define GST_CAT_DEFAULT gst_audio_base_sink_debug
@@ -139,7 +139,7 @@ gst_audio_base_sink_slave_method_get_type (void)
 
 
 #define _do_init \
-    GST_DEBUG_CATEGORY_INIT (gst_audio_base_sink_debug, "baseaudiosink", 0, "baseaudiosink element");
+    GST_DEBUG_CATEGORY_INIT (gst_audio_base_sink_debug, "audiobasesink", 0, "audiobasesink element");
 #define gst_audio_base_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstAudioBaseSink, gst_audio_base_sink,
     GST_TYPE_BASE_SINK, _do_init);
@@ -297,25 +297,25 @@ gst_audio_base_sink_class_init (GstAudioBaseSinkClass * klass)
 }
 
 static void
-gst_audio_base_sink_init (GstAudioBaseSink * baseaudiosink)
+gst_audio_base_sink_init (GstAudioBaseSink * audiobasesink)
 {
   GstBaseSink *basesink;
 
-  baseaudiosink->priv = GST_AUDIO_BASE_SINK_GET_PRIVATE (baseaudiosink);
+  audiobasesink->priv = GST_AUDIO_BASE_SINK_GET_PRIVATE (audiobasesink);
 
-  baseaudiosink->buffer_time = DEFAULT_BUFFER_TIME;
-  baseaudiosink->latency_time = DEFAULT_LATENCY_TIME;
-  baseaudiosink->provide_clock = DEFAULT_PROVIDE_CLOCK;
-  baseaudiosink->priv->slave_method = DEFAULT_SLAVE_METHOD;
-  baseaudiosink->priv->drift_tolerance = DEFAULT_DRIFT_TOLERANCE;
-  baseaudiosink->priv->alignment_threshold = DEFAULT_ALIGNMENT_THRESHOLD;
-  baseaudiosink->priv->discont_wait = DEFAULT_DISCONT_WAIT;
+  audiobasesink->buffer_time = DEFAULT_BUFFER_TIME;
+  audiobasesink->latency_time = DEFAULT_LATENCY_TIME;
+  audiobasesink->provide_clock = DEFAULT_PROVIDE_CLOCK;
+  audiobasesink->priv->slave_method = DEFAULT_SLAVE_METHOD;
+  audiobasesink->priv->drift_tolerance = DEFAULT_DRIFT_TOLERANCE;
+  audiobasesink->priv->alignment_threshold = DEFAULT_ALIGNMENT_THRESHOLD;
+  audiobasesink->priv->discont_wait = DEFAULT_DISCONT_WAIT;
 
-  baseaudiosink->provided_clock = gst_audio_clock_new ("GstAudioSinkClock",
-      (GstAudioClockGetTimeFunc) gst_audio_base_sink_get_time, baseaudiosink,
+  audiobasesink->provided_clock = gst_audio_clock_new ("GstAudioSinkClock",
+      (GstAudioClockGetTimeFunc) gst_audio_base_sink_get_time, audiobasesink,
       NULL);
 
-  basesink = GST_BASE_SINK_CAST (baseaudiosink);
+  basesink = GST_BASE_SINK_CAST (audiobasesink);
   basesink->can_activate_push = TRUE;
   basesink->can_activate_pull = DEFAULT_CAN_ACTIVATE_PULL;
 
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.h b/gst-libs/gst/audio/gstaudiobasesink.h
similarity index 99%
rename from gst-libs/gst/audio/gstbaseaudiosink.h
rename to gst-libs/gst/audio/gstaudiobasesink.h
index 32f0359ac5..a98fc1ff55 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.h
+++ b/gst-libs/gst/audio/gstaudiobasesink.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2005 Wim Taymans <wim@fluendo.com>
  *
- * gstbaseaudiosink.h:
+ * gstaudiobasesink.h:
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/gst-libs/gst/audio/gstbaseaudiosrc.c b/gst-libs/gst/audio/gstaudiobasesrc.c
similarity index 97%
rename from gst-libs/gst/audio/gstbaseaudiosrc.c
rename to gst-libs/gst/audio/gstaudiobasesrc.c
index 2c5601e6b9..4c272f9de4 100644
--- a/gst-libs/gst/audio/gstbaseaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiobasesrc.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2005 Wim Taymans <wim@fluendo.com>
  *
- * gstbaseaudiosrc.c: 
+ * gstaudiobasesrc.c: 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,7 +21,7 @@
  */
 
 /**
- * SECTION:gstbaseaudiosrc
+ * SECTION:gstaudiobasesrc
  * @short_description: Base class for audio sources
  * @see_also: #GstAudioSrc, #GstAudioRingBuffer.
  *
@@ -38,7 +38,7 @@
 
 #include <string.h>
 
-#include "gstbaseaudiosrc.h"
+#include "gstaudiobasesrc.h"
 
 #include "gst/gst-i18n-plugin.h"
 
@@ -108,8 +108,8 @@ enum
 static void
 _do_init (GType type)
 {
-  GST_DEBUG_CATEGORY_INIT (gst_audio_base_src_debug, "baseaudiosrc", 0,
-      "baseaudiosrc element");
+  GST_DEBUG_CATEGORY_INIT (gst_audio_base_src_debug, "audiobasesrc", 0,
+      "audiobasesrc element");
 
 #ifdef ENABLE_NLS
   GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
@@ -234,26 +234,26 @@ gst_audio_base_src_class_init (GstAudioBaseSrcClass * klass)
 }
 
 static void
-gst_audio_base_src_init (GstAudioBaseSrc * baseaudiosrc)
+gst_audio_base_src_init (GstAudioBaseSrc * audiobasesrc)
 {
-  baseaudiosrc->priv = GST_AUDIO_BASE_SRC_GET_PRIVATE (baseaudiosrc);
+  audiobasesrc->priv = GST_AUDIO_BASE_SRC_GET_PRIVATE (audiobasesrc);
 
-  baseaudiosrc->buffer_time = DEFAULT_BUFFER_TIME;
-  baseaudiosrc->latency_time = DEFAULT_LATENCY_TIME;
-  baseaudiosrc->priv->provide_clock = DEFAULT_PROVIDE_CLOCK;
-  baseaudiosrc->priv->slave_method = DEFAULT_SLAVE_METHOD;
+  audiobasesrc->buffer_time = DEFAULT_BUFFER_TIME;
+  audiobasesrc->latency_time = DEFAULT_LATENCY_TIME;
+  audiobasesrc->priv->provide_clock = DEFAULT_PROVIDE_CLOCK;
+  audiobasesrc->priv->slave_method = DEFAULT_SLAVE_METHOD;
   /* reset blocksize we use latency time to calculate a more useful 
    * value based on negotiated format. */
-  GST_BASE_SRC (baseaudiosrc)->blocksize = 0;
+  GST_BASE_SRC (audiobasesrc)->blocksize = 0;
 
-  baseaudiosrc->clock = gst_audio_clock_new ("GstAudioSrcClock",
-      (GstAudioClockGetTimeFunc) gst_audio_base_src_get_time, baseaudiosrc,
+  audiobasesrc->clock = gst_audio_clock_new ("GstAudioSrcClock",
+      (GstAudioClockGetTimeFunc) gst_audio_base_src_get_time, audiobasesrc,
       NULL);
 
   /* we are always a live source */
-  gst_base_src_set_live (GST_BASE_SRC (baseaudiosrc), TRUE);
+  gst_base_src_set_live (GST_BASE_SRC (audiobasesrc), TRUE);
   /* we operate in time */
-  gst_base_src_set_format (GST_BASE_SRC (baseaudiosrc), GST_FORMAT_TIME);
+  gst_base_src_set_format (GST_BASE_SRC (audiobasesrc), GST_FORMAT_TIME);
 }
 
 static void
diff --git a/gst-libs/gst/audio/gstbaseaudiosrc.h b/gst-libs/gst/audio/gstaudiobasesrc.h
similarity index 99%
rename from gst-libs/gst/audio/gstbaseaudiosrc.h
rename to gst-libs/gst/audio/gstaudiobasesrc.h
index 96738ab871..c8e494ccd2 100644
--- a/gst-libs/gst/audio/gstbaseaudiosrc.h
+++ b/gst-libs/gst/audio/gstaudiobasesrc.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2005 Wim Taymans <wim@fluendo.com>
  *
- * gstbaseaudiosrc.h:
+ * gstaudiobasesrc.h:
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c
index 1fa8320cbb..7bb2d16f7e 100644
--- a/gst-libs/gst/audio/gstaudiosink.c
+++ b/gst-libs/gst/audio/gstaudiosink.c
@@ -600,11 +600,11 @@ static GstAudioRingBuffer *gst_audio_sink_create_ringbuffer (GstAudioBaseSink *
 static void
 gst_audio_sink_class_init (GstAudioSinkClass * klass)
 {
-  GstAudioBaseSinkClass *gstbaseaudiosink_class;
+  GstAudioBaseSinkClass *gstaudiobasesink_class;
 
-  gstbaseaudiosink_class = (GstAudioBaseSinkClass *) klass;
+  gstaudiobasesink_class = (GstAudioBaseSinkClass *) klass;
 
-  gstbaseaudiosink_class->create_ringbuffer =
+  gstaudiobasesink_class->create_ringbuffer =
       GST_DEBUG_FUNCPTR (gst_audio_sink_create_ringbuffer);
 
   g_type_class_ref (GST_TYPE_AUDIO_SINK_RING_BUFFER);
diff --git a/gst-libs/gst/audio/gstaudiosink.h b/gst-libs/gst/audio/gstaudiosink.h
index ea8c5cbd6d..41059d147d 100644
--- a/gst-libs/gst/audio/gstaudiosink.h
+++ b/gst-libs/gst/audio/gstaudiosink.h
@@ -24,7 +24,7 @@
 #define __GST_AUDIO_SINK_H__
 
 #include <gst/gst.h>
-#include <gst/audio/gstbaseaudiosink.h>
+#include <gst/audio/gstaudiobasesink.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c
index dc7b49ee67..c0c592042e 100644
--- a/gst-libs/gst/audio/gstaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiosrc.c
@@ -513,11 +513,11 @@ static GstAudioRingBuffer *gst_audio_src_create_ringbuffer (GstAudioBaseSrc *
 static void
 gst_audio_src_class_init (GstAudioSrcClass * klass)
 {
-  GstAudioBaseSrcClass *gstbaseaudiosrc_class;
+  GstAudioBaseSrcClass *gstaudiobasesrc_class;
 
-  gstbaseaudiosrc_class = (GstAudioBaseSrcClass *) klass;
+  gstaudiobasesrc_class = (GstAudioBaseSrcClass *) klass;
 
-  gstbaseaudiosrc_class->create_ringbuffer =
+  gstaudiobasesrc_class->create_ringbuffer =
       GST_DEBUG_FUNCPTR (gst_audio_src_create_ringbuffer);
 
   g_type_class_ref (GST_TYPE_AUDIO_SRC_RING_BUFFER);
diff --git a/gst-libs/gst/audio/gstaudiosrc.h b/gst-libs/gst/audio/gstaudiosrc.h
index 410f724eb1..362411e500 100644
--- a/gst-libs/gst/audio/gstaudiosrc.h
+++ b/gst-libs/gst/audio/gstaudiosrc.h
@@ -24,7 +24,7 @@
 #define __GST_AUDIO_SRC_H__
 
 #include <gst/gst.h>
-#include <gst/audio/gstbaseaudiosrc.h>
+#include <gst/audio/gstaudiobasesrc.h>
 
 G_BEGIN_DECLS