gst/rtp/: parsers are depayers

Original commit message from CVS:

* gst/rtp/Makefile.am:
* gst/rtp/gstrtpL16depay.c:
* gst/rtp/gstrtpL16depay.h:
* gst/rtp/gstrtpL16parse.c:
* gst/rtp/gstrtpL16parse.h:
* gst/rtp/gstrtpgsmdepay.c:
* gst/rtp/gstrtpgsmdepay.h:
* gst/rtp/gstrtpgsmparse.c:
* gst/rtp/gstrtpgsmparse.h:
parsers are depayers

19 files changed, 180 insertions, 794 deletions

diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index 35c18fa6..2dd0019a 100644
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -5,22 +5,22 @@ libgstrtp_la_SOURCES = \
 	gstrtpdepay.c \
 	gstrtpmpadepay.c \
 	gstrtpmpapay.c \
-	gstrtpg711pay.c \
 	gstrtpg711depay.c \
+	gstrtpg711pay.c \
+	gstrtpgsmdepay.c \
 	gstrtpgsmpay.c \
-	gstrtpgsmparse.c \
 	gstrtpamrdepay.c \
 	gstrtpamrpay.c \
 	gstrtph263pdepay.c \
 	gstrtph263ppay.c \
 	gstrtph263pay.c \
 	gstasteriskh263.c \
-	gstrtpmp4vpay.c \
 	gstrtpmp4vdepay.c \
-	gstrtpspeexpay.c \
-	gstrtpspeexdepay.c
+	gstrtpmp4vpay.c \
+	gstrtpspeexdepay.c \
+	gstrtpspeexpay.c
 	
-#gstrtpL16pay.c gstrtpL16parse.c gstrtpgsmpay.c gstrtpgsmparse.c 
+#gstrtpL16pay.c gstrtpL16depay.c
 
 if HAVE_WINSOCK2_H
 WINSOCK2_LIBS = -lws2_32
@@ -33,23 +33,23 @@ libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
                 -lgstrtp-@GST_MAJORMINOR@ $(WINSOCK2_LIBS)
 libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 
-noinst_HEADERS = gstrtpL16pay.h 	\
-		 gstrtpL16parse.h 	\
+noinst_HEADERS =			\
+		 gstrtpL16depay.h 	\
+		 gstrtpL16pay.h 	\
 		 gstrtpamrdepay.h 	\
 		 gstrtpamrpay.h 	\
-		 gstrtpg711pay.h 	\
 		 gstrtpg711depay.h 	\
+		 gstrtpg711pay.h 	\
+		 gstrtpgsmdepay.h 	\
 		 gstrtpgsmpay.h 	\
-		 gstrtpgsmparse.h 	\
 		 gstrtpmpadepay.h 	\
 		 gstrtpmpapay.h 	\
 		 gstrtph263pdepay.h 	\
 		 gstrtph263ppay.h 	\
 		 gstrtph263pay.h 	\
-		 gstrtpmp4vpay.h	\
 		 gstrtpmp4vdepay.h	\
+		 gstrtpmp4vpay.h	\
 		 gstrtpdepay.h		\
-		 gstrtph263pay.h	\
-		 gstasteriskh263.h  \
-		 gstrtpspeexpay.h	\
-		 gstrtpspeexdepay.h
+		 gstasteriskh263.h	\
+		 gstrtpspeexdepay.h	\
+		 gstrtpspeexpay.h
diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c
index 8f0d62af..cb331ba2 100644
--- a/gst/rtp/gstasteriskh263.c
+++ b/gst/rtp/gstasteriskh263.c
@@ -43,7 +43,7 @@ typedef struct _GstAsteriskH263Header
 /* elementfactory information */
 static GstElementDetails gst_rtp_h263p_depaydetails = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts H263 video from RTP and encodes in Asterisk H263 format",
   "Neil Stratford <neils@vipadia.com>"
 };
diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c
index 900dc5cc..0c223401 100644
--- a/gst/rtp/gstrtp.c
+++ b/gst/rtp/gstrtp.c
@@ -25,7 +25,7 @@
 #include "gstrtpg711pay.h"
 #include "gstrtpg711depay.h"
 #include "gstrtpgsmpay.h"
-#include "gstrtpgsmparse.h"
+#include "gstrtpgsmdepay.h"
 #include "gstrtpamrpay.h"
 #include "gstrtpamrdepay.h"
 #include "gstrtpmpapay.h"
@@ -45,7 +45,7 @@ plugin_init (GstPlugin * plugin)
   if (!gst_rtp_depay_plugin_init (plugin))
     return FALSE;
 
-  if (!gst_rtp_gsm_parse_plugin_init (plugin))
+  if (!gst_rtp_gsm_depay_plugin_init (plugin))
     return FALSE;
 
   if (!gst_rtp_gsm_pay_plugin_init (plugin))
diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c
index 25a37db5..d133fe9a 100644
--- a/gst/rtp/gstrtpL16depay.c
+++ b/gst/rtp/gstrtpL16depay.c
@@ -16,18 +16,18 @@
 #include "config.h"
 #endif
 #include <string.h>
-#include "gstrtpL16parse.h"
+#include "gstrtpL16depay.h"
 #include "gstrtp-common.h"
 
 /* elementfactory information */
-static GstElementDetails gst_rtp_L16parse_details = {
+static GstElementDetails gst_rtp_L16depay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts raw audio from RTP packets",
   "Zeeshan Ali <zak147@yahoo.com>"
 };
 
-/* RtpL16Parse signals and args */
+/* RtpL16Depay signals and args */
 enum
 {
   /* FILL ME */
@@ -41,7 +41,7 @@ enum
   ARG_PAYLOAD_TYPE
 };
 
-static GstStaticPadTemplate gst_rtp_L16parse_src_template =
+static GstStaticPadTemplate gst_rtp_L16depay_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -53,67 +53,67 @@ GST_STATIC_PAD_TEMPLATE ("src",
         "rate = (int) [ 1000, 48000 ], " "channels = (int) [ 1, 2 ]")
     );
 
-static GstStaticPadTemplate gst_rtp_L16parse_sink_template =
+static GstStaticPadTemplate gst_rtp_L16depay_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-rtp")
     );
 
-static void gst_rtp_L16parse_class_init (GstRtpL16ParseClass * klass);
-static void gst_rtp_L16parse_base_init (GstRtpL16ParseClass * klass);
-static void gst_rtp_L16parse_init (GstRtpL16Parse * rtpL16parse);
+static void gst_rtp_L16depay_class_init (GstRtpL16DepayClass * klass);
+static void gst_rtp_L16depay_base_init (GstRtpL16DepayClass * klass);
+static void gst_rtp_L16depay_init (GstRtpL16Depay * rtpL16depay);
 
-static void gst_rtp_L16parse_chain (GstPad * pad, GstData * _data);
+static void gst_rtp_L16depay_chain (GstPad * pad, GstData * _data);
 
-static void gst_rtp_L16parse_set_property (GObject * object, guint prop_id,
+static void gst_rtp_L16depay_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
-static void gst_rtp_L16parse_get_property (GObject * object, guint prop_id,
+static void gst_rtp_L16depay_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstStateChangeReturn gst_rtp_L16parse_change_state (GstElement *
+static GstStateChangeReturn gst_rtp_L16depay_change_state (GstElement *
     element);
 
 static GstElementClass *parent_class = NULL;
 
 static GType
-gst_rtp_L16parse_get_type (void)
+gst_rtp_L16depay_get_type (void)
 {
-  static GType rtpL16parse_type = 0;
+  static GType rtpL16depay_type = 0;
 
-  if (!rtpL16parse_type) {
-    static const GTypeInfo rtpL16parse_info = {
-      sizeof (GstRtpL16ParseClass),
-      (GBaseInitFunc) gst_rtp_L16parse_base_init,
+  if (!rtpL16depay_type) {
+    static const GTypeInfo rtpL16depay_info = {
+      sizeof (GstRtpL16DepayClass),
+      (GBaseInitFunc) gst_rtp_L16depay_base_init,
       NULL,
-      (GClassInitFunc) gst_rtp_L16parse_class_init,
+      (GClassInitFunc) gst_rtp_L16depay_class_init,
       NULL,
       NULL,
-      sizeof (GstRtpL16Parse),
+      sizeof (GstRtpL16Depay),
       0,
-      (GInstanceInitFunc) gst_rtp_L16parse_init,
+      (GInstanceInitFunc) gst_rtp_L16depay_init,
     };
 
-    rtpL16parse_type =
-        g_type_register_static (GST_TYPE_ELEMENT, "GstRtpL16Parse",
-        &rtpL16parse_info, 0);
+    rtpL16depay_type =
+        g_type_register_static (GST_TYPE_ELEMENT, "GstRtpL16Depay",
+        &rtpL16depay_info, 0);
   }
-  return rtpL16parse_type;
+  return rtpL16depay_type;
 }
 
 static void
-gst_rtp_L16parse_base_init (GstRtpL16ParseClass * klass)
+gst_rtp_L16depay_base_init (GstRtpL16DepayClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_L16parse_src_template));
+      gst_static_pad_template_get (&gst_rtp_L16depay_src_template));
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_L16parse_sink_template));
-  gst_element_class_set_details (element_class, &gst_rtp_L16parse_details);
+      gst_static_pad_template_get (&gst_rtp_L16depay_sink_template));
+  gst_element_class_set_details (element_class, &gst_rtp_L16depay_details);
 }
 
 static void
-gst_rtp_L16parse_class_init (GstRtpL16ParseClass * klass)
+gst_rtp_L16depay_class_init (GstRtpL16DepayClass * klass)
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
@@ -130,33 +130,33 @@ gst_rtp_L16parse_class_init (GstRtpL16ParseClass * klass)
       g_param_spec_int ("frequency", "frequency", "frequency",
           G_MININT, G_MAXINT, 44100, G_PARAM_READWRITE));
 
-  gobject_class->set_property = gst_rtp_L16parse_set_property;
-  gobject_class->get_property = gst_rtp_L16parse_get_property;
+  gobject_class->set_property = gst_rtp_L16depay_set_property;
+  gobject_class->get_property = gst_rtp_L16depay_get_property;
 
-  gstelement_class->change_state = gst_rtp_L16parse_change_state;
+  gstelement_class->change_state = gst_rtp_L16depay_change_state;
 }
 
 static void
-gst_rtp_L16parse_init (GstRtpL16Parse * rtpL16parse)
+gst_rtp_L16depay_init (GstRtpL16Depay * rtpL16depay)
 {
-  rtpL16parse->srcpad =
+  rtpL16depay->srcpad =
       gst_pad_new_from_template (gst_static_pad_template_get
-      (&gst_rtp_L16parse_src_template), "src");
-  rtpL16parse->sinkpad =
+      (&gst_rtp_L16depay_src_template), "src");
+  rtpL16depay->sinkpad =
       gst_pad_new_from_template (gst_static_pad_template_get
-      (&gst_rtp_L16parse_sink_template), "sink");
-  gst_element_add_pad (GST_ELEMENT (rtpL16parse), rtpL16parse->srcpad);
-  gst_element_add_pad (GST_ELEMENT (rtpL16parse), rtpL16parse->sinkpad);
-  gst_pad_set_chain_function (rtpL16parse->sinkpad, gst_rtp_L16parse_chain);
+      (&gst_rtp_L16depay_sink_template), "sink");
+  gst_element_add_pad (GST_ELEMENT (rtpL16depay), rtpL16depay->srcpad);
+  gst_element_add_pad (GST_ELEMENT (rtpL16depay), rtpL16depay->sinkpad);
+  gst_pad_set_chain_function (rtpL16depay->sinkpad, gst_rtp_L16depay_chain);
 
-  rtpL16parse->frequency = 44100;
-  rtpL16parse->channels = 2;
+  rtpL16depay->frequency = 44100;
+  rtpL16depay->channels = 2;
 
-  rtpL16parse->payload_type = PAYLOAD_L16_STEREO;
+  rtpL16depay->payload_type = PAYLOAD_L16_STEREO;
 }
 
 void
-gst_rtp_L16parse_ntohs (GstBuffer * buf)
+gst_rtp_L16depay_ntohs (GstBuffer * buf)
 {
   gint16 *i, *len;
 
@@ -170,46 +170,46 @@ gst_rtp_L16parse_ntohs (GstBuffer * buf)
 }
 
 void
-gst_rtp_L16_caps_nego (GstRtpL16Parse * rtpL16parse)
+gst_rtp_L16_caps_nego (GstRtpL16Depay * rtpL16depay)
 {
   GstCaps *caps;
 
   caps =
-      gst_caps_copy (gst_static_caps_get (&gst_rtp_L16parse_src_template.
+      gst_caps_copy (gst_static_caps_get (&gst_rtp_L16depay_src_template.
           static_caps));
 
   gst_caps_set_simple (caps,
-      "rate", G_TYPE_INT, rtpL16parse->frequency,
-      "channel", G_TYPE_INT, rtpL16parse->channels, NULL);
+      "rate", G_TYPE_INT, rtpL16depay->frequency,
+      "channel", G_TYPE_INT, rtpL16depay->channels, NULL);
 
-  gst_pad_try_set_caps (rtpL16parse->srcpad, caps);
+  gst_pad_try_set_caps (rtpL16depay->srcpad, caps);
 }
 
 void
-gst_rtp_L16parse_payloadtype_change (GstRtpL16Parse * rtpL16parse,
+gst_rtp_L16depay_payloadtype_change (GstRtpL16Depay * rtpL16depay,
     rtp_payload_t pt)
 {
-  rtpL16parse->payload_type = pt;
+  rtpL16depay->payload_type = pt;
 
   switch (pt) {
     case PAYLOAD_L16_MONO:
-      rtpL16parse->channels = 1;
+      rtpL16depay->channels = 1;
       break;
     case PAYLOAD_L16_STEREO:
-      rtpL16parse->channels = 2;
+      rtpL16depay->channels = 2;
       break;
     default:
       g_warning ("unknown payload_t %d\n", pt);
   }
 
-  gst_rtp_L16_caps_nego (rtpL16parse);
+  gst_rtp_L16_caps_nego (rtpL16depay);
 }
 
 static void
-gst_rtp_L16parse_chain (GstPad * pad, GstData * _data)
+gst_rtp_L16depay_chain (GstPad * pad, GstData * _data)
 {
   GstBuffer *buf = GST_BUFFER (_data);
-  GstRtpL16Parse *rtpL16parse;
+  GstRtpL16Depay *rtpL16depay;
   GstBuffer *outbuf;
   Rtp_Packet packet;
   rtp_payload_t pt;
@@ -218,10 +218,10 @@ gst_rtp_L16parse_chain (GstPad * pad, GstData * _data)
   g_return_if_fail (GST_IS_PAD (pad));
   g_return_if_fail (buf != NULL);
 
-  rtpL16parse = GST_RTP_L16_PARSE (GST_OBJECT_PARENT (pad));
+  rtpL16depay = GST_RTP_L16_DEPAY (GST_OBJECT_PARENT (pad));
 
-  g_return_if_fail (rtpL16parse != NULL);
-  g_return_if_fail (GST_IS_RTP_L16_PARSE (rtpL16parse));
+  g_return_if_fail (rtpL16depay != NULL);
+  g_return_if_fail (GST_IS_RTP_L16_DEPAY (rtpL16depay));
 
   if (GST_IS_EVENT (buf)) {
     GstEvent *event = GST_EVENT (buf);
@@ -231,8 +231,8 @@ gst_rtp_L16parse_chain (GstPad * pad, GstData * _data)
     return;
   }
 
-  if (GST_PAD_CAPS (rtpL16parse->srcpad) == NULL) {
-    gst_rtp_L16_caps_nego (rtpL16parse);
+  if (GST_PAD_CAPS (rtpL16depay->srcpad) == NULL) {
+    gst_rtp_L16_caps_nego (rtpL16depay);
   }
 
   packet =
@@ -240,8 +240,8 @@ gst_rtp_L16parse_chain (GstPad * pad, GstData * _data)
 
   pt = rtp_packet_get_payload_type (packet);
 
-  if (pt != rtpL16parse->payload_type) {
-    gst_rtp_L16parse_payloadtype_change (rtpL16parse, pt);
+  if (pt != rtpL16depay->payload_type) {
+    gst_rtp_L16depay_payloadtype_change (rtpL16depay, pt);
   }
 
   outbuf = gst_buffer_new ();
@@ -253,36 +253,36 @@ gst_rtp_L16parse_chain (GstPad * pad, GstData * _data)
   memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet),
       GST_BUFFER_SIZE (outbuf));
 
-  GST_DEBUG ("gst_rtp_L16parse_chain: pushing buffer of size %d",
+  GST_DEBUG ("gst_rtp_L16depay_chain: pushing buffer of size %d",
       GST_BUFFER_SIZE (outbuf));
 
   /* FIXME: According to RFC 1890, this is required, right? */
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  gst_rtp_L16parse_ntohs (outbuf);
+  gst_rtp_L16depay_ntohs (outbuf);
 #endif
 
-  gst_pad_push (rtpL16parse->srcpad, GST_DATA (outbuf));
+  gst_pad_push (rtpL16depay->srcpad, GST_DATA (outbuf));
 
   rtp_packet_free (packet);
   gst_buffer_unref (buf);
 }
 
 static void
-gst_rtp_L16parse_set_property (GObject * object, guint prop_id,
+gst_rtp_L16depay_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
-  GstRtpL16Parse *rtpL16parse;
+  GstRtpL16Depay *rtpL16depay;
 
-  g_return_if_fail (GST_IS_RTP_L16_PARSE (object));
-  rtpL16parse = GST_RTP_L16_PARSE (object);
+  g_return_if_fail (GST_IS_RTP_L16_DEPAY (object));
+  rtpL16depay = GST_RTP_L16_DEPAY (object);
 
   switch (prop_id) {
     case ARG_PAYLOAD_TYPE:
-      gst_rtp_L16parse_payloadtype_change (rtpL16parse,
+      gst_rtp_L16depay_payloadtype_change (rtpL16depay,
           g_value_get_int (value));
       break;
     case ARG_FREQUENCY:
-      rtpL16parse->frequency = g_value_get_int (value);
+      rtpL16depay->frequency = g_value_get_int (value);
       break;
     default:
       break;
@@ -290,20 +290,20 @@ gst_rtp_L16parse_set_property (GObject * object, guint prop_id,
 }
 
 static void
-gst_rtp_L16parse_get_property (GObject * object, guint prop_id, GValue * value,
+gst_rtp_L16depay_get_property (GObject * object, guint prop_id, GValue * value,
     GParamSpec * pspec)
 {
-  GstRtpL16Parse *rtpL16parse;
+  GstRtpL16Depay *rtpL16depay;
 
-  g_return_if_fail (GST_IS_RTP_L16_PARSE (object));
-  rtpL16parse = GST_RTP_L16_PARSE (object);
+  g_return_if_fail (GST_IS_RTP_L16_DEPAY (object));
+  rtpL16depay = GST_RTP_L16_DEPAY (object);
 
   switch (prop_id) {
     case ARG_PAYLOAD_TYPE:
-      g_value_set_int (value, rtpL16parse->payload_type);
+      g_value_set_int (value, rtpL16depay->payload_type);
       break;
     case ARG_FREQUENCY:
-      g_value_set_int (value, rtpL16parse->frequency);
+      g_value_set_int (value, rtpL16depay->frequency);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -312,14 +312,14 @@ gst_rtp_L16parse_get_property (GObject * object, guint prop_id, GValue * value,
 }
 
 static GstStateChangeReturn
-gst_rtp_L16parse_change_state (GstElement * element, GstStateChange transition)
+gst_rtp_L16depay_change_state (GstElement * element, GstStateChange transition)
 {
-  GstRtpL16Parse *rtpL16parse;
+  GstRtpL16Depay *rtpL16depay;
 
-  g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element),
+  g_return_val_if_fail (GST_IS_RTP_L16_DEPAY (element),
       GST_STATE_CHANGE_FAILURE);
 
-  rtpL16parse = GST_RTP_L16_PARSE (element);
+  rtpL16depay = GST_RTP_L16_DEPAY (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
@@ -340,8 +340,8 @@ gst_rtp_L16parse_change_state (GstElement * element, GstStateChange transition)
 }
 
 gboolean
-gst_rtp_L16parse_plugin_init (GstPlugin * plugin)
+gst_rtp_L16depay_plugin_init (GstPlugin * plugin)
 {
-  return gst_element_register (plugin, "rtpL16parse",
-      GST_RANK_NONE, GST_TYPE_RTP_L16_PARSE);
+  return gst_element_register (plugin, "rtpL16depay",
+      GST_RANK_NONE, GST_TYPE_RTP_L16_DEPAY);
 }
diff --git a/gst/rtp/gstrtpL16depay.h b/gst/rtp/gstrtpL16depay.h
index 04cc3a80..940cca61 100644
--- a/gst/rtp/gstrtpL16depay.h
+++ b/gst/rtp/gstrtpL16depay.h
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GST_RTP_L16_PARSE_H__
-#define __GST_RTP_L16_PARSE_H__
+#ifndef __GST_RTP_L16_DEPAY_H__
+#define __GST_RTP_L16_DEPAY_H__
 
 #include <gst/gst.h>
 #include "rtp-packet.h"
@@ -30,8 +30,8 @@ extern "C"
 #endif				/* __cplusplus */
 
 /* Definition of structure storing data for this element. */
-typedef struct _GstRtpL16Parse GstRtpL16Parse;
-struct _GstRtpL16Parse
+typedef struct _GstRtpL16Depay GstRtpL16Depay;
+struct _GstRtpL16Depay
 {
   GstElement element;
 
@@ -45,29 +45,29 @@ struct _GstRtpL16Parse
 };
 
 /* Standard definition defining a class for this element. */
-typedef struct _GstRtpL16ParseClass GstRtpL16ParseClass;
-struct _GstRtpL16ParseClass
+typedef struct _GstRtpL16DepayClass GstRtpL16DepayClass;
+struct _GstRtpL16DepayClass
 {
   GstElementClass parent_class;
 };
 
 /* Standard macros for defining types for this element.  */
-#define GST_TYPE_RTP_L16_PARSE \
-  (gst_rtp_L16parse_get_type())
-#define GST_RTP_L16_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_L16_PARSE,GstRtpL16Parse))
-#define GST_RTP_L16_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_L16_PARSE,GstRtpL16Parse))
-#define GST_IS_RTP_L16_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_L16_PARSE))
-#define GST_IS_RTP_L16_PARSE_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_L16_PARSE))
+#define GST_TYPE_RTP_L16_DEPAY \
+  (gst_rtp_L16depay_get_type())
+#define GST_RTP_L16_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_L16_DEPAY,GstRtpL16Depay))
+#define GST_RTP_L16_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_L16_DEPAY,GstRtpL16Depay))
+#define GST_IS_RTP_L16_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_L16_DEPAY))
+#define GST_IS_RTP_L16_DEPAY_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_L16_DEPAY))
 
-gboolean gst_rtp_L16parse_plugin_init (GstPlugin * plugin);
+gboolean gst_rtp_L16depay_plugin_init (GstPlugin * plugin);
 
 #ifdef __cplusplus
 }
 #endif				/* __cplusplus */
 
 
-#endif				/* __GST_RTP_L16_PARSE_H__ */
+#endif				/* __GST_RTP_L16_DEPAY_H__ */
diff --git a/gst/rtp/gstrtpL16parse.c b/gst/rtp/gstrtpL16parse.c
deleted file mode 100644
index 25a37db5..00000000
--- a/gst/rtp/gstrtpL16parse.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <string.h>
-#include "gstrtpL16parse.h"
-#include "gstrtp-common.h"
-
-/* elementfactory information */
-static GstElementDetails gst_rtp_L16parse_details = {
-  "RTP packet parser",
-  "Codec/Parser/Network",
-  "Extracts raw audio from RTP packets",
-  "Zeeshan Ali <zak147@yahoo.com>"
-};
-
-/* RtpL16Parse signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-enum
-{
-  ARG_0,
-  ARG_FREQUENCY,
-  ARG_PAYLOAD_TYPE
-};
-
-static GstStaticPadTemplate gst_rtp_L16parse_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-raw-int, "
-        "endianness = (int) BYTE_ORDER, "
-        "signed = (boolean) true, "
-        "width = (int) 16, "
-        "depth = (int) 16, "
-        "rate = (int) [ 1000, 48000 ], " "channels = (int) [ 1, 2 ]")
-    );
-
-static GstStaticPadTemplate gst_rtp_L16parse_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("application/x-rtp")
-    );
-
-static void gst_rtp_L16parse_class_init (GstRtpL16ParseClass * klass);
-static void gst_rtp_L16parse_base_init (GstRtpL16ParseClass * klass);
-static void gst_rtp_L16parse_init (GstRtpL16Parse * rtpL16parse);
-
-static void gst_rtp_L16parse_chain (GstPad * pad, GstData * _data);
-
-static void gst_rtp_L16parse_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_rtp_L16parse_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-static GstStateChangeReturn gst_rtp_L16parse_change_state (GstElement *
-    element);
-
-static GstElementClass *parent_class = NULL;
-
-static GType
-gst_rtp_L16parse_get_type (void)
-{
-  static GType rtpL16parse_type = 0;
-
-  if (!rtpL16parse_type) {
-    static const GTypeInfo rtpL16parse_info = {
-      sizeof (GstRtpL16ParseClass),
-      (GBaseInitFunc) gst_rtp_L16parse_base_init,
-      NULL,
-      (GClassInitFunc) gst_rtp_L16parse_class_init,
-      NULL,
-      NULL,
-      sizeof (GstRtpL16Parse),
-      0,
-      (GInstanceInitFunc) gst_rtp_L16parse_init,
-    };
-
-    rtpL16parse_type =
-        g_type_register_static (GST_TYPE_ELEMENT, "GstRtpL16Parse",
-        &rtpL16parse_info, 0);
-  }
-  return rtpL16parse_type;
-}
-
-static void
-gst_rtp_L16parse_base_init (GstRtpL16ParseClass * klass)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_L16parse_src_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_L16parse_sink_template));
-  gst_element_class_set_details (element_class, &gst_rtp_L16parse_details);
-}
-
-static void
-gst_rtp_L16parse_class_init (GstRtpL16ParseClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
-
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PAYLOAD_TYPE,
-      g_param_spec_int ("payload_type", "payload_type", "payload type",
-          G_MININT, G_MAXINT, PAYLOAD_L16_STEREO, G_PARAM_READABLE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FREQUENCY,
-      g_param_spec_int ("frequency", "frequency", "frequency",
-          G_MININT, G_MAXINT, 44100, G_PARAM_READWRITE));
-
-  gobject_class->set_property = gst_rtp_L16parse_set_property;
-  gobject_class->get_property = gst_rtp_L16parse_get_property;
-
-  gstelement_class->change_state = gst_rtp_L16parse_change_state;
-}
-
-static void
-gst_rtp_L16parse_init (GstRtpL16Parse * rtpL16parse)
-{
-  rtpL16parse->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&gst_rtp_L16parse_src_template), "src");
-  rtpL16parse->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&gst_rtp_L16parse_sink_template), "sink");
-  gst_element_add_pad (GST_ELEMENT (rtpL16parse), rtpL16parse->srcpad);
-  gst_element_add_pad (GST_ELEMENT (rtpL16parse), rtpL16parse->sinkpad);
-  gst_pad_set_chain_function (rtpL16parse->sinkpad, gst_rtp_L16parse_chain);
-
-  rtpL16parse->frequency = 44100;
-  rtpL16parse->channels = 2;
-
-  rtpL16parse->payload_type = PAYLOAD_L16_STEREO;
-}
-
-void
-gst_rtp_L16parse_ntohs (GstBuffer * buf)
-{
-  gint16 *i, *len;
-
-  /* FIXME: is this code correct or even sane at all? */
-  i = (gint16 *) GST_BUFFER_DATA (buf);
-  len = i + GST_BUFFER_SIZE (buf) / sizeof (gint16 *);
-
-  for (; i < len; i++) {
-    *i = g_ntohs (*i);
-  }
-}
-
-void
-gst_rtp_L16_caps_nego (GstRtpL16Parse * rtpL16parse)
-{
-  GstCaps *caps;
-
-  caps =
-      gst_caps_copy (gst_static_caps_get (&gst_rtp_L16parse_src_template.
-          static_caps));
-
-  gst_caps_set_simple (caps,
-      "rate", G_TYPE_INT, rtpL16parse->frequency,
-      "channel", G_TYPE_INT, rtpL16parse->channels, NULL);
-
-  gst_pad_try_set_caps (rtpL16parse->srcpad, caps);
-}
-
-void
-gst_rtp_L16parse_payloadtype_change (GstRtpL16Parse * rtpL16parse,
-    rtp_payload_t pt)
-{
-  rtpL16parse->payload_type = pt;
-
-  switch (pt) {
-    case PAYLOAD_L16_MONO:
-      rtpL16parse->channels = 1;
-      break;
-    case PAYLOAD_L16_STEREO:
-      rtpL16parse->channels = 2;
-      break;
-    default:
-      g_warning ("unknown payload_t %d\n", pt);
-  }
-
-  gst_rtp_L16_caps_nego (rtpL16parse);
-}
-
-static void
-gst_rtp_L16parse_chain (GstPad * pad, GstData * _data)
-{
-  GstBuffer *buf = GST_BUFFER (_data);
-  GstRtpL16Parse *rtpL16parse;
-  GstBuffer *outbuf;
-  Rtp_Packet packet;
-  rtp_payload_t pt;
-
-  g_return_if_fail (pad != NULL);
-  g_return_if_fail (GST_IS_PAD (pad));
-  g_return_if_fail (buf != NULL);
-
-  rtpL16parse = GST_RTP_L16_PARSE (GST_OBJECT_PARENT (pad));
-
-  g_return_if_fail (rtpL16parse != NULL);
-  g_return_if_fail (GST_IS_RTP_L16_PARSE (rtpL16parse));
-
-  if (GST_IS_EVENT (buf)) {
-    GstEvent *event = GST_EVENT (buf);
-
-    gst_pad_event_default (pad, event);
-
-    return;
-  }
-
-  if (GST_PAD_CAPS (rtpL16parse->srcpad) == NULL) {
-    gst_rtp_L16_caps_nego (rtpL16parse);
-  }
-
-  packet =
-      rtp_packet_new_copy_data (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
-
-  pt = rtp_packet_get_payload_type (packet);
-
-  if (pt != rtpL16parse->payload_type) {
-    gst_rtp_L16parse_payloadtype_change (rtpL16parse, pt);
-  }
-
-  outbuf = gst_buffer_new ();
-  GST_BUFFER_SIZE (outbuf) = rtp_packet_get_payload_len (packet);
-  GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (outbuf));
-  GST_BUFFER_TIMESTAMP (outbuf) =
-      g_ntohl (rtp_packet_get_timestamp (packet)) * GST_SECOND;
-
-  memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet),
-      GST_BUFFER_SIZE (outbuf));
-
-  GST_DEBUG ("gst_rtp_L16parse_chain: pushing buffer of size %d",
-      GST_BUFFER_SIZE (outbuf));
-
-  /* FIXME: According to RFC 1890, this is required, right? */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  gst_rtp_L16parse_ntohs (outbuf);
-#endif
-
-  gst_pad_push (rtpL16parse->srcpad, GST_DATA (outbuf));
-
-  rtp_packet_free (packet);
-  gst_buffer_unref (buf);
-}
-
-static void
-gst_rtp_L16parse_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstRtpL16Parse *rtpL16parse;
-
-  g_return_if_fail (GST_IS_RTP_L16_PARSE (object));
-  rtpL16parse = GST_RTP_L16_PARSE (object);
-
-  switch (prop_id) {
-    case ARG_PAYLOAD_TYPE:
-      gst_rtp_L16parse_payloadtype_change (rtpL16parse,
-          g_value_get_int (value));
-      break;
-    case ARG_FREQUENCY:
-      rtpL16parse->frequency = g_value_get_int (value);
-      break;
-    default:
-      break;
-  }
-}
-
-static void
-gst_rtp_L16parse_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstRtpL16Parse *rtpL16parse;
-
-  g_return_if_fail (GST_IS_RTP_L16_PARSE (object));
-  rtpL16parse = GST_RTP_L16_PARSE (object);
-
-  switch (prop_id) {
-    case ARG_PAYLOAD_TYPE:
-      g_value_set_int (value, rtpL16parse->payload_type);
-      break;
-    case ARG_FREQUENCY:
-      g_value_set_int (value, rtpL16parse->frequency);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static GstStateChangeReturn
-gst_rtp_L16parse_change_state (GstElement * element, GstStateChange transition)
-{
-  GstRtpL16Parse *rtpL16parse;
-
-  g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element),
-      GST_STATE_CHANGE_FAILURE);
-
-  rtpL16parse = GST_RTP_L16_PARSE (element);
-
-  GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      break;
-    default:
-      break;
-  }
-
-  /* if we haven't failed already, give the parent class a chance to ;-) */
-  if (GST_ELEMENT_CLASS (parent_class)->change_state)
-    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  return GST_STATE_CHANGE_SUCCESS;
-}
-
-gboolean
-gst_rtp_L16parse_plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "rtpL16parse",
-      GST_RANK_NONE, GST_TYPE_RTP_L16_PARSE);
-}
diff --git a/gst/rtp/gstrtpL16parse.h b/gst/rtp/gstrtpL16parse.h
deleted file mode 100644
index 04cc3a80..00000000
--- a/gst/rtp/gstrtpL16parse.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Gnome-Streamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_L16_PARSE_H__
-#define __GST_RTP_L16_PARSE_H__
-
-#include <gst/gst.h>
-#include "rtp-packet.h"
-#include "gstrtp-common.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
-
-/* Definition of structure storing data for this element. */
-typedef struct _GstRtpL16Parse GstRtpL16Parse;
-struct _GstRtpL16Parse
-{
-  GstElement element;
-
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
-  guint frequency;
-  guint channels;
-
-  rtp_payload_t payload_type;
-};
-
-/* Standard definition defining a class for this element. */
-typedef struct _GstRtpL16ParseClass GstRtpL16ParseClass;
-struct _GstRtpL16ParseClass
-{
-  GstElementClass parent_class;
-};
-
-/* Standard macros for defining types for this element.  */
-#define GST_TYPE_RTP_L16_PARSE \
-  (gst_rtp_L16parse_get_type())
-#define GST_RTP_L16_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_L16_PARSE,GstRtpL16Parse))
-#define GST_RTP_L16_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_L16_PARSE,GstRtpL16Parse))
-#define GST_IS_RTP_L16_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_L16_PARSE))
-#define GST_IS_RTP_L16_PARSE_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_L16_PARSE))
-
-gboolean gst_rtp_L16parse_plugin_init (GstPlugin * plugin);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-
-#endif				/* __GST_RTP_L16_PARSE_H__ */
diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c
index bec5b835..c4bc9f4e 100644
--- a/gst/rtp/gstrtpamrdepay.c
+++ b/gst/rtp/gstrtpamrdepay.c
@@ -31,7 +31,7 @@
 /* elementfactory information */
 static GstElementDetails gst_rtp_amrdepay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts AMR audio from RTP packets (RFC 3267)",
   "Wim Taymans <wim@fluendo.com>"
 };
@@ -277,7 +277,7 @@ gst_rtp_amr_depay_chain (GstPad * pad, GstBuffer * buf)
     goto bad_packet;
 
   /* when we get here, 1 channel, 8000 Hz, octet aligned, no CRC, 
-   * no robust sorting, no interleaving data is to be parsed */
+   * no robust sorting, no interleaving data is to be depayd */
   {
     gint payload_len;
     guint8 *payload, *p, *dp;
@@ -295,7 +295,7 @@ gst_rtp_amr_depay_chain (GstPad * pad, GstBuffer * buf)
 
     payload = gst_rtp_buffer_get_payload (buf);
 
-    /* parse CMR. The CMR is used by the sender to request
+    /* depay CMR. The CMR is used by the sender to request
      * a new encoding mode.
      *
      *  0 1 2 3 4 5 6 7 
diff --git a/gst/rtp/gstrtpdepay.c b/gst/rtp/gstrtpdepay.c
index 1adb7ed8..b525ca96 100644
--- a/gst/rtp/gstrtpdepay.c
+++ b/gst/rtp/gstrtpdepay.c
@@ -26,7 +26,7 @@ GST_DEBUG_CATEGORY (rtpdepay_debug);
 /* elementfactory information */
 static GstElementDetails rtpdepay_details =
 GST_ELEMENT_DETAILS ("RTP Payloader",
-    "Codec/Parser/Network",
+    "Codec/Depayr/Network",
     "Accepts raw RTP and RTCP packets and sends them forward",
     "Wim Taymans <wim@fluendo.com>");
 
diff --git a/gst/rtp/gstrtpg711depay.c b/gst/rtp/gstrtpg711depay.c
index 05194e2e..bd96918a 100644
--- a/gst/rtp/gstrtpg711depay.c
+++ b/gst/rtp/gstrtpg711depay.c
@@ -25,7 +25,7 @@
 /* elementfactory information */
 static GstElementDetails gst_rtp_g711depay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts PCMU/PCMA audio from RTP packets",
   "Edgard Lima <edgard.lima@indt.org.br>, Zeeshan Ali <zeenix@gmail.com>"
 };
diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c
index 7a0e4d95..a6cc5d4a 100644
--- a/gst/rtp/gstrtpgsmdepay.c
+++ b/gst/rtp/gstrtpgsmdepay.c
@@ -19,31 +19,31 @@
 
 #include <string.h>
 #include <gst/rtp/gstrtpbuffer.h>
-#include "gstrtpgsmparse.h"
+#include "gstrtpgsmdepay.h"
 
 /* elementfactory information */
-static GstElementDetails gst_rtp_gsmparse_details = {
+static GstElementDetails gst_rtp_gsmdepay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts GSM audio from RTP packets",
   "Zeeshan Ali <zeenix@gmail.com>"
 };
 
-/* RTPGSMParse signals and args */
+/* RTPGSMDepay signals and args */
 enum
 {
   /* FILL ME */
   LAST_SIGNAL
 };
 
-static GstStaticPadTemplate gst_rtp_gsm_parse_src_template =
+static GstStaticPadTemplate gst_rtp_gsm_depay_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-gsm, " "rate = (int) 8000, " "channels = 1")
     );
 
-static GstStaticPadTemplate gst_rtp_gsm_parse_sink_template =
+static GstStaticPadTemplate gst_rtp_gsm_depay_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -53,28 +53,28 @@ GST_STATIC_PAD_TEMPLATE ("sink",
         "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
     );
 
-static GstBuffer *gst_rtp_gsm_parse_process (GstBaseRTPDepayload * _depayload,
+static GstBuffer *gst_rtp_gsm_depay_process (GstBaseRTPDepayload * _depayload,
     GstBuffer * buf);
-static gboolean gst_rtp_gsm_parse_setcaps (GstBaseRTPDepayload * _depayload,
+static gboolean gst_rtp_gsm_depay_setcaps (GstBaseRTPDepayload * _depayload,
     GstCaps * caps);
 
-GST_BOILERPLATE (GstRTPGSMParse, gst_rtp_gsm_parse, GstBaseRTPDepayload,
+GST_BOILERPLATE (GstRTPGSMDepay, gst_rtp_gsm_depay, GstBaseRTPDepayload,
     GST_TYPE_BASE_RTP_DEPAYLOAD);
 
 static void
-gst_rtp_gsm_parse_base_init (gpointer klass)
+gst_rtp_gsm_depay_base_init (gpointer klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_gsm_parse_src_template));
+      gst_static_pad_template_get (&gst_rtp_gsm_depay_src_template));
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_gsm_parse_sink_template));
-  gst_element_class_set_details (element_class, &gst_rtp_gsmparse_details);
+      gst_static_pad_template_get (&gst_rtp_gsm_depay_sink_template));
+  gst_element_class_set_details (element_class, &gst_rtp_gsmdepay_details);
 }
 
 static void
-gst_rtp_gsm_parse_class_init (GstRTPGSMParseClass * klass)
+gst_rtp_gsm_depay_class_init (GstRTPGSMDepayClass * klass)
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
@@ -86,24 +86,24 @@ gst_rtp_gsm_parse_class_init (GstRTPGSMParseClass * klass)
 
   parent_class = g_type_class_ref (GST_TYPE_BASE_RTP_DEPAYLOAD);
 
-  gstbasertp_depayload_class->process = gst_rtp_gsm_parse_process;
-  gstbasertp_depayload_class->set_caps = gst_rtp_gsm_parse_setcaps;
+  gstbasertp_depayload_class->process = gst_rtp_gsm_depay_process;
+  gstbasertp_depayload_class->set_caps = gst_rtp_gsm_depay_setcaps;
 }
 
 static void
-gst_rtp_gsm_parse_init (GstRTPGSMParse * rtpgsmparse,
-    GstRTPGSMParseClass * klass)
+gst_rtp_gsm_depay_init (GstRTPGSMDepay * rtpgsmdepay,
+    GstRTPGSMDepayClass * klass)
 {
-  GST_BASE_RTP_DEPAYLOAD (rtpgsmparse)->clock_rate = 8000;
+  GST_BASE_RTP_DEPAYLOAD (rtpgsmdepay)->clock_rate = 8000;
 }
 
 static gboolean
-gst_rtp_gsm_parse_setcaps (GstBaseRTPDepayload * _depayload, GstCaps * caps)
+gst_rtp_gsm_depay_setcaps (GstBaseRTPDepayload * _depayload, GstCaps * caps)
 {
   GstCaps *srccaps;
   gboolean ret;
 
-  srccaps = gst_static_pad_template_get_caps (&gst_rtp_gsm_parse_src_template);
+  srccaps = gst_static_pad_template_get_caps (&gst_rtp_gsm_depay_src_template);
   ret = gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (_depayload), srccaps);
 
   gst_caps_unref (srccaps);
@@ -111,7 +111,7 @@ gst_rtp_gsm_parse_setcaps (GstBaseRTPDepayload * _depayload, GstCaps * caps)
 }
 
 static GstBuffer *
-gst_rtp_gsm_parse_process (GstBaseRTPDepayload * _depayload, GstBuffer * buf)
+gst_rtp_gsm_depay_process (GstBaseRTPDepayload * _depayload, GstBuffer * buf)
 {
   GstBuffer *outbuf = NULL;
   gint payload_len;
@@ -131,8 +131,8 @@ gst_rtp_gsm_parse_process (GstBaseRTPDepayload * _depayload, GstBuffer * buf)
 }
 
 gboolean
-gst_rtp_gsm_parse_plugin_init (GstPlugin * plugin)
+gst_rtp_gsm_depay_plugin_init (GstPlugin * plugin)
 {
-  return gst_element_register (plugin, "rtpgsmparse",
-      GST_RANK_NONE, GST_TYPE_RTP_GSM_PARSE);
+  return gst_element_register (plugin, "rtpgsmdepay",
+      GST_RANK_NONE, GST_TYPE_RTP_GSM_DEPAY);
 }
diff --git a/gst/rtp/gstrtpgsmdepay.h b/gst/rtp/gstrtpgsmdepay.h
index ebc93a2e..b450f8dc 100644
--- a/gst/rtp/gstrtpgsmdepay.h
+++ b/gst/rtp/gstrtpgsmdepay.h
@@ -17,40 +17,40 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GST_RTP_GSM_PARSE_H__
-#define __GST_RTP_GSM_PARSE_H__
+#ifndef __GST_RTP_GSM_DEPAY_H__
+#define __GST_RTP_GSM_DEPAY_H__
 
 #include <gst/gst.h>
 #include <gst/rtp/gstbasertpdepayload.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GstRTPGSMParse GstRTPGSMParse;
-typedef struct _GstRTPGSMParseClass GstRTPGSMParseClass;
-
-#define GST_TYPE_RTP_GSM_PARSE \
-  (gst_rtp_gsm_parse_get_type())
-#define GST_RTP_GSM_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_GSM_PARSE,GstRTPGSMParse))
-#define GST_RTP_GSM_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_GSM_PARSE,GstRTPGSMParse))
-#define GST_IS_RTP_GSM_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_GSM_PARSE))
-#define GST_IS_RTP_GSM_PARSE_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_GSM_PARSE))
-
-struct _GstRTPGSMParse
+typedef struct _GstRTPGSMDepay GstRTPGSMDepay;
+typedef struct _GstRTPGSMDepayClass GstRTPGSMDepayClass;
+
+#define GST_TYPE_RTP_GSM_DEPAY \
+  (gst_rtp_gsm_depay_get_type())
+#define GST_RTP_GSM_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_GSM_DEPAY,GstRTPGSMDepay))
+#define GST_RTP_GSM_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_GSM_DEPAY,GstRTPGSMDepay))
+#define GST_IS_RTP_GSM_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_GSM_DEPAY))
+#define GST_IS_RTP_GSM_DEPAY_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_GSM_DEPAY))
+
+struct _GstRTPGSMDepay
 {
   GstBaseRTPDepayload _depayload;
 };
 
-struct _GstRTPGSMParseClass
+struct _GstRTPGSMDepayClass
 {
   GstBaseRTPDepayloadClass parent_class;
 };
 
-gboolean gst_rtp_gsm_parse_plugin_init (GstPlugin * plugin);
+gboolean gst_rtp_gsm_depay_plugin_init (GstPlugin * plugin);
 
 G_END_DECLS
 
-#endif /* __GST_RTP_GSM_PARSE_H__ */
+#endif /* __GST_RTP_GSM_DEPAY_H__ */
diff --git a/gst/rtp/gstrtpgsmparse.c b/gst/rtp/gstrtpgsmparse.c
deleted file mode 100644
index 7a0e4d95..00000000
--- a/gst/rtp/gstrtpgsmparse.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2005> Zeeshan Ali <zeenix@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more 
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <string.h>
-#include <gst/rtp/gstrtpbuffer.h>
-#include "gstrtpgsmparse.h"
-
-/* elementfactory information */
-static GstElementDetails gst_rtp_gsmparse_details = {
-  "RTP packet parser",
-  "Codec/Parser/Network",
-  "Extracts GSM audio from RTP packets",
-  "Zeeshan Ali <zeenix@gmail.com>"
-};
-
-/* RTPGSMParse signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-static GstStaticPadTemplate gst_rtp_gsm_parse_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-gsm, " "rate = (int) 8000, " "channels = 1")
-    );
-
-static GstStaticPadTemplate gst_rtp_gsm_parse_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("application/x-rtp, "
-        "media = (string) \"audio\", "
-        "payload = (int) [ 0, 255 ], "
-        "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
-    );
-
-static GstBuffer *gst_rtp_gsm_parse_process (GstBaseRTPDepayload * _depayload,
-    GstBuffer * buf);
-static gboolean gst_rtp_gsm_parse_setcaps (GstBaseRTPDepayload * _depayload,
-    GstCaps * caps);
-
-GST_BOILERPLATE (GstRTPGSMParse, gst_rtp_gsm_parse, GstBaseRTPDepayload,
-    GST_TYPE_BASE_RTP_DEPAYLOAD);
-
-static void
-gst_rtp_gsm_parse_base_init (gpointer klass)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_gsm_parse_src_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_rtp_gsm_parse_sink_template));
-  gst_element_class_set_details (element_class, &gst_rtp_gsmparse_details);
-}
-
-static void
-gst_rtp_gsm_parse_class_init (GstRTPGSMParseClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-  GstBaseRTPDepayloadClass *gstbasertp_depayload_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-  gstbasertp_depayload_class = (GstBaseRTPDepayloadClass *) klass;
-
-  parent_class = g_type_class_ref (GST_TYPE_BASE_RTP_DEPAYLOAD);
-
-  gstbasertp_depayload_class->process = gst_rtp_gsm_parse_process;
-  gstbasertp_depayload_class->set_caps = gst_rtp_gsm_parse_setcaps;
-}
-
-static void
-gst_rtp_gsm_parse_init (GstRTPGSMParse * rtpgsmparse,
-    GstRTPGSMParseClass * klass)
-{
-  GST_BASE_RTP_DEPAYLOAD (rtpgsmparse)->clock_rate = 8000;
-}
-
-static gboolean
-gst_rtp_gsm_parse_setcaps (GstBaseRTPDepayload * _depayload, GstCaps * caps)
-{
-  GstCaps *srccaps;
-  gboolean ret;
-
-  srccaps = gst_static_pad_template_get_caps (&gst_rtp_gsm_parse_src_template);
-  ret = gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (_depayload), srccaps);
-
-  gst_caps_unref (srccaps);
-  return ret;
-}
-
-static GstBuffer *
-gst_rtp_gsm_parse_process (GstBaseRTPDepayload * _depayload, GstBuffer * buf)
-{
-  GstBuffer *outbuf = NULL;
-  gint payload_len;
-  guint8 *payload;
-
-  GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
-      GST_BUFFER_SIZE (buf),
-      gst_rtp_buffer_get_marker (buf),
-      gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
-
-  payload_len = gst_rtp_buffer_get_payload_len (buf);
-  payload = gst_rtp_buffer_get_payload (buf);
-
-  outbuf = gst_buffer_new_and_alloc (payload_len);
-  memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len);
-  return outbuf;
-}
-
-gboolean
-gst_rtp_gsm_parse_plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "rtpgsmparse",
-      GST_RANK_NONE, GST_TYPE_RTP_GSM_PARSE);
-}
diff --git a/gst/rtp/gstrtpgsmparse.h b/gst/rtp/gstrtpgsmparse.h
deleted file mode 100644
index ebc93a2e..00000000
--- a/gst/rtp/gstrtpgsmparse.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Gnome-Streamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_GSM_PARSE_H__
-#define __GST_RTP_GSM_PARSE_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstbasertpdepayload.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstRTPGSMParse GstRTPGSMParse;
-typedef struct _GstRTPGSMParseClass GstRTPGSMParseClass;
-
-#define GST_TYPE_RTP_GSM_PARSE \
-  (gst_rtp_gsm_parse_get_type())
-#define GST_RTP_GSM_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_GSM_PARSE,GstRTPGSMParse))
-#define GST_RTP_GSM_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_GSM_PARSE,GstRTPGSMParse))
-#define GST_IS_RTP_GSM_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_GSM_PARSE))
-#define GST_IS_RTP_GSM_PARSE_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_GSM_PARSE))
-
-struct _GstRTPGSMParse
-{
-  GstBaseRTPDepayload _depayload;
-};
-
-struct _GstRTPGSMParseClass
-{
-  GstBaseRTPDepayloadClass parent_class;
-};
-
-gboolean gst_rtp_gsm_parse_plugin_init (GstPlugin * plugin);
-
-G_END_DECLS
-
-#endif /* __GST_RTP_GSM_PARSE_H__ */
diff --git a/gst/rtp/gstrtph263pdepay.c b/gst/rtp/gstrtph263pdepay.c
index 7b6925e9..9e8d06dc 100644
--- a/gst/rtp/gstrtph263pdepay.c
+++ b/gst/rtp/gstrtph263pdepay.c
@@ -24,7 +24,7 @@
 /* elementfactory information */
 static GstElementDetails gst_rtp_h263pdepay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts H263+ video from RTP packets (RFC 2429)",
   "Wim Taymans <wim@fluendo.com>"
 };
diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c
index e334bf1c..aceea3c4 100644
--- a/gst/rtp/gstrtpmp4vdepay.c
+++ b/gst/rtp/gstrtpmp4vdepay.c
@@ -24,7 +24,7 @@
 /* elementfactory information */
 static GstElementDetails gst_rtp_mp4vdepay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts MPEG4 video from RTP packets (RFC 3016)",
   "Wim Taymans <wim@fluendo.com>"
 };
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index cccfa724..9463f45e 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -263,7 +263,7 @@ gst_rtp_mp4v_pay_flush (GstRtpMP4VPay * rtpmp4vpay)
 #define VOP_STARTCODE                  	0x000001B6
 
 static gboolean
-gst_rtp_mp4v_pay_parse_data (GstRtpMP4VPay * enc, guint8 * data, guint size,
+gst_rtp_mp4v_pay_depay_data (GstRtpMP4VPay * enc, guint8 * data, guint size,
     gint * strip)
 {
   guint32 code;
@@ -363,9 +363,9 @@ gst_rtp_mp4v_pay_handle_buffer (GstBaseRTPPayload * basepayload,
     rtpmp4vpay->duration = 0;
   }
 
-  /* parse incomming data and see if we need to start a new RTP
+  /* depay incomming data and see if we need to start a new RTP
    * packet */
-  flush = gst_rtp_mp4v_pay_parse_data (rtpmp4vpay, data, size, &strip);
+  flush = gst_rtp_mp4v_pay_depay_data (rtpmp4vpay, data, size, &strip);
   if (strip) {
     /* strip off config if requested */
     if (!rtpmp4vpay->send_config) {
diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c
index 0ae76f0b..d6c6e504 100644
--- a/gst/rtp/gstrtpmpadepay.c
+++ b/gst/rtp/gstrtpmpadepay.c
@@ -24,7 +24,7 @@
 /* elementfactory information */
 static GstElementDetails gst_rtp_mpadepay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts MPEG audio from RTP packets (RFC 2038)",
   "Wim Taymans <wim@fluendo.com>"
 };
diff --git a/gst/rtp/gstrtpspeexdepay.c b/gst/rtp/gstrtpspeexdepay.c
index 1f20147b..c800c62d 100644
--- a/gst/rtp/gstrtpspeexdepay.c
+++ b/gst/rtp/gstrtpspeexdepay.c
@@ -23,7 +23,7 @@
 /* elementfactory information */
 static GstElementDetails gst_rtp_speexdepay_details = {
   "RTP packet parser",
-  "Codec/Parser/Network",
+  "Codec/Depayr/Network",
   "Extracts Speex audio from RTP packets",
   "Edgard Lima <edgard.lima@indt.org.br>"
 };