diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c
index b658d8ccc3..701d049142 100644
--- a/ext/alsa/gstalsa.c
+++ b/ext/alsa/gstalsa.c
@@ -63,7 +63,7 @@ static GstPad* gst_alsa_request_new_pad (GstElement *element, GstPadTemplate *te
 static void gst_alsa_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void gst_alsa_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static GstElementStateReturn gst_alsa_change_state(GstElement *element);
-static GstPadConnectReturn gst_alsa_connect(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn gst_alsa_connect(GstPad *pad, GstCaps *caps);
 
 static GstCaps* gst_alsa_caps (GstAlsa *this);
 
@@ -752,7 +752,7 @@ gst_alsa_caps (GstAlsa *this)
 /*
  * Negotiates the caps, "borrowed" from gstosssink.c
  */
-GstPadConnectReturn
+GstPadLinkReturn
 gst_alsa_connect(GstPad *pad, GstCaps *caps)
 {
     GstAlsa *this;
diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c
index 7e4a360d44..6362f9aea3 100644
--- a/ext/vorbis/vorbisenc.c
+++ b/ext/vorbis/vorbisenc.c
@@ -167,7 +167,7 @@ gst_vorbisenc_class_init (VorbisEncClass * klass)
   gstelement_class->change_state = gst_vorbisenc_change_state;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_vorbisenc_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   VorbisEnc *vorbisenc;
diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index e38bdf5b54..36b613f412 100644
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -204,7 +204,7 @@ gst_adder_parse_caps (GstAdder *adder, GstCaps *caps)
   return TRUE;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_adder_connect (GstPad *pad, GstCaps *caps)
 {
   GstAdder *adder;
diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c
index 156238cbf6..ba53c0d17e 100644
--- a/gst/audioscale/gstaudioscale.c
+++ b/gst/audioscale/gstaudioscale.c
@@ -162,7 +162,7 @@ gst_audioscale_class_init (AudioscaleClass *klass)
 
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_audioscale_sinkconnect (GstPad * pad, GstCaps * caps)
 {
   Audioscale *audioscale;
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index 5086cb025b..9171a40242 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -180,7 +180,7 @@ videoscale_negotiate_sink (GstPad *pad, GstCaps **caps, gpointer *data)
 }
 */
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_videoscale_sinkconnect (GstPad *pad, GstCaps *caps)
 {
   GstVideoscale *videoscale;
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 9ce26c735b..537c17bbf7 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -162,7 +162,7 @@ gst_videotestsrc_class_init (GstVideotestsrcClass * klass)
   gstelement_class->change_state = gst_videotestsrc_change_state;
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_videotestsrc_srcconnect (GstPad * pad, GstCaps * caps)
 {
   GstVideotestsrc *videotestsrc;
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 0753aa2c13..44666d356a 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -132,7 +132,7 @@ volume_get_bufferpool (GstPad *pad)
   return gst_pad_get_bufferpool (filter->srcpad);
 }
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 volume_connect (GstPad *pad, GstCaps *caps)
 {
   GstVolume *filter;
@@ -145,7 +145,7 @@ volume_connect (GstPad *pad, GstCaps *caps)
   otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad);
   
   if (GST_CAPS_IS_FIXED (caps)) {
-    GstPadConnectReturn set_retval;
+    GstPadLinkReturn set_retval;
     if (!volume_parse_caps (filter, caps))
       return GST_PAD_LINK_REFUSED;
 
diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c
index d22fd4fc31..c4df74f732 100644
--- a/sys/v4l/gstv4lmjpegsink.c
+++ b/sys/v4l/gstv4lmjpegsink.c
@@ -54,7 +54,7 @@ static void                  gst_v4lmjpegsink_class_init   (GstV4lMjpegSinkClass
 static void                  gst_v4lmjpegsink_init         (GstV4lMjpegSink      *v4lmjpegsink);
 
 /* the chain of buffers */
-static GstPadConnectReturn   gst_v4lmjpegsink_sinkconnect  (GstPad               *pad,
+static GstPadLinkReturn   gst_v4lmjpegsink_sinkconnect  (GstPad               *pad,
                                                             GstCaps              *vscapslist);
 static void                  gst_v4lmjpegsink_chain        (GstPad               *pad,
                                                             GstBuffer            *buf);
@@ -191,7 +191,7 @@ gst_v4lmjpegsink_init (GstV4lMjpegSink *v4lmjpegsink)
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_v4lmjpegsink_sinkconnect (GstPad  *pad,
                               GstCaps *vscapslist)
 {
diff --git a/sys/v4l/gstv4lmjpegsrc.c b/sys/v4l/gstv4lmjpegsrc.c
index 5a170df510..3c9c0b5d98 100644
--- a/sys/v4l/gstv4lmjpegsrc.c
+++ b/sys/v4l/gstv4lmjpegsrc.c
@@ -64,7 +64,7 @@ static gboolean              gst_v4lmjpegsrc_srcconvert   (GstPad         *pad,
                                                            gint64         src_value,
                                                            GstFormat      *dest_format,
                                                            gint64         *dest_value);
-static GstPadConnectReturn   gst_v4lmjpegsrc_srcconnect   (GstPad         *pad,
+static GstPadLinkReturn   gst_v4lmjpegsrc_srcconnect   (GstPad         *pad,
                                                            GstCaps        *caps);
 static GstBuffer*            gst_v4lmjpegsrc_get          (GstPad         *pad);
 
@@ -273,11 +273,11 @@ gst_v4lmjpegsrc_srcconvert (GstPad    *pad,
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_v4lmjpegsrc_srcconnect (GstPad  *pad,
                             GstCaps *caps)
 {
-  GstPadConnectReturn ret_val;
+  GstPadLinkReturn ret_val;
   GstV4lMjpegSrc *v4lmjpegsrc;
 
   v4lmjpegsrc = GST_V4LMJPEGSRC (gst_pad_get_parent (pad));
diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index df56b679ef..10074571c4 100644
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -60,7 +60,7 @@ static gboolean              gst_v4lsrc_srcconvert   (GstPad         *pad,
                                                       gint64         src_value,
                                                       GstFormat      *dest_format,
                                                       gint64         *dest_value);
-static GstPadConnectReturn   gst_v4lsrc_srcconnect   (GstPad         *pad,
+static GstPadLinkReturn   gst_v4lsrc_srcconnect   (GstPad         *pad,
                                                       GstCaps        *caps);
 static GstBuffer*            gst_v4lsrc_get          (GstPad         *pad);
 
@@ -239,11 +239,11 @@ gst_v4lsrc_srcconvert (GstPad    *pad,
 }
 
 
-static GstPadConnectReturn
+static GstPadLinkReturn
 gst_v4lsrc_srcconnect (GstPad  *pad,
                        GstCaps *vscapslist)
 {
-  GstPadConnectReturn ret_val;
+  GstPadLinkReturn ret_val;
   GstV4lSrc *v4lsrc;
   GstCaps *caps, *newcaps;
   gint palette;