diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c
index d749b9b7cf..fa9911b31f 100644
--- a/gst-libs/gst/audio/gstaudioaggregator.c
+++ b/gst-libs/gst/audio/gstaudioaggregator.c
@@ -1780,7 +1780,7 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
     if (!pad_eos)
       is_eos = FALSE;
 
-    pad->priv->input_buffer = gst_aggregator_pad_get_buffer (aggpad);
+    pad->priv->input_buffer = gst_aggregator_pad_peek_buffer (aggpad);
 
     GST_OBJECT_LOCK (pad);
     if (!pad->priv->input_buffer) {
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 00e02768f2..a0c23b7466 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -1077,7 +1077,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
 
     if (!is_eos)
       eos = FALSE;
-    buf = gst_aggregator_pad_get_buffer (bpad);
+    buf = gst_aggregator_pad_peek_buffer (bpad);
     if (buf) {
       GstClockTime start_time, end_time;
 
@@ -1122,7 +1122,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
           continue;
         }
         gst_buffer_unref (buf);
-        buf = gst_aggregator_pad_steal_buffer (bpad);
+        buf = gst_aggregator_pad_pop_buffer (bpad);
         gst_buffer_replace (&pad->buffer, buf);
         if (pad->priv->pending_vinfo.finfo) {
           pad->info = pad->priv->pending_vinfo;
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c
index 2a110824a1..fff0c78f50 100644
--- a/gst/mxf/mxfmux.c
+++ b/gst/mxf/mxfmux.c
@@ -489,7 +489,7 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
       return GST_FLOW_ERROR;
     }
 
-    buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad));
+    buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
     if (pad->writer->update_descriptor)
       pad->writer->update_descriptor (pad->descriptor,
           caps, pad->mapping_data, buffer);
@@ -692,7 +692,7 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
           mux->metadata_list = g_list_prepend (mux->metadata_list, track);
 
           caps = gst_pad_get_current_caps (GST_PAD_CAST (pad));
-          buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad));
+          buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
           track->parent.track_id = n + 1;
           track->parent.track_number =
               pad->writer->get_track_number_template (pad->descriptor,
@@ -812,7 +812,7 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
           track->parent.track_number = 0;
 
           caps = gst_pad_get_current_caps (GST_PAD_CAST (pad));
-          buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad));
+          buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
           pad->writer->get_edit_rate (pad->descriptor,
               caps, pad->mapping_data,
               buffer, source_package, source_track, &track->edit_rate);
@@ -1208,7 +1208,7 @@ static const guint8 _gc_essence_element_ul[] = {
 static GstFlowReturn
 gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * pad)
 {
-  GstBuffer *buf = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad));
+  GstBuffer *buf = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
   GstBuffer *outbuf = NULL;
   GstMapInfo map;
   gsize buf_size;
@@ -1231,7 +1231,7 @@ gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * pad)
   } else if (!flush) {
     if (buf)
       gst_buffer_unref (buf);
-    buf = gst_aggregator_pad_steal_buffer (GST_AGGREGATOR_PAD (pad));
+    buf = gst_aggregator_pad_pop_buffer (GST_AGGREGATOR_PAD (pad));
   }
 
   if (buf) {
@@ -1466,7 +1466,7 @@ gst_mxf_mux_handle_eos (GstMXFMux * mux)
     for (l = GST_ELEMENT_CAST (mux)->sinkpads; l; l = l->next) {
       GstMXFMuxPad *pad = l->data;
       GstBuffer *buffer =
-          gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad));
+          gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
 
       GstClockTime next_gc_timestamp =
           gst_util_uint64_scale ((mux->last_gc_position + 1) * GST_SECOND,
@@ -1780,7 +1780,7 @@ gst_mxf_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
       if (!pad_eos)
         eos = FALSE;
 
-      buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad));
+      buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
 
       if ((!pad_eos || pad->have_complete_edit_unit ||
               gst_adapter_available (pad->adapter) > 0 || buffer)