diff --git a/Makefile.common b/Makefile.common
index 42ef3309eb..3d93924940 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -166,7 +166,7 @@ OBJ += frontend/frontend.o \
        tasks/task_overlay.o \
        input/input_overlay.o \
        patch.o \
-       libretro-common/queues/fifo_buffer.o \
+       libretro-common/queues/fifo_queue.o \
        core_options.o \
        libretro-common/compat/compat_fnmatch.o \
        libretro-common/compat/compat_posix_string.o \
diff --git a/audio/audio_thread_wrapper.c b/audio/audio_thread_wrapper.c
index f9ebee506e..1ff8dd3c83 100644
--- a/audio/audio_thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 
 #include "audio_thread_wrapper.h"
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
index 1984083c12..11029dae19 100644
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@@ -19,7 +19,7 @@
 #include <alsa/asoundlib.h>
 
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c
index 01dafffeaf..272c380874 100644
--- a/audio/drivers/coreaudio.c
+++ b/audio/drivers/coreaudio.c
@@ -27,7 +27,7 @@
 #include <AudioUnit/AUComponent.h>
 
 #include <boolean.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <retro_endianness.h>
 #include <string/stdstring.h>
diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c
index 934ab6e181..fee33c7d0b 100644
--- a/audio/drivers/dsound.c
+++ b/audio/drivers/dsound.c
@@ -32,7 +32,7 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c
index 111a8ec96b..6a5eee40b4 100644
--- a/audio/drivers/ps3_audio.c
+++ b/audio/drivers/ps3_audio.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
diff --git a/audio/drivers/rsound.c b/audio/drivers/rsound.c
index 11a2dc901c..9480495430 100644
--- a/audio/drivers/rsound.c
+++ b/audio/drivers/rsound.c
@@ -17,7 +17,7 @@
 
 #include <boolean.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 
 #include "../audio_driver.h"
diff --git a/audio/drivers/rsound.h b/audio/drivers/rsound.h
index 672d81bcce..c35513c654 100644
--- a/audio/drivers/rsound.h
+++ b/audio/drivers/rsound.h
@@ -32,7 +32,7 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #ifdef _WIN32
 #define RSD_DEFAULT_HOST "127.0.0.1" /* Stupid Windows. */
diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c
index ac68c1eeba..2ec7f67e2c 100644
--- a/audio/drivers/sdl_audio.c
+++ b/audio/drivers/sdl_audio.c
@@ -23,7 +23,7 @@
 
 #include <boolean.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <retro_inline.h>
 
 #include "../audio_driver.h"
diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
index 648e88c069..69d6ca5f98 100644
--- a/cores/libretro-ffmpeg/ffmpeg_core.c
+++ b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "libretro.h"
 #ifdef RARCH_INTERNAL
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 10f36af72c..2cf4a7da08 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -479,7 +479,7 @@ STATE TRACKER
 /*============================================================
 FIFO BUFFER
 ============================================================ */
-#include "../libretro-common/queues/fifo_buffer.c"
+#include "../libretro-common/queues/fifo_queue.c"
 
 /*============================================================
 AUDIO RESAMPLER
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index ac99a1ebc7..df140228ec 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -20,7 +20,7 @@
 
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <string/stdstring.h>
 
 #include "../connect/joypad_connection.h"
diff --git a/libretro-common/include/queues/fifo_buffer.h b/libretro-common/include/queues/fifo_queue.h
similarity index 100%
rename from libretro-common/include/queues/fifo_buffer.h
rename to libretro-common/include/queues/fifo_queue.h
diff --git a/libretro-common/queues/fifo_buffer.c b/libretro-common/queues/fifo_queue.c
similarity index 85%
rename from libretro-common/queues/fifo_buffer.c
rename to libretro-common/queues/fifo_queue.c
index 2a0726606a..f9511322c0 100644
--- a/libretro-common/queues/fifo_buffer.c
+++ b/libretro-common/queues/fifo_queue.c
@@ -23,12 +23,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 struct fifo_buffer
 {
    uint8_t *buffer;
-   size_t bufsize;
+   size_t size;
    size_t first;
    size_t end;
 };
@@ -46,7 +46,7 @@ fifo_buffer_t *fifo_new(size_t size)
       free(buf);
       return NULL;
    }
-   buf->bufsize = size + 1;
+   buf->size = size + 1;
 
    return buf;
 }
@@ -72,7 +72,7 @@ size_t fifo_read_avail(fifo_buffer_t *buffer)
    size_t end   = buffer->end;
 
    if (end < first)
-      end += buffer->bufsize;
+      end += buffer->size;
    return end - first;
 }
 
@@ -82,9 +82,9 @@ size_t fifo_write_avail(fifo_buffer_t *buffer)
    size_t end   = buffer->end;
 
    if (end < first)
-      end += buffer->bufsize;
+      end += buffer->size;
 
-   return (buffer->bufsize - 1) - (end - first);
+   return (buffer->size - 1) - (end - first);
 }
 
 void fifo_write(fifo_buffer_t *buffer, const void *in_buf, size_t size)
@@ -92,16 +92,16 @@ void fifo_write(fifo_buffer_t *buffer, const void *in_buf, size_t size)
    size_t first_write = size;
    size_t rest_write  = 0;
 
-   if (buffer->end + size > buffer->bufsize)
+   if (buffer->end + size > buffer->size)
    {
-      first_write = buffer->bufsize - buffer->end;
+      first_write = buffer->size - buffer->end;
       rest_write = size - first_write;
    }
 
    memcpy(buffer->buffer + buffer->end, in_buf, first_write);
    memcpy(buffer->buffer, (const uint8_t*)in_buf + first_write, rest_write);
 
-   buffer->end = (buffer->end + size) % buffer->bufsize;
+   buffer->end = (buffer->end + size) % buffer->size;
 }
 
 
@@ -110,15 +110,15 @@ void fifo_read(fifo_buffer_t *buffer, void *in_buf, size_t size)
    size_t first_read = size;
    size_t rest_read  = 0;
 
-   if (buffer->first + size > buffer->bufsize)
+   if (buffer->first + size > buffer->size)
    {
-      first_read = buffer->bufsize - buffer->first;
+      first_read = buffer->size - buffer->first;
       rest_read = size - first_read;
    }
 
    memcpy(in_buf, (const uint8_t*)buffer->buffer + buffer->first, first_read);
    memcpy((uint8_t*)in_buf + first_read, buffer->buffer, rest_read);
 
-   buffer->first = (buffer->first + size) % buffer->bufsize;
+   buffer->first = (buffer->first + size) % buffer->size;
 }
 
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index d03f1b8d08..a0a2ef730a 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -54,7 +54,7 @@ extern "C" {
 #include <compat/msvc.h>
 
 #include <boolean.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <gfx/scaler/scaler.h>
 #include <file/config_file.h>