GstPadTemplate <-> gst_pad_template <-> GST_PAD_TEMPLATE same with *factory and typefind.

Original commit message from CVS:
GstPadTemplate <-> gst_pad_template <-> GST_PAD_TEMPLATE

same with *factory and typefind.

also, some -Werror fixes.

19 files changed, 139 insertions, 139 deletions

diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index e3fb4a2f..57facd34 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -38,13 +38,13 @@ static GstElementDetails gst_auparse_details = {
 };
 
 static GstCaps*
-au_typefind (GstBuffer *buf, gpointer private)
+au_type_find (GstBuffer *buf, gpointer private)
 {
   GstCaps *new = NULL;
   gulong *head = (gulong *) GST_BUFFER_DATA (buf);
 
   if (*head == 0x2e736e64 || *head == 0x646e732e)
-    new = gst_caps_new ("au_typefind", "audio/au", NULL);
+    new = gst_caps_new ("au_type_find", "audio/au", NULL);
 
   return new;
 }
@@ -54,10 +54,10 @@ static GstTypeDefinition audefinition = {
   "auparse_audio/au",
   "audio/au",
   ".au",
-  au_typefind,
+  au_type_find,
 };
 
-GST_PADTEMPLATE_FACTORY (sink_factory_templ,
+GST_PAD_TEMPLATE_FACTORY (sink_factory_templ,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -69,7 +69,7 @@ GST_PADTEMPLATE_FACTORY (sink_factory_templ,
 )
 
 
-GST_PADTEMPLATE_FACTORY (src_factory_templ,
+GST_PAD_TEMPLATE_FACTORY (src_factory_templ,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -150,12 +150,12 @@ static void
 gst_auparse_init (GstAuParse *auparse) 
 {
   auparse->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (sink_factory_templ), "sink");
+		  GST_PAD_TEMPLATE_GET (sink_factory_templ), "sink");
   gst_element_add_pad (GST_ELEMENT (auparse), auparse->sinkpad);
   gst_pad_set_chain_function (auparse->sinkpad, gst_auparse_chain);
 
   auparse->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_factory_templ), "src");
+		  GST_PAD_TEMPLATE_GET (src_factory_templ), "src");
   gst_element_add_pad (GST_ELEMENT (auparse), auparse->srcpad);
 
   auparse->offset = 0;
@@ -297,14 +297,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
 
   /* create the plugin structure */
   /* create an elementfactory for the auparse element and list it */
-  factory = gst_elementfactory_new ("auparse", GST_TYPE_AUPARSE,
+  factory = gst_element_factory_new ("auparse", GST_TYPE_AUPARSE,
                                     &gst_auparse_details);
   g_return_val_if_fail (factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_factory_templ));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_factory_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_factory_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_factory_templ));
 
-  type = gst_typefactory_new (&audefinition);
+  type = gst_type_factory_new (&audefinition);
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
diff --git a/gst/avi/audiocodecs.c b/gst/avi/audiocodecs.c
index 05c8862c..c734957e 100644
--- a/gst/avi/audiocodecs.c
+++ b/gst/avi/audiocodecs.c
@@ -83,9 +83,9 @@ static GstPad *gst_avi_decoder_get_audio_srcpad_MPEG(GstAviDecoder *avi_decoder,
   GstElement *parse_audio, *decode;
   GstPad *srcpad, *sinkpad, *newpad;
 
-  parse_audio = gst_elementfactory_make("mp3parse", "parse_audio");
+  parse_audio = gst_element_factory_make("mp3parse", "parse_audio");
   g_return_val_if_fail(parse_audio != NULL, NULL);
-  decode = gst_elementfactory_make("mpg123", "decode_audio");
+  decode = gst_element_factory_make("mpg123", "decode_audio");
   g_return_val_if_fail(decode != NULL, NULL);
 
   gst_element_set_state(GST_ELEMENT(gst_object_get_parent(GST_OBJECT(avi_decoder))), GST_STATE_PAUSED);
diff --git a/gst/avi/gstaviaudiodecoder.c b/gst/avi/gstaviaudiodecoder.c
index 38a6b853..d3b09b1f 100644
--- a/gst/avi/gstaviaudiodecoder.c
+++ b/gst/avi/gstaviaudiodecoder.c
@@ -47,7 +47,7 @@ enum {
   /* FILL ME */
 };
 
-GST_PADTEMPLATE_FACTORY (sink_templ,
+GST_PAD_TEMPLATE_FACTORY (sink_templ,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -58,7 +58,7 @@ GST_PADTEMPLATE_FACTORY (sink_templ,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (src_audio_templ,
+GST_PAD_TEMPLATE_FACTORY (src_audio_templ,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -174,12 +174,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *factory;
 
   /* create an elementfactory for the avi_audio_decoder element */
-  factory = gst_elementfactory_new ("aviaudiodecoder",GST_TYPE_AVI_AUDIO_DECODER,
+  factory = gst_element_factory_new ("aviaudiodecoder",GST_TYPE_AVI_AUDIO_DECODER,
                                     &gst_avi_audio_decoder_details);
   g_return_val_if_fail (factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_audio_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_audio_templ));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 8023e971..f6ffc792 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -35,14 +35,14 @@ static GstElementDetails gst_avi_demux_details = {
   "(C) 1999",
 };
 
-static GstCaps* avi_typefind (GstBuffer *buf, gpointer private);
+static GstCaps* avi_type_find (GstBuffer *buf, gpointer private);
 
 /* typefactory for 'avi' */
 static GstTypeDefinition avidefinition = {
   "avidemux_video/avi",
   "video/avi",
   ".avi",
-  avi_typefind,
+  avi_type_find,
 };
 
 /* AviDemux signals and args */
@@ -60,7 +60,7 @@ enum {
   /* FILL ME */
 };
 
-GST_PADTEMPLATE_FACTORY (sink_templ,
+GST_PAD_TEMPLATE_FACTORY (sink_templ,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -71,7 +71,7 @@ GST_PADTEMPLATE_FACTORY (sink_templ,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (src_video_templ,
+GST_PAD_TEMPLATE_FACTORY (src_video_templ,
   "video_[00-32]",
   GST_PAD_SRC,
   GST_PAD_SOMETIMES,
@@ -114,7 +114,7 @@ GST_PADTEMPLATE_FACTORY (src_video_templ,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (src_audio_templ,
+GST_PAD_TEMPLATE_FACTORY (src_audio_templ,
   "audio_[00-32]",
   GST_PAD_SRC,
   GST_PAD_SOMETIMES,
@@ -225,7 +225,7 @@ gst_avi_demux_init (GstAviDemux *avi_demux)
   GST_FLAG_SET (avi_demux, GST_ELEMENT_EVENT_AWARE);
 				
   avi_demux->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (sink_templ), "sink");
+		  GST_PAD_TEMPLATE_GET (sink_templ), "sink");
   gst_element_add_pad (GST_ELEMENT (avi_demux), avi_demux->sinkpad);
 
   gst_element_set_loop_function (GST_ELEMENT (avi_demux), gst_avi_demux_loop);
@@ -252,7 +252,7 @@ gst_avi_demux_init (GstAviDemux *avi_demux)
 }
 
 static GstCaps*
-avi_typefind (GstBuffer *buf,
+avi_type_find (GstBuffer *buf,
               gpointer private)
 {
   gchar *data = GST_BUFFER_DATA (buf);
@@ -265,7 +265,7 @@ avi_typefind (GstBuffer *buf,
   if (GUINT32_FROM_LE (((guint32 *)data)[2]) != GST_RIFF_RIFF_AVI)
     return NULL;
 
-  new = GST_CAPS_NEW ("avi_typefind",
+  new = GST_CAPS_NEW ("avi_type_find",
 		      "video/avi", 
 		        "format", GST_PROPS_STRING ("AVI"));
 
@@ -379,7 +379,7 @@ gst_avi_demux_strf_vids (GstAviDemux *avi_demux)
   GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  imp_colors  %d", GUINT32_FROM_LE (strf->imp_colors));
 
   srcpad =  gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", 
+		  GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", 
 			  avi_demux->num_video_pads));
 
   capslist = gst_caps_append(NULL, GST_CAPS_NEW (
@@ -458,7 +458,7 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
   GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  size        %d", GUINT16_FROM_LE (strf->size));
 
   srcpad =  gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_audio_templ), g_strdup_printf ("audio_%02d", 
+		  GST_PAD_TEMPLATE_GET (src_audio_templ), g_strdup_printf ("audio_%02d", 
 			  avi_demux->num_audio_pads));
 
   capslist = gst_caps_append(NULL, GST_CAPS_NEW (
@@ -529,7 +529,7 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux)
   GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVReserved2 %08x", GUINT32_FROM_LE (strf->DVReserved2));
 
   srcpad =  gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", 
+		  GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", 
 			  avi_demux->num_video_pads));
 
   capslist = gst_caps_append(NULL, GST_CAPS_NEW (
@@ -945,15 +945,15 @@ plugin_init (GModule *module, GstPlugin *plugin)
   }
 
   /* create an elementfactory for the avi_demux element */
-  factory = gst_elementfactory_new ("avidemux",GST_TYPE_AVI_DEMUX,
+  factory = gst_element_factory_new ("avidemux",GST_TYPE_AVI_DEMUX,
                                     &gst_avi_demux_details);
   g_return_val_if_fail (factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_audio_templ));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_video_templ));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_audio_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_video_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_templ));
 
-  type = gst_typefactory_new (&avidefinition);
+  type = gst_type_factory_new (&avidefinition);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index bb3eada6..36d568e5 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -65,7 +65,7 @@ enum {
   ARG_FRAMERATE,
 };
 
-GST_PADTEMPLATE_FACTORY (src_factory,
+GST_PAD_TEMPLATE_FACTORY (src_factory,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -76,7 +76,7 @@ GST_PADTEMPLATE_FACTORY (src_factory,
   )
 )
     
-GST_PADTEMPLATE_FACTORY (video_sink_factory,
+GST_PAD_TEMPLATE_FACTORY (video_sink_factory,
   "video_%d",
   GST_PAD_SINK,
   GST_PAD_REQUEST,
@@ -123,7 +123,7 @@ GST_PADTEMPLATE_FACTORY (video_sink_factory,
   )
 )
     
-GST_PADTEMPLATE_FACTORY (audio_sink_factory,
+GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
   "audio_%d",
   GST_PAD_SINK,
   GST_PAD_REQUEST,
@@ -238,7 +238,7 @@ gst_avimux_init (GstAviMux *avimux)
 {
   gint i;
   avimux->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_factory), "src");
+		  GST_PAD_TEMPLATE_GET (src_factory), "src");
   gst_element_add_pad (GST_ELEMENT (avimux), avimux->srcpad);
 
   GST_FLAG_SET (GST_ELEMENT(avimux), GST_ELEMENT_EVENT_AWARE);
@@ -429,7 +429,7 @@ gst_avimux_request_new_pad (GstElement     *element,
 
   avimux = GST_AVIMUX (element);
 
-  if (templ == GST_PADTEMPLATE_GET (audio_sink_factory)) {
+  if (templ == GST_PAD_TEMPLATE_GET (audio_sink_factory)) {
     g_return_val_if_fail(avimux->num_audio_pads == 0 /*< MAX_NUM_AUDIO_PADS*/, NULL);
     name = g_strdup_printf ("audio_%02d", avimux->num_audio_pads);
     newpad = gst_pad_new_from_template (templ, name);
@@ -438,7 +438,7 @@ gst_avimux_request_new_pad (GstElement     *element,
     avimux->audiosinkpad[avimux->num_audio_pads] = newpad;
     avimux->num_audio_pads++;
   }
-  else if (templ == GST_PADTEMPLATE_GET (video_sink_factory)) {
+  else if (templ == GST_PAD_TEMPLATE_GET (video_sink_factory)) {
     g_return_val_if_fail(avimux->num_video_pads == 0 /*< MAX_NUM_VIDEO_PADS*/, NULL);
     name = g_strdup_printf ("video_%02d", avimux->num_video_pads);
     newpad = gst_pad_new_from_template (templ, name);
@@ -1111,13 +1111,13 @@ plugin_init (GModule *module, GstPlugin *plugin)
 #endif
 
   /* create an elementfactory for the avimux element */
-  factory = gst_elementfactory_new ("avimux", GST_TYPE_AVIMUX,
+  factory = gst_element_factory_new ("avimux", GST_TYPE_AVIMUX,
                                     &gst_avimux_details);
   g_return_val_if_fail (factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_factory));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (audio_sink_factory));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (video_sink_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (audio_sink_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (video_sink_factory));
   
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/avi/gstcdxaparse.c b/gst/avi/gstcdxaparse.c
index ead5854b..5d26e45a 100644
--- a/gst/avi/gstcdxaparse.c
+++ b/gst/avi/gstcdxaparse.c
@@ -46,14 +46,14 @@ static GstElementDetails gst_cdxa_parse_details = {
   "(C) 2002",
 };
 
-static GstCaps* cdxa_typefind (GstBuffer *buf, gpointer private);
+static GstCaps* cdxa_type_find (GstBuffer *buf, gpointer private);
 
 /* typefactory for 'cdxa' */
 static GstTypeDefinition cdxadefinition = {
   "cdxaparse_video/avi",
   "video/avi",
   ".dat",
-  cdxa_typefind,
+  cdxa_type_find,
 };
 
 /* CDXAParse signals and args */
@@ -67,7 +67,7 @@ enum {
   /* FILL ME */
 };
 
-GST_PADTEMPLATE_FACTORY (sink_templ,
+GST_PAD_TEMPLATE_FACTORY (sink_templ,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -78,7 +78,7 @@ GST_PADTEMPLATE_FACTORY (sink_templ,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (src_templ,
+GST_PAD_TEMPLATE_FACTORY (src_templ,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -144,11 +144,11 @@ gst_cdxa_parse_init (GstCDXAParse *cdxa_parse)
   GST_FLAG_SET (cdxa_parse, GST_ELEMENT_EVENT_AWARE);
 				
   cdxa_parse->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (sink_templ), "sink");
+		  GST_PAD_TEMPLATE_GET (sink_templ), "sink");
   gst_element_add_pad (GST_ELEMENT (cdxa_parse), cdxa_parse->sinkpad);
 
   cdxa_parse->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_templ), "src");
+		  GST_PAD_TEMPLATE_GET (src_templ), "src");
   gst_element_add_pad (GST_ELEMENT (cdxa_parse), cdxa_parse->srcpad);
 
   gst_element_set_loop_function (GST_ELEMENT (cdxa_parse), gst_cdxa_parse_loop);
@@ -156,7 +156,7 @@ gst_cdxa_parse_init (GstCDXAParse *cdxa_parse)
 }
 
 static GstCaps*
-cdxa_typefind (GstBuffer *buf,
+cdxa_type_find (GstBuffer *buf,
               gpointer private)
 {
   gchar *data = GST_BUFFER_DATA (buf);
@@ -169,7 +169,7 @@ cdxa_typefind (GstBuffer *buf,
   if (GUINT32_FROM_LE (((guint32 *)data)[2]) != GST_RIFF_RIFF_CDXA)
     return NULL;
 
-  new = GST_CAPS_NEW ("cdxa_typefind",
+  new = GST_CAPS_NEW ("cdxa_type_find",
 		      "video/avi", 
 		        "RIFF", GST_PROPS_STRING ("CDXA"));
 
@@ -339,14 +339,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
   }
 
   /* create an elementfactory for the cdxa_parse element */
-  factory = gst_elementfactory_new ("cdxaparse", GST_TYPE_CDXA_PARSE,
+  factory = gst_element_factory_new ("cdxaparse", GST_TYPE_CDXA_PARSE,
                                     &gst_cdxa_parse_details);
   g_return_val_if_fail (factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_templ));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_templ));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_templ));
 
-  type = gst_typefactory_new (&cdxadefinition);
+  type = gst_type_factory_new (&cdxadefinition);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index 74d582e5..39f60ca8 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -49,7 +49,7 @@ enum {
   ARG_PRE_LENGTH
 };
 
-GST_PADTEMPLATE_FACTORY (cutter_src_factory,
+GST_PAD_TEMPLATE_FACTORY (cutter_src_factory,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -60,7 +60,7 @@ GST_PADTEMPLATE_FACTORY (cutter_src_factory,
   )
 );
 
-GST_PADTEMPLATE_FACTORY (cutter_sink_factory,
+GST_PAD_TEMPLATE_FACTORY (cutter_sink_factory,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -353,12 +353,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
 {
   GstElementFactory *factory;
 
-  factory = gst_elementfactory_new("cutter",GST_TYPE_CUTTER,
+  factory = gst_element_factory_new("cutter",GST_TYPE_CUTTER,
                                    &cutter_details);
   g_return_val_if_fail(factory != NULL, FALSE);
   
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (cutter_src_factory));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (cutter_sink_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (cutter_src_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (cutter_sink_factory));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index eeeb9c5a..8aeb5532 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -24,7 +24,7 @@
 
 #define JIFFIE  (1000000/70)
 
-static GstCaps* flxdec_typefind(GstBuffer *buf, gpointer private);
+static GstCaps* flxdec_type_find(GstBuffer *buf, gpointer private);
 
 /* flx element information */
 static GstElementDetails flxdec_details = {
@@ -40,7 +40,7 @@ static GstTypeDefinition flxdec_definition = {
   "flxdec_video/fli",
   "video/fli",
   ".flc .fli",
-  flxdec_typefind,
+  flxdec_type_find,
 };
 
 /* Flx signals and args */
@@ -54,7 +54,7 @@ enum {
 };
 
 /* input */
-GST_PADTEMPLATE_FACTORY (sink_factory,
+GST_PAD_TEMPLATE_FACTORY (sink_factory,
   "sink",          
   GST_PAD_SINK, 
   GST_PAD_ALWAYS,
@@ -66,7 +66,7 @@ GST_PADTEMPLATE_FACTORY (sink_factory,
 )
 
 /* output */
-GST_PADTEMPLATE_FACTORY (src_video_factory,
+GST_PAD_TEMPLATE_FACTORY (src_video_factory,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -108,7 +108,7 @@ static void 	flx_decode_delta_flc	(GstFlxDec *, guchar *, guchar *);
 static GstElementClass *parent_class = NULL;
 
 static GstCaps* 
-flxdec_typefind (GstBuffer *buf, gpointer private)
+flxdec_type_find (GstBuffer *buf, gpointer private)
 {
   guchar *data = GST_BUFFER_DATA(buf);
   GstCaps *new;
@@ -119,7 +119,7 @@ flxdec_typefind (GstBuffer *buf, gpointer private)
       /* check the frame type of the first frame */
       if ((data[132] == 0x00 || data[132] == 0xfa) && data[133] == 0xf1) {
         g_print("GstFlxDec: found supported flx format\n");
-        new = gst_caps_new("flxdec_typefind","video/fli", NULL);
+        new = gst_caps_new("flxdec_type_find","video/fli", NULL);
         return new;
       }
   }
@@ -172,12 +172,12 @@ static void
 gst_flxdec_init(GstFlxDec *flxdec) 
 {
   flxdec->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (sink_factory), "sink");
+		  GST_PAD_TEMPLATE_GET (sink_factory), "sink");
   gst_element_add_pad(GST_ELEMENT(flxdec),flxdec->sinkpad);
   gst_element_set_loop_function(GST_ELEMENT(flxdec),gst_flxdec_loop);
 
   flxdec->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_video_factory), "src");
+		  GST_PAD_TEMPLATE_GET (src_video_factory), "src");
   gst_element_add_pad(GST_ELEMENT(flxdec),flxdec->srcpad);
 
   flxdec->bs = NULL;
@@ -682,15 +682,15 @@ plugin_init (GModule *module, GstPlugin *plugin)
     return FALSE;
   }
 
-  factory = gst_elementfactory_new("flxdec", GST_TYPE_FLXDEC, &flxdec_details);
+  factory = gst_element_factory_new("flxdec", GST_TYPE_FLXDEC, &flxdec_details);
   g_return_val_if_fail(factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_factory));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_video_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_video_factory));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
-  type = gst_typefactory_new (&flxdec_definition);
+  type = gst_type_factory_new (&flxdec_definition);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
 
   return TRUE;
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index fe9d5407..4a515a04 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -80,7 +80,7 @@ enum {
   /* FILL ME */
 };
 
-GST_PADTEMPLATE_FACTORY (src_template,
+GST_PAD_TEMPLATE_FACTORY (src_template,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -99,7 +99,7 @@ GST_PADTEMPLATE_FACTORY (src_template,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (sink_template,
+GST_PAD_TEMPLATE_FACTORY (sink_template,
   "sink",					/* the name of the pads */
   GST_PAD_SINK,				/* type of the pad */
   GST_PAD_ALWAYS,				/* ALWAYS/SOMETIMES */
@@ -186,9 +186,9 @@ gst_goom_init (GstGOOM *goom)
 {
   /* create the sink and src pads */
   goom->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (sink_template ), "sink");
+		  GST_PAD_TEMPLATE_GET (sink_template ), "sink");
   goom->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_template ), "src");
+		  GST_PAD_TEMPLATE_GET (src_template ), "src");
   gst_element_add_pad (GST_ELEMENT (goom), goom->sinkpad);
   gst_element_add_pad (GST_ELEMENT (goom), goom->srcpad);
 
@@ -345,12 +345,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *factory;
 
   /* create an elementfactory for the goom element */
-  factory = gst_elementfactory_new("goom",GST_TYPE_GOOM,
+  factory = gst_element_factory_new("goom",GST_TYPE_GOOM,
                                    &gst_goom_details);
   g_return_val_if_fail(factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_template));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_template));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_template));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_template));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/law/alaw.c b/gst/law/alaw.c
index 1b9afb5c..e7eaec9f 100644
--- a/gst/law/alaw.c
+++ b/gst/law/alaw.c
@@ -60,26 +60,26 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *alawenc_factory, *alawdec_factory;
   GstCaps* alaw_caps, *linear_caps;
 
-  alawenc_factory = gst_elementfactory_new("alawencode",GST_TYPE_ALAWENC,
+  alawenc_factory = gst_element_factory_new("alawencode",GST_TYPE_ALAWENC,
                                             &alawenc_details);
   g_return_val_if_fail(alawenc_factory != NULL, FALSE);
-  alawdec_factory = gst_elementfactory_new("alawdecode",GST_TYPE_ALAWDEC,
+  alawdec_factory = gst_element_factory_new("alawdecode",GST_TYPE_ALAWDEC,
 					    &alawdec_details);
   g_return_val_if_fail(alawdec_factory != NULL, FALSE);
 
   alaw_caps = alaw_factory ();
   linear_caps = linear_factory ();
  
-  alawenc_src_template = gst_padtemplate_new ("src",GST_PAD_SRC,GST_PAD_ALWAYS,alaw_caps, NULL);
-  alawenc_sink_template = gst_padtemplate_new ("sink",GST_PAD_SINK,GST_PAD_ALWAYS,linear_caps, NULL);
-  gst_elementfactory_add_padtemplate (alawenc_factory, alawenc_src_template);
-  gst_elementfactory_add_padtemplate (alawenc_factory, alawenc_sink_template);
+  alawenc_src_template = gst_pad_template_new ("src",GST_PAD_SRC,GST_PAD_ALWAYS,alaw_caps, NULL);
+  alawenc_sink_template = gst_pad_template_new ("sink",GST_PAD_SINK,GST_PAD_ALWAYS,linear_caps, NULL);
+  gst_element_factory_add_pad_template (alawenc_factory, alawenc_src_template);
+  gst_element_factory_add_pad_template (alawenc_factory, alawenc_sink_template);
 
-  alawdec_src_template = gst_padtemplate_new ("src",GST_PAD_SRC,GST_PAD_ALWAYS,linear_caps, NULL);
-  alawdec_sink_template = gst_padtemplate_new ("sink",GST_PAD_SINK,GST_PAD_ALWAYS,alaw_caps, NULL);
+  alawdec_src_template = gst_pad_template_new ("src",GST_PAD_SRC,GST_PAD_ALWAYS,linear_caps, NULL);
+  alawdec_sink_template = gst_pad_template_new ("sink",GST_PAD_SINK,GST_PAD_ALWAYS,alaw_caps, NULL);
   
-  gst_elementfactory_add_padtemplate (alawdec_factory, alawdec_src_template);
-  gst_elementfactory_add_padtemplate (alawdec_factory, alawdec_sink_template);
+  gst_element_factory_add_pad_template (alawdec_factory, alawdec_src_template);
+  gst_element_factory_add_pad_template (alawdec_factory, alawdec_sink_template);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (alawenc_factory));
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (alawdec_factory));
 
diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c
index 5b97eca3..6e4e0261 100644
--- a/gst/law/mulaw.c
+++ b/gst/law/mulaw.c
@@ -60,31 +60,31 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *mulawenc_factory, *mulawdec_factory;
   GstCaps* mulaw_caps, *linear_caps;
 
-  mulawenc_factory = gst_elementfactory_new("mulawencode",GST_TYPE_MULAWENC,
+  mulawenc_factory = gst_element_factory_new("mulawencode",GST_TYPE_MULAWENC,
                                             &mulawenc_details);
   g_return_val_if_fail(mulawenc_factory != NULL, FALSE);
-  mulawdec_factory = gst_elementfactory_new("mulawdecode",GST_TYPE_MULAWDEC,
+  mulawdec_factory = gst_element_factory_new("mulawdecode",GST_TYPE_MULAWDEC,
 					    &mulawdec_details);
   g_return_val_if_fail(mulawdec_factory != NULL, FALSE);
 
   mulaw_caps = mulaw_factory ();
   linear_caps = linear_factory ();
  
-  mulawenc_src_template = gst_padtemplate_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+  mulawenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
 		   		               mulaw_caps, NULL);
-  mulawenc_sink_template = gst_padtemplate_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+  mulawenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
 		   			        linear_caps, NULL);
 
-  gst_elementfactory_add_padtemplate (mulawenc_factory, mulawenc_src_template);
-  gst_elementfactory_add_padtemplate (mulawenc_factory, mulawenc_sink_template);
+  gst_element_factory_add_pad_template (mulawenc_factory, mulawenc_src_template);
+  gst_element_factory_add_pad_template (mulawenc_factory, mulawenc_sink_template);
 
-  mulawdec_src_template = gst_padtemplate_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+  mulawdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
 		  				linear_caps, NULL);
-  mulawdec_sink_template = gst_padtemplate_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+  mulawdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
 		   				mulaw_caps, NULL);
   
-  gst_elementfactory_add_padtemplate (mulawdec_factory, mulawdec_src_template);
-  gst_elementfactory_add_padtemplate (mulawdec_factory, mulawdec_sink_template);
+  gst_element_factory_add_pad_template (mulawdec_factory, mulawdec_src_template);
+  gst_element_factory_add_pad_template (mulawdec_factory, mulawdec_sink_template);
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (mulawenc_factory));
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (mulawdec_factory));
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 29f1863c..d1eaf7ef 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -48,7 +48,7 @@ level_src_factory (void)
   static GstPadTemplate *template = NULL;
 
   if (!template) {
-    template = gst_padtemplate_new (
+    template = gst_pad_template_new (
       "src",
       GST_PAD_SRC,
       GST_PAD_ALWAYS,
@@ -69,7 +69,7 @@ level_sink_factory (void)
   static GstPadTemplate *template = NULL;
 
   if (!template) {
-    template = gst_padtemplate_new (
+    template = gst_pad_template_new (
       "sink",
       GST_PAD_SINK,
       GST_PAD_ALWAYS,
@@ -240,12 +240,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
 {
   GstElementFactory *factory;
 
-  factory = gst_elementfactory_new("level",GST_TYPE_LEVEL,
+  factory = gst_element_factory_new("level",GST_TYPE_LEVEL,
                                    &level_details);
   g_return_val_if_fail(factory != NULL, FALSE);
   
-  gst_elementfactory_add_padtemplate (factory, level_src_factory ());
-  gst_elementfactory_add_padtemplate (factory, level_sink_factory ());
+  gst_element_factory_add_pad_template (factory, level_src_factory ());
+  gst_element_factory_add_pad_template (factory, level_sink_factory ());
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c
index 9cedb2bc..67ada2a8 100644
--- a/gst/median/gstmedian.c
+++ b/gst/median/gstmedian.c
@@ -30,7 +30,7 @@ static GstElementDetails median_details = {
   "(C) 2000",
 };
 
-GST_PADTEMPLATE_FACTORY (median_src_factory,
+GST_PAD_TEMPLATE_FACTORY (median_src_factory,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -41,7 +41,7 @@ GST_PADTEMPLATE_FACTORY (median_src_factory,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (median_sink_factory,
+GST_PAD_TEMPLATE_FACTORY (median_sink_factory,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -143,13 +143,13 @@ gst_median_sinkconnect (GstPad *pad, GstCaps *caps)
 void gst_median_init (GstMedian *median)
 {
   median->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (median_sink_factory), "sink");
+		  GST_PAD_TEMPLATE_GET (median_sink_factory), "sink");
   gst_pad_set_connect_function (median->sinkpad, gst_median_sinkconnect);
   gst_pad_set_chain_function (median->sinkpad, gst_median_chain);
   gst_element_add_pad (GST_ELEMENT (median), median->sinkpad);
 
   median->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (median_src_factory), "src");
+		  GST_PAD_TEMPLATE_GET (median_src_factory), "src");
   gst_element_add_pad (GST_ELEMENT (median), median->srcpad);
 
   median->filtersize = 5;
@@ -378,12 +378,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
 {
   GstElementFactory *factory;
 
-  factory = gst_elementfactory_new("median",GST_TYPE_MEDIAN,
+  factory = gst_element_factory_new("median",GST_TYPE_MEDIAN,
                                    &median_details);
   g_return_val_if_fail(factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (median_sink_factory));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (median_src_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (median_sink_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (median_src_factory));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 61d155e0..b7af3eb3 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -83,7 +83,7 @@ enum {
   /* FILL ME */
 };
 
-GST_PADTEMPLATE_FACTORY (src_template,
+GST_PAD_TEMPLATE_FACTORY (src_template,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -102,7 +102,7 @@ GST_PADTEMPLATE_FACTORY (src_template,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (sink_template,
+GST_PAD_TEMPLATE_FACTORY (sink_template,
   "sink",					/* the name of the pads */
   GST_PAD_SINK,				/* type of the pad */
   GST_PAD_ALWAYS,				/* ALWAYS/SOMETIMES */
@@ -189,9 +189,9 @@ gst_monoscope_init (GstMonoscope *monoscope)
 {
   /* create the sink and src pads */
   monoscope->sinkpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (sink_template ), "sink");
+		  GST_PAD_TEMPLATE_GET (sink_template ), "sink");
   monoscope->srcpad = gst_pad_new_from_template (
-		  GST_PADTEMPLATE_GET (src_template ), "src");
+		  GST_PAD_TEMPLATE_GET (src_template ), "src");
   gst_element_add_pad (GST_ELEMENT (monoscope), monoscope->sinkpad);
   gst_element_add_pad (GST_ELEMENT (monoscope), monoscope->srcpad);
 
@@ -350,12 +350,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *factory;
 
   /* create an elementfactory for the monoscope element */
-  factory = gst_elementfactory_new("monoscope",GST_TYPE_MONOSCOPE,
+  factory = gst_element_factory_new("monoscope",GST_TYPE_MONOSCOPE,
                                    &gst_monoscope_details);
   g_return_val_if_fail(factory != NULL, FALSE);
 
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_template));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_template));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_template));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_template));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
diff --git a/gst/smoothwave/demo-osssrc.c b/gst/smoothwave/demo-osssrc.c
index 6f5ee57a..4807a3a4 100644
--- a/gst/smoothwave/demo-osssrc.c
+++ b/gst/smoothwave/demo-osssrc.c
@@ -24,14 +24,14 @@ int main(int argc,char *argv[]) {
 
   bin = gst_bin_new("bin");
 
-  srcfactory = gst_elementfactory_find("audiosrc");
+  srcfactory = gst_element_factory_find("audiosrc");
   g_return_val_if_fail(srcfactory != NULL, -1);
-  wavefactory = gst_elementfactory_find("smoothwave");
+  wavefactory = gst_element_factory_find("smoothwave");
   g_return_val_if_fail(wavefactory != NULL, -1);
 
-  src = gst_elementfactory_create(srcfactory,"src");
+  src = gst_element_factory_create(srcfactory,"src");
   gtk_object_set(GTK_OBJECT(src),"bytes_per_read",(gulong)2048,NULL);
-  wave = gst_elementfactory_create(wavefactory,"wave");
+  wave = gst_element_factory_create(wavefactory,"wave");
   gtk_object_set(GTK_OBJECT(wave),"width",256,"height",100,NULL);
 
 
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 48d32c4b..7f2246f3 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -284,7 +284,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *factory;
 
   /* create an elementfactory for the smoothwave element */
-  factory = gst_elementfactory_new("smoothwave",GST_TYPE_SMOOTHWAVE,
+  factory = gst_element_factory_new("smoothwave",GST_TYPE_SMOOTHWAVE,
                                    &gst_smoothwave_details);
   g_return_val_if_fail(factory != NULL, FALSE);
 
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index f8461a5c..8c84ee55 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -192,7 +192,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *factory;
 
   /* create an elementfactory for the spectrum element */
-  factory = gst_elementfactory_new ("spectrum",GST_TYPE_SPECTRUM,
+  factory = gst_element_factory_new ("spectrum",GST_TYPE_SPECTRUM,
                                     &gst_spectrum_details);
   g_return_val_if_fail (factory != NULL, FALSE);
 
diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c
index 401290eb..1a2f4a1c 100644
--- a/gst/udp/gstudp.c
+++ b/gst/udp/gstudp.c
@@ -31,12 +31,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstElementFactory *src, *sink;
 
   /* create an elementfactory for the udpsrc element */
-  sink = gst_elementfactory_new ("udpsink",GST_TYPE_UDPSINK,
+  sink = gst_element_factory_new ("udpsink",GST_TYPE_UDPSINK,
                                    &gst_udpsink_details);
   g_return_val_if_fail (sink != NULL, FALSE);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (sink));
 
-  src = gst_elementfactory_new ("udpsrc",GST_TYPE_UDPSRC,
+  src = gst_element_factory_new ("udpsrc",GST_TYPE_UDPSRC,
                                    &gst_udpsrc_details);
   g_return_val_if_fail (src != NULL, FALSE);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (src));
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 388e3beb..03007e77 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -25,7 +25,7 @@
 static void		gst_wavparse_class_init	(GstWavParseClass *klass);
 static void		gst_wavparse_init	(GstWavParse *wavparse);
 
-static GstCaps*		wav_typefind		(GstBuffer *buf, gpointer private);
+static GstCaps*		wav_type_find		(GstBuffer *buf, gpointer private);
 
 static void		gst_wavparse_chain	(GstPad *pad, GstBuffer *buf);
 
@@ -39,7 +39,7 @@ static GstElementDetails gst_wavparse_details = {
   "(C) 1999",
 };
 
-GST_PADTEMPLATE_FACTORY (sink_template_factory,
+GST_PAD_TEMPLATE_FACTORY (sink_template_factory,
   "wavparse_sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
@@ -50,7 +50,7 @@ GST_PADTEMPLATE_FACTORY (sink_template_factory,
   )
 )
 
-GST_PADTEMPLATE_FACTORY (src_template_factory,
+GST_PAD_TEMPLATE_FACTORY (src_template_factory,
   "wavparse_src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
@@ -81,7 +81,7 @@ wavdefinition =
   "wavparse_audio/wav",
   "audio/wav",
   ".wav",
-  wav_typefind,
+  wav_type_find,
 };
 
 
@@ -133,11 +133,11 @@ gst_wavparse_class_init (GstWavParseClass *klass)
 static void 
 gst_wavparse_init (GstWavParse *wavparse) 
 {
-  wavparse->sinkpad = gst_pad_new_from_template (GST_PADTEMPLATE_GET (sink_template_factory), "sink");
+  wavparse->sinkpad = gst_pad_new_from_template (GST_PAD_TEMPLATE_GET (sink_template_factory), "sink");
   gst_element_add_pad (GST_ELEMENT (wavparse), wavparse->sinkpad);
   gst_pad_set_chain_function (wavparse->sinkpad, gst_wavparse_chain);
 
-  wavparse->srcpad = gst_pad_new_from_template (GST_PADTEMPLATE_GET (src_template_factory), "src");
+  wavparse->srcpad = gst_pad_new_from_template (GST_PAD_TEMPLATE_GET (src_template_factory), "src");
   gst_element_add_pad (GST_ELEMENT (wavparse), wavparse->srcpad);
 
   wavparse->riff = NULL;
@@ -150,14 +150,14 @@ gst_wavparse_init (GstWavParse *wavparse)
 }
 
 static GstCaps*
-wav_typefind (GstBuffer *buf, gpointer private)
+wav_type_find (GstBuffer *buf, gpointer private)
 {
   gchar *data = GST_BUFFER_DATA (buf);
 
   if (strncmp (&data[0], "RIFF", 4)) return NULL;
   if (strncmp (&data[8], "WAVE", 4)) return NULL;
 
-  return gst_caps_new ("wav_typefind", "audio/wav", NULL);
+  return gst_caps_new ("wav_type_find", "audio/wav", NULL);
 }
 
 
@@ -344,17 +344,17 @@ plugin_init (GModule *module, GstPlugin *plugin)
   GstTypeFactory *type;
 
   /* create an elementfactory for the wavparse element */
-  factory = gst_elementfactory_new ("wavparse", GST_TYPE_WAVPARSE,
+  factory = gst_element_factory_new ("wavparse", GST_TYPE_WAVPARSE,
                                     &gst_wavparse_details);
   g_return_val_if_fail(factory != NULL, FALSE);
 
   /* register src pads */
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_template_factory));
-  gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_template_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_template_factory));
+  gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_template_factory));
 
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
 
-  type = gst_typefactory_new (&wavdefinition);
+  type = gst_type_factory_new (&wavdefinition);
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
 
   return TRUE;