diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c
index 6ff5eb4777..8dff99a379 100644
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@@ -235,7 +235,7 @@ gst_aasink_class_init (GstAASinkClass *klass)
   gstelement_class->set_clock    = gst_aasink_set_clock;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_aasink_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstAASink *aasink;
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 8c1daae047..43fe858960 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -87,7 +87,7 @@ static gboolean			gst_esdsink_open_audio		(GstEsdsink *sink);
 static void			gst_esdsink_close_audio		(GstEsdsink *sink);
 static GstElementStateReturn	gst_esdsink_change_state	(GstElement *element);
 static gboolean			gst_esdsink_sync_parms		(GstEsdsink *esdsink);
-static GstPadConnectReturn	gst_esdsink_sinkconnect		(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn	gst_esdsink_sinkconnect		(GstPad *pad, GstCaps *caps);
 
 static void			gst_esdsink_chain		(GstPad *pad, GstBuffer *buf);
 
@@ -218,7 +218,7 @@ gst_esdsink_sync_parms (GstEsdsink *esdsink)
   return gst_esdsink_open_audio (esdsink);
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_esdsink_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstEsdsink *esdsink;
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 73b7a08cfb..fec7d609ab 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -65,7 +65,7 @@ static void		gst_flacenc_init		(FlacEnc *flacenc);
 static void		gst_flacenc_class_init		(FlacEncClass *klass);
 static void 		gst_flacenc_dispose 		(GObject *object);
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 			gst_flacenc_sinkconnect 	(GstPad *pad, GstCaps *caps);
 static void		gst_flacenc_chain		(GstPad *pad, GstBuffer *buf);
 
@@ -298,7 +298,7 @@ gst_flacenc_dispose (GObject *object)
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_flacenc_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   FlacEnc *flacenc;
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index 02b4609cc0..7f941b81af 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -72,8 +72,8 @@ static void			gst_ladspa_class_init		(GstLADSPAClass *klass);
 static void			gst_ladspa_init			(GstLADSPA *ladspa);
 
 static void			gst_ladspa_update_int(const GValue *value, gpointer data);
-static GstPadConnectReturn	gst_ladspa_connect		(GstPad *pad, GstCaps *caps);
-static GstPadConnectReturn	gst_ladspa_connect_get		(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn	gst_ladspa_connect		(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn	gst_ladspa_connect_get		(GstPad *pad, GstCaps *caps);
 static void			gst_ladspa_force_src_caps	(GstLADSPA *ladspa, GstPad *pad);
 
 static void			gst_ladspa_set_property		(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -482,7 +482,7 @@ gst_ladspa_update_int(const GValue *value, gpointer data)
   *target = (gfloat)g_value_get_int(value);
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_ladspa_connect (GstPad *pad, GstCaps *caps)
 {
   GstLADSPA *ladspa = (GstLADSPA *) GST_PAD_PARENT (pad);
@@ -516,7 +516,7 @@ gst_ladspa_connect (GstPad *pad, GstCaps *caps)
   return GST_PAD_LINK_OK;
 }
 
-static GstPadConnectReturn 
+static GstPadLinkReturn 
 gst_ladspa_connect_get (GstPad *pad, GstCaps *caps) 
 {
   GstLADSPA *ladspa = (GstLADSPA*)GST_OBJECT_PARENT (pad);
diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c
index 101396c08d..78c27c57f6 100644
--- a/ext/libpng/gstpngenc.c
+++ b/ext/libpng/gstpngenc.c
@@ -108,7 +108,7 @@ gst_pngenc_class_init (GstPngEncClass * klass)
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_pngenc_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstPngEnc *pngenc;
diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c
index 45541ad0f8..4a056ab5a2 100644
--- a/ext/shout2/gstshout2.c
+++ b/ext/shout2/gstshout2.c
@@ -83,7 +83,7 @@ static void			gst_shout2send_class_init	(GstShout2sendClass *klass);
 static void			gst_shout2send_init		(GstShout2send *shout2send);
 
 static void			gst_shout2send_chain		(GstPad *pad, GstBuffer *buf);
-static GstPadConnectReturn      gst_shout2send_connect         (GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn      gst_shout2send_connect         (GstPad *pad, GstCaps *caps);
 
 static void			gst_shout2send_set_property		(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void			gst_shout2send_get_property		(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
@@ -353,7 +353,7 @@ gst_shout2send_get_property (GObject *object, guint prop_id, GValue *value, GPar
   }
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_shout2send_connect (GstPad *pad, GstCaps *caps)
 
 {
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c
index 062c68e21d..924f0b02d7 100644
--- a/ext/speex/gstspeexdec.c
+++ b/ext/speex/gstspeexdec.c
@@ -49,7 +49,7 @@ static void			gst_speexdec_class_init	(GstSpeexDec *klass);
 static void			gst_speexdec_init		(GstSpeexDec *speexdec);
 
 static void			gst_speexdec_chain	(GstPad *pad, GstBuffer *buf);
-static GstPadConnectReturn	gst_speexdec_sinkconnect 	(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn	gst_speexdec_sinkconnect 	(GstPad *pad, GstCaps *caps);
 
 static GstElementClass *parent_class = NULL;
 /*static guint gst_speexdec_signals[LAST_SIGNAL] = { 0 }; */
@@ -100,7 +100,7 @@ gst_speexdec_init (GstSpeexDec *speexdec)
 
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_speexdec_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstSpeexDec *speexdec;
diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c
index a3f33e193e..006700bd8f 100644
--- a/ext/speex/gstspeexenc.c
+++ b/ext/speex/gstspeexenc.c
@@ -50,7 +50,7 @@ static void			gst_speexenc_class_init	(GstSpeexEnc *klass);
 static void			gst_speexenc_init		(GstSpeexEnc *speexenc);
 
 static void			gst_speexenc_chain	(GstPad *pad,GstBuffer *buf);
-static GstPadConnectReturn	gst_speexenc_sinkconnect 	(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn	gst_speexenc_sinkconnect 	(GstPad *pad, GstCaps *caps);
 
 static GstElementClass *parent_class = NULL;
 static guint gst_speexenc_signals[LAST_SIGNAL] = { 0 };
@@ -114,7 +114,7 @@ gst_speexenc_init (GstSpeexEnc *speexenc)
   speexenc->n_packets = 20;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_speexenc_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstSpeexEnc *speexenc;
diff --git a/gst/audiofx/audiowsincband.c b/gst/audiofx/audiowsincband.c
index 89c95f9313..7ee8680b57 100644
--- a/gst/audiofx/audiowsincband.c
+++ b/gst/audiofx/audiowsincband.c
@@ -102,7 +102,7 @@ static void gst_bpwsinc_get_property	(GObject * object, guint prop_id,
                                          GValue * value, GParamSpec * pspec);
 
 static void gst_bpwsinc_chain		(GstPad * pad, GstBuffer * buf);
-static GstPadConnectReturn
+static GstPadLinkReturn
        gst_bpwsinc_sink_connect 		(GstPad * pad, GstCaps * caps);
 
 static GstElementClass *parent_class = NULL;
@@ -174,14 +174,14 @@ gst_bpwsinc_init (GstBPWSinc * filter)
   filter->kernel = NULL;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
 {
   int i = 0;
   double sum = 0.0;
   int len = 0;
   double *kernel_lp, *kernel_hp;
-  GstPadConnectReturn set_retval;
+  GstPadLinkReturn set_retval;
   
   GstBPWSinc *filter = GST_BPWSINC (gst_pad_get_parent (pad));
 
diff --git a/gst/audiofx/audiowsinclimit.c b/gst/audiofx/audiowsinclimit.c
index 6be8e1adcb..74cea70ef8 100644
--- a/gst/audiofx/audiowsinclimit.c
+++ b/gst/audiofx/audiowsinclimit.c
@@ -99,7 +99,7 @@ static void gst_lpwsinc_get_property	(GObject * object, guint prop_id,
                                          GValue * value, GParamSpec * pspec);
 
 static void gst_lpwsinc_chain		(GstPad * pad, GstBuffer * buf);
-static GstPadConnectReturn
+static GstPadLinkReturn
        gst_lpwsinc_sink_connect 		(GstPad * pad, GstCaps * caps);
 
 static GstElementClass *parent_class = NULL;
@@ -165,14 +165,14 @@ gst_lpwsinc_init (GstLPWSinc * filter)
   filter->kernel = NULL;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
 {
   int i = 0;
   double sum = 0.0;
   int len = 0;
   GstLPWSinc *filter = GST_LPWSINC (gst_pad_get_parent (pad));
-  GstPadConnectReturn set_retval;
+  GstPadLinkReturn set_retval;
 
   g_assert (GST_IS_PAD (pad));
   g_assert (caps != NULL);
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index f66ea1d8ca..e1821c07bc 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -293,7 +293,7 @@ gst_avimux_init (GstAviMux *avimux)
   gst_element_set_loop_function(GST_ELEMENT(avimux), gst_avimux_loop);
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
 {
   GstAviMux *avimux;
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index 7627ff85ef..103f4d0679 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -108,7 +108,7 @@ gst_cutter_get_type(void) {
   return cutter_type;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_cutter_connect (GstPad *pad, GstCaps *caps)
 {
   GstCutter *filter;
diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c
index 070c5f19b3..e60b49ec57 100644
--- a/gst/effectv/gstaging.c
+++ b/gst/effectv/gstaging.c
@@ -149,7 +149,7 @@ gst_agingtv_class_init (GstAgingTVClass * klass)
   gobject_class->get_property = gst_agingtv_get_property;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_agingtv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstAgingTV *filter;
diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c
index 6f1e9f2036..4286f07e73 100644
--- a/gst/effectv/gstdice.c
+++ b/gst/effectv/gstdice.c
@@ -155,7 +155,7 @@ gst_dicetv_class_init (GstDiceTVClass * klass)
   gobject_class->get_property = gst_dicetv_get_property;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_dicetv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstDiceTV *filter;
diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c
index cc18aa20ef..4d25fddd8e 100644
--- a/gst/effectv/gstedge.c
+++ b/gst/effectv/gstedge.c
@@ -129,7 +129,7 @@ gst_edgetv_class_init (GstEdgeTVClass * klass)
   gobject_class->get_property = gst_edgetv_get_property;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_edgetv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstEdgeTV *filter;
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index ac6ae719b7..c48cddada5 100644
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -154,7 +154,7 @@ gst_quarktv_class_init (GstQuarkTVClass * klass)
   gstelement_class->change_state = gst_quarktv_change_state;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_quarktv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstQuarkTV *filter;
diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c
index 49cbfb2386..870e47a905 100644
--- a/gst/effectv/gstrev.c
+++ b/gst/effectv/gstrev.c
@@ -168,7 +168,7 @@ gst_revtv_class_init (GstRevTVClass * klass)
   gobject_class->get_property = gst_revtv_get_property;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_revtv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstRevTV *filter;
diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c
index 63cc0a0396..38fbb7a363 100644
--- a/gst/effectv/gstshagadelic.c
+++ b/gst/effectv/gstshagadelic.c
@@ -138,7 +138,7 @@ gst_shagadelictv_class_init (GstShagadelicTVClass * klass)
   gobject_class->get_property = gst_shagadelictv_get_property;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_shagadelictv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstShagadelicTV *filter;
diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c
index d40c89b901..0c5d507ff5 100644
--- a/gst/effectv/gstvertigo.c
+++ b/gst/effectv/gstvertigo.c
@@ -172,7 +172,7 @@ gst_vertigotv_reset_handler (GstElement *element)
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_vertigotv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstVertigoTV *filter;
diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 939ca1507a..e82dcaad37 100644
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -145,7 +145,7 @@ gst_warptv_class_init (GstWarpTVClass * klass)
   gobject_class->get_property = gst_warptv_get_property;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_warptv_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   GstWarpTV *filter;
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index 0e7f3bb5c1..ce12d044d4 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -130,7 +130,7 @@ static void		gst_goom_get_property	(GObject *object, guint prop_id,
 
 static void		gst_goom_chain		(GstPad *pad, GstBuffer *buf);
 
-static GstPadConnectReturn 
+static GstPadLinkReturn 
 			gst_goom_sinkconnect 	(GstPad *pad, GstCaps *caps);
 
 static GstElementClass *parent_class = NULL;
@@ -207,7 +207,7 @@ gst_goom_init (GstGOOM *goom)
 
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_goom_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstGOOM *goom;
diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c
index b36325f046..48de557e76 100644
--- a/gst/law/mulaw-decode.c
+++ b/gst/law/mulaw-decode.c
@@ -47,7 +47,7 @@ static GstElementClass *parent_class = NULL;
 /*static guint gst_stereo_signals[LAST_SIGNAL] = { 0 };*/
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 mulawdec_connect_sink (GstPad *pad, GstCaps *caps)
 {
   GstCaps *newcaps;
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 55e9ff5b07..c762d8e162 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -120,7 +120,7 @@ gst_level_get_type (void)
   return level_type;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_level_connect (GstPad *pad, GstCaps *caps)
 {
   GstLevel *filter;
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index d10ece2fff..8bc90882f7 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -133,7 +133,7 @@ static void		gst_monoscope_get_property	(GObject *object, guint prop_id,
 
 static void		gst_monoscope_chain		(GstPad *pad, GstBuffer *buf);
 
-static GstPadConnectReturn 
+static GstPadLinkReturn 
 			gst_monoscope_sinkconnect 	(GstPad *pad, GstCaps *caps);
 
 static GstElementClass *parent_class = NULL;
@@ -210,7 +210,7 @@ gst_monoscope_init (GstMonoscope *monoscope)
 
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_monoscope_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstMonoscope *monoscope;
diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c
index b1071034ec..c1afce4222 100644
--- a/gst/udp/gstudpsink.c
+++ b/gst/udp/gstudpsink.c
@@ -140,7 +140,7 @@ gst_udpsink_class_init (GstUDPSink *klass)
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_udpsink_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstUDPSink *udpsink;
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 2ee1fce9bf..0a3fb1a575 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -110,7 +110,7 @@ static void		gst_video_crop_set_property	(GObject *object, guint prop_id,
 static void		gst_video_crop_get_property	(GObject *object, guint prop_id, 
 							 GValue *value, GParamSpec *pspec);
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 			gst_video_crop_sink_connect 	(GstPad *pad, GstCaps *caps);
 static void 		gst_video_crop_chain 		(GstPad *pad, GstBuffer *buffer);
 
@@ -253,7 +253,7 @@ gst_video_crop_get_property (GObject *object, guint prop_id, GValue *value, GPar
   }
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps)
 {
   GstVideoCrop *video_crop;
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index 336811fc0b..a61ca5a260 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -207,7 +207,7 @@ gst_wavenc_setup (GstWavEnc *wavenc)
   return TRUE;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_wavenc_sinkconnect (GstPad *pad,
 			GstCaps *caps)
 {
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 56b95e9af5..639500511b 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -55,7 +55,7 @@ static gboolean 		gst_osssink_query 		(GstElement *element, GstQueryType type,
 static gboolean 		gst_osssink_sink_query 		(GstPad *pad, GstQueryType type,
 								 GstFormat *format, gint64 *value);
 
-static GstPadConnectReturn	gst_osssink_sinkconnect		(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn	gst_osssink_sinkconnect		(GstPad *pad, GstCaps *caps);
 
 static void 			gst_osssink_set_property	(GObject *object, guint prop_id, const GValue *value, 
 		  						 GParamSpec *pspec);
@@ -230,7 +230,7 @@ gst_osssink_init (GstOssSink *osssink)
 }
 
 
-static GstPadConnectReturn 
+static GstPadLinkReturn 
 gst_osssink_sinkconnect (GstPad *pad, GstCaps *caps) 
 {
   GstOssSink *osssink = GST_OSSSINK (gst_pad_get_parent (pad));
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index a1cc833791..eed9488817 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -85,7 +85,7 @@ GST_PAD_TEMPLATE_FACTORY (osssrc_src_factory,
 static void 			gst_osssrc_class_init	(GstOssSrcClass *klass);
 static void 			gst_osssrc_init		(GstOssSrc *osssrc);
 
-static GstPadConnectReturn 	gst_osssrc_srcconnect 	(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn 	gst_osssrc_srcconnect 	(GstPad *pad, GstCaps *caps);
 static const GstFormat* 	gst_osssrc_get_formats 	(GstPad *pad);
 static gboolean 		gst_osssrc_convert 	(GstPad *pad, 
 							 GstFormat src_format, gint64 src_value,
@@ -183,7 +183,7 @@ gst_osssrc_init (GstOssSrc *osssrc)
   osssrc->curoffset = 0;
 }
 
-static GstPadConnectReturn 
+static GstPadLinkReturn 
 gst_osssrc_srcconnect (GstPad *pad, GstCaps *caps)
 {
   GstOssSrc *src;
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index cf72cb07ff..c84993aa6b 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -68,7 +68,7 @@ static gboolean			gst_v4l2src_srcconvert		(GstPad          *pad,
 								 gint64          src_value,
 								 GstFormat       *dest_format,
 								 gint64          *dest_value);
-static GstPadConnectReturn	gst_v4l2src_srcconnect		(GstPad          *pad,
+static GstPadLinkReturn	gst_v4l2src_srcconnect		(GstPad          *pad,
 								 GstCaps         *caps);
 static GstCaps *		gst_v4l2src_getcaps		(GstPad          *pad,
 								 GstCaps         *caps);
@@ -576,7 +576,7 @@ gst_v4l2src_caps_intersect (GstCaps *caps1,
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_v4l2src_srcconnect (GstPad  *pad,
                         GstCaps *vscapslist)
 {
@@ -628,7 +628,7 @@ gst_v4l2src_srcconnect (GstPad  *pad,
 					                        format->flags & V4L2_FMT_FLAG_COMPRESSED);
 					GstCaps *onecaps;
 					for (;lastcaps != NULL; lastcaps = lastcaps->next) {
-						GstPadConnectReturn ret_val;
+						GstPadLinkReturn ret_val;
 						onecaps = gst_caps_copy_1(lastcaps);
 						if ((ret_val = gst_pad_try_set_caps(v4l2src->srcpad, onecaps)) > 0) {
 							if (gst_v4l2src_capture_init(v4l2src))