diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02b810f7a..f17340bae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1053,7 +1053,7 @@ set (PCH_SOURCES
 	gl_load/gl_interface.cpp
 	gl/system/gl_framebuffer.cpp
 	gl/system/gl_debug.cpp
-	gl/system/glsys_vertexbuffer.cpp
+	gl/system/gl_buffers.cpp
 	gl/textures/gl_hwtexture.cpp
 	gl/textures/gl_samplers.cpp
 	hwrenderer/data/flatvertices.cpp
diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp
index f0074acab..09af0c067 100644
--- a/src/gl/renderer/gl_renderstate.cpp
+++ b/src/gl/renderer/gl_renderstate.cpp
@@ -38,7 +38,7 @@
 #include "gl/dynlights//gl_lightbuffer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/textures/gl_hwtexture.h"
-#include "gl/system/glsys_vertexbuffer.h"
+#include "gl/system/gl_buffers.h"
 
 FGLRenderState gl_RenderState;
 
diff --git a/src/gl/system/glsys_vertexbuffer.cpp b/src/gl/system/gl_buffers.cpp
similarity index 99%
rename from src/gl/system/glsys_vertexbuffer.cpp
rename to src/gl/system/gl_buffers.cpp
index a6bfd0a95..07f162ccc 100644
--- a/src/gl/system/glsys_vertexbuffer.cpp
+++ b/src/gl/system/gl_buffers.cpp
@@ -25,7 +25,7 @@
 **/
 
 #include "gl_load/gl_system.h"
-#include "glsys_vertexbuffer.h"
+#include "gl_buffers.h"
 #include "gl/renderer/gl_renderstate.h"
 
 //==========================================================================
diff --git a/src/gl/system/glsys_vertexbuffer.h b/src/gl/system/gl_buffers.h
similarity index 97%
rename from src/gl/system/glsys_vertexbuffer.h
rename to src/gl/system/gl_buffers.h
index b76a56eea..7a3427f5f 100644
--- a/src/gl/system/glsys_vertexbuffer.h
+++ b/src/gl/system/gl_buffers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hwrenderer/data/vertexbuffer.h"
+#include "hwrenderer/data/buffers.h"
 
 #ifdef _MSC_VER
 // silence bogus warning C4250: 'GLVertexBuffer': inherits 'GLBuffer::GLBuffer::SetData' via dominance
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index cceb4a310..1916bc892 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -42,7 +42,7 @@
 #include "gl/shaders/gl_shaderprogram.h"
 #include "gl_debug.h"
 #include "r_videoscale.h"
-#include "glsys_vertexbuffer.h"
+#include "gl_buffers.h"
 
 #include "hwrenderer/data/flatvertices.h"
 
diff --git a/src/hwrenderer/data/vertexbuffer.h b/src/hwrenderer/data/buffers.h
similarity index 100%
rename from src/hwrenderer/data/vertexbuffer.h
rename to src/hwrenderer/data/buffers.h
diff --git a/src/hwrenderer/data/flatvertices.cpp b/src/hwrenderer/data/flatvertices.cpp
index 022c1d106..047d6fde0 100644
--- a/src/hwrenderer/data/flatvertices.cpp
+++ b/src/hwrenderer/data/flatvertices.cpp
@@ -32,7 +32,7 @@
 #include "g_levellocals.h"
 #include "flatvertices.h"
 #include "cmdlib.h"
-#include "hwrenderer/data/vertexbuffer.h"
+#include "hwrenderer/data/buffers.h"
 #include "hwrenderer/scene/hw_renderstate.h"
 
 
diff --git a/src/hwrenderer/data/flatvertices.h b/src/hwrenderer/data/flatvertices.h
index 58f1b8739..b9a1ac157 100644
--- a/src/hwrenderer/data/flatvertices.h
+++ b/src/hwrenderer/data/flatvertices.h
@@ -24,7 +24,7 @@
 #define _HW__VERTEXBUFFER_H
 
 #include "tarray.h"
-#include "hwrenderer/data/vertexbuffer.h"
+#include "hwrenderer/data/buffers.h"
 #include <atomic>
 #include <mutex>
 
diff --git a/src/hwrenderer/data/shaderuniforms.h b/src/hwrenderer/data/shaderuniforms.h
index b375b649e..765b64938 100644
--- a/src/hwrenderer/data/shaderuniforms.h
+++ b/src/hwrenderer/data/shaderuniforms.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include "hwrenderer/data/vertexbuffer.h"
+#include "hwrenderer/data/buffers.h"
 #include "v_video.h"
 
 enum
diff --git a/src/hwrenderer/models/hw_models.cpp b/src/hwrenderer/models/hw_models.cpp
index 13952cbfc..b99e508bd 100644
--- a/src/hwrenderer/models/hw_models.cpp
+++ b/src/hwrenderer/models/hw_models.cpp
@@ -36,7 +36,7 @@
 #include "i_time.h"
 #include "cmdlib.h"
 #include "hwrenderer/textures/hw_material.h"
-#include "hwrenderer/data/vertexbuffer.h"
+#include "hwrenderer/data/buffers.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_renderstate.h"
diff --git a/src/hwrenderer/scene/hw_skydome.cpp b/src/hwrenderer/scene/hw_skydome.cpp
index e256391d7..bd7961671 100644
--- a/src/hwrenderer/scene/hw_skydome.cpp
+++ b/src/hwrenderer/scene/hw_skydome.cpp
@@ -66,7 +66,7 @@
 #include "hwrenderer/textures/hw_material.h"
 #include "hw_skydome.h"
 #include "hw_renderstate.h"
-#include "hwrenderer/data/vertexbuffer.h"
+#include "hwrenderer/data/buffers.h"
 
 //-----------------------------------------------------------------------------
 //