diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
index 46018cfb65..d93442247c 100644
--- a/gst/mxf/mxfdemux.c
+++ b/gst/mxf/mxfdemux.c
@@ -1898,15 +1898,15 @@ out:
 static void
 read_partition_header (GstMXFDemux * demux, guint64 offset)
 {
-  GstFlowReturn ret;
+  GstFlowReturn flow;
   GstBuffer *buf;
   MXFUL key;
   guint read;
 
-  ret = gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read);
+  flow = gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read);
   offset += read;
 
-  if (ret != GST_FLOW_OK)
+  if (flow != GST_FLOW_OK)
     return;
 
   if (!mxf_is_partition_pack (&key)) {
@@ -1916,8 +1916,8 @@ read_partition_header (GstMXFDemux * demux, guint64 offset)
 
   do {
     gst_buffer_unref (buf);
-    ret = gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read);
-    if (ret != GST_FLOW_OK)
+    flow = gst_mxf_demux_pull_klv_packet (demux, offset, &key, &buf, &read);
+    if (flow != GST_FLOW_OK)
       return;
     offset += read;
   }
@@ -2160,7 +2160,7 @@ static void
 gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
 {
   GstBuffer *buffer;
-  GstFlowReturn ret;
+  GstFlowReturn flow;
   gint64 filesize = -1;
   GstFormat fmt = GST_FORMAT_BYTES;
   guint32 pack_size;
@@ -2177,7 +2177,7 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
   g_assert (filesize > 4);
 
   buffer = NULL;
-  if ((ret =
+  if ((flow =
           gst_mxf_demux_pull_range (demux, filesize - 4, 4,
               &buffer)) != GST_FLOW_OK) {
     GST_DEBUG_OBJECT (demux, "Failed pulling last 4 bytes");
@@ -2199,7 +2199,7 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
   }
 
   buffer = NULL;
-  if ((ret =
+  if ((flow =
           gst_mxf_demux_pull_range (demux, filesize - pack_size, 16,
               &buffer)) != GST_FLOW_OK) {
     GST_DEBUG_OBJECT (demux, "Failed pulling random index pack key");
@@ -2217,7 +2217,7 @@ gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux)
   }
 
   demux->offset = filesize - pack_size;
-  if ((ret =
+  if ((flow =
           gst_mxf_demux_pull_klv_packet (demux, filesize - pack_size, &key,
               &buffer, NULL)) != GST_FLOW_OK) {
     GST_DEBUG_OBJECT (demux, "Failed pulling random index pack");
@@ -2236,7 +2236,7 @@ gst_mxf_demux_parse_footer_metadata (GstMXFDemux * demux)
   MXFUL key;
   GstBuffer *buffer = NULL;
   guint read = 0;
-  GstFlowReturn ret = GST_FLOW_OK;
+  GstFlowReturn flow = GST_FLOW_OK;
   GstMXFDemuxPartition *old_partition = demux->current_partition;
 
   demux->current_partition = NULL;
@@ -2253,10 +2253,10 @@ gst_mxf_demux_parse_footer_metadata (GstMXFDemux * demux)
   }
 
 next_try:
-  ret =
+  flow =
       gst_mxf_demux_pull_klv_packet (demux, demux->offset, &key, &buffer,
       &read);
-  if (G_UNLIKELY (ret != GST_FLOW_OK))
+  if (G_UNLIKELY (flow != GST_FLOW_OK))
     goto out;
 
   if (!mxf_is_partition_pack (&key))
@@ -2281,10 +2281,10 @@ next_try:
   }
 
   while (TRUE) {
-    ret =
+    flow =
         gst_mxf_demux_pull_klv_packet (demux, demux->offset, &key, &buffer,
         &read);
-    if (G_UNLIKELY (ret != GST_FLOW_OK)) {
+    if (G_UNLIKELY (flow != GST_FLOW_OK)) {
       demux->offset =
           demux->run_in +
           demux->current_partition->partition.this_partition -
@@ -2329,10 +2329,10 @@ next_try:
   while (demux->offset <
       demux->run_in + demux->current_partition->primer.offset +
       demux->current_partition->partition.header_byte_count) {
-    ret =
+    flow =
         gst_mxf_demux_pull_klv_packet (demux, demux->offset, &key, &buffer,
         &read);
-    if (G_UNLIKELY (ret != GST_FLOW_OK)) {
+    if (G_UNLIKELY (flow != GST_FLOW_OK)) {
       demux->offset =
           demux->run_in +
           demux->current_partition->partition.this_partition -
@@ -2341,12 +2341,12 @@ next_try:
     }
 
     if (mxf_is_metadata (&key)) {
-      ret = gst_mxf_demux_handle_metadata (demux, &key, buffer);
+      flow = gst_mxf_demux_handle_metadata (demux, &key, buffer);
       demux->offset += read;
       gst_buffer_unref (buffer);
       buffer = NULL;
 
-      if (G_UNLIKELY (ret != GST_FLOW_OK)) {
+      if (G_UNLIKELY (flow != GST_FLOW_OK)) {
         gst_mxf_demux_reset_metadata (demux);
         demux->offset =
             demux->run_in +
@@ -2874,7 +2874,7 @@ static void
 gst_mxf_demux_loop (GstPad * pad)
 {
   GstMXFDemux *demux = NULL;
-  GstFlowReturn ret = GST_FLOW_OK;
+  GstFlowReturn flow = GST_FLOW_OK;
   GstMapInfo map;
   gboolean res;
 
@@ -2886,7 +2886,7 @@ gst_mxf_demux_loop (GstPad * pad)
     while (demux->offset < 64 * 1024) {
       GstBuffer *buffer = NULL;
 
-      if ((ret =
+      if ((flow =
               gst_mxf_demux_pull_range (demux, demux->offset, 16,
                   &buffer)) != GST_FLOW_OK)
         break;
@@ -2908,12 +2908,12 @@ gst_mxf_demux_loop (GstPad * pad)
       gst_buffer_unref (buffer);
     }
 
-    if (G_UNLIKELY (ret != GST_FLOW_OK))
+    if (G_UNLIKELY (flow != GST_FLOW_OK))
       goto pause;
 
     if (G_UNLIKELY (demux->run_in == -1)) {
       GST_ERROR_OBJECT (demux, "No valid header partition pack found");
-      ret = GST_FLOW_ERROR;
+      flow = GST_FLOW_ERROR;
       goto pause;
     }
 
@@ -2922,10 +2922,10 @@ gst_mxf_demux_loop (GstPad * pad)
   }
 
   /* Now actually do something */
-  ret = gst_mxf_demux_pull_and_handle_klv_packet (demux);
+  flow = gst_mxf_demux_pull_and_handle_klv_packet (demux);
 
   /* pause if something went wrong */
-  if (G_UNLIKELY (ret != GST_FLOW_OK))
+  if (G_UNLIKELY (flow != GST_FLOW_OK))
     goto pause;
 
   /* check EOS condition */
@@ -2945,7 +2945,7 @@ gst_mxf_demux_loop (GstPad * pad)
     }
 
     if (eos) {
-      ret = GST_FLOW_EOS;
+      flow = GST_FLOW_EOS;
       goto pause;
     }
   }
@@ -2956,12 +2956,12 @@ gst_mxf_demux_loop (GstPad * pad)
 
 pause:
   {
-    const gchar *reason = gst_flow_get_name (ret);
+    const gchar *reason = gst_flow_get_name (flow);
 
     GST_LOG_OBJECT (demux, "pausing task, reason %s", reason);
     gst_pad_pause_task (pad);
 
-    if (ret == GST_FLOW_EOS) {
+    if (flow == GST_FLOW_EOS) {
       /* perform EOS logic */
       if (demux->segment.flags & GST_SEEK_FLAG_SEGMENT) {
         gint64 stop;
@@ -2992,7 +2992,7 @@ pause:
           GST_WARNING_OBJECT (demux, "failed pushing EOS on streams");
         }
       }
-    } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
+    } else if (flow == GST_FLOW_NOT_LINKED || flow < GST_FLOW_EOS) {
       GstEvent *e;
 
       GST_ELEMENT_ERROR (demux, STREAM, FAILED,