diff --git a/ChangeLog b/ChangeLog
index 79cea1d8da..c269a18363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-28  Wim Taymans  <wim@fluendo.com>
+
+	* gst/gstpad.c: (gst_pad_alloc_buffer), (gst_pad_push),
+	(gst_pad_pull_range):
+	* gst/gstpad.h:
+	CONNECTED -> LINKED.
+
 2005-06-28  Andy Wingo  <wingo@pobox.com>
 
 	* *.c: Don't cast to GST_OBJECT when reffing or unreffing. Large
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 795a5320dd..630025c5df 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2189,10 +2189,10 @@ no_peer:
   {
     /* pad has no peer */
     GST_CAT_DEBUG (GST_CAT_PADS,
-        "%s:%s called bufferallocfunc but had no peer, returning NULL",
+        "%s:%s called bufferallocfunc but had no peer",
         GST_DEBUG_PAD_NAME (pad));
     GST_UNLOCK (pad);
-    return GST_FLOW_NOT_CONNECTED;
+    return GST_FLOW_NOT_LINKED;
   }
 flushing:
   {
@@ -2200,7 +2200,7 @@ flushing:
     GST_UNLOCK (peer);
     gst_object_unref (peer);
     GST_CAT_DEBUG (GST_CAT_PADS,
-        "%s:%s called bufferallocfunc but peer was flushing, returning NULL",
+        "%s:%s called bufferallocfunc but peer was flushing",
         GST_DEBUG_PAD_NAME (pad));
     return GST_FLOW_WRONG_STATE;
   }
@@ -2796,7 +2796,7 @@ not_linked:
     GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
         "pushing, but it was not linked");
     GST_UNLOCK (pad);
-    return GST_FLOW_NOT_CONNECTED;
+    return GST_FLOW_NOT_LINKED;
   }
 }
 
@@ -2979,7 +2979,7 @@ not_connected:
     GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
         "pulling range, but it was not linked");
     GST_UNLOCK (pad);
-    return GST_FLOW_NOT_CONNECTED;
+    return GST_FLOW_NOT_LINKED;
   }
 }
 
diff --git a/gst/gstpad.h b/gst/gstpad.h
index 908adc12a4..de1cbca4e9 100644
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -75,7 +75,7 @@ typedef enum {
   GST_FLOW_OK		  =  0,		/* data passing was ok */
   GST_FLOW_RESEND	  =  1,		/* resend buffer, possibly with new caps */
   GST_FLOW_ERROR	  = -1,		/* some (fatal) error occured */
-  GST_FLOW_NOT_CONNECTED  = -2,		/* pad is not connected */
+  GST_FLOW_NOT_LINKED     = -2,		/* pad is not linked */
   GST_FLOW_NOT_NEGOTIATED = -3,		/* pad is not negotiated */
   GST_FLOW_WRONG_STATE    = -4,		/* pad is in wrong state */
   GST_FLOW_UNEXPECTED     = -5,		/* did not expect anything, this is not fatal */