diff --git a/src/rendering/gl/renderer/gl_renderer.h b/src/rendering/gl/renderer/gl_renderer.h
index 3339eda27..5587228f5 100644
--- a/src/rendering/gl/renderer/gl_renderer.h
+++ b/src/rendering/gl/renderer/gl_renderer.h
@@ -27,7 +27,7 @@ class FGLRenderBuffers;
 class FGL2DDrawer;
 class FHardwareTexture;
 class SWSceneDrawer;
-class GLViewpointBuffer;
+class HWViewpointBuffer;
 struct FRenderViewpoint;
 
 namespace OpenGLRenderer
diff --git a/src/rendering/gl/system/gl_framebuffer.cpp b/src/rendering/gl/system/gl_framebuffer.cpp
index 67ce8c2d3..eacb6eeb1 100644
--- a/src/rendering/gl/system/gl_framebuffer.cpp
+++ b/src/rendering/gl/system/gl_framebuffer.cpp
@@ -154,7 +154,7 @@ void OpenGLFrameBuffer::InitializeState()
 
 	mVertexData = new FFlatVertexBuffer(GetWidth(), GetHeight());
 	mSkyData = new FSkyVertexBuffer;
-	mViewpoints = new GLViewpointBuffer;
+	mViewpoints = new HWViewpointBuffer;
 	mLights = new FLightBuffer();
 
 	GLRenderer = new FGLRenderer(this);
diff --git a/src/rendering/hwrenderer/data/hw_viewpointbuffer.cpp b/src/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
index 5ed4a5183..576b4c576 100644
--- a/src/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
+++ b/src/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
@@ -33,7 +33,7 @@
 
 static const int INITIAL_BUFFER_SIZE = 100;	// 100 viewpoints per frame should nearly always be enough
 
-GLViewpointBuffer::GLViewpointBuffer()
+HWViewpointBuffer::HWViewpointBuffer()
 {
 	mBufferSize = INITIAL_BUFFER_SIZE;
 	mBlockAlign = ((sizeof(HWViewpointUniforms) / screen->uniformblockalignment) + 1) * screen->uniformblockalignment;
@@ -45,13 +45,13 @@ GLViewpointBuffer::GLViewpointBuffer()
 	mClipPlaneInfo.Push(0);
 }
 
-GLViewpointBuffer::~GLViewpointBuffer()
+HWViewpointBuffer::~HWViewpointBuffer()
 {
 	delete mBuffer;
 }
 
 
-void GLViewpointBuffer::CheckSize()
+void HWViewpointBuffer::CheckSize()
 {
 	if (mUploadIndex >= mBufferSize)
 	{
@@ -62,7 +62,7 @@ void GLViewpointBuffer::CheckSize()
 	}
 }
 
-int GLViewpointBuffer::Bind(FRenderState &di, unsigned int index)
+int HWViewpointBuffer::Bind(FRenderState &di, unsigned int index)
 {
 	if (index != mLastMappedIndex)
 	{
@@ -73,7 +73,7 @@ int GLViewpointBuffer::Bind(FRenderState &di, unsigned int index)
 	return index;
 }
 
-void GLViewpointBuffer::Set2D(FRenderState &di, int width, int height)
+void HWViewpointBuffer::Set2D(FRenderState &di, int width, int height)
 {
 	if (width != m2DWidth || height != m2DHeight)
 	{
@@ -91,7 +91,7 @@ void GLViewpointBuffer::Set2D(FRenderState &di, int width, int height)
 	Bind(di, 0);
 }
 
-int GLViewpointBuffer::SetViewpoint(FRenderState &di, HWViewpointUniforms *vp)
+int HWViewpointBuffer::SetViewpoint(FRenderState &di, HWViewpointUniforms *vp)
 {
 	CheckSize();
 	mBuffer->Map();
@@ -102,7 +102,7 @@ int GLViewpointBuffer::SetViewpoint(FRenderState &di, HWViewpointUniforms *vp)
 	return Bind(di, mUploadIndex++);
 }
 
-void GLViewpointBuffer::Clear()
+void HWViewpointBuffer::Clear()
 {
 	// Index 0 is reserved for the 2D projection.
 	mUploadIndex = 1;
diff --git a/src/rendering/hwrenderer/data/hw_viewpointbuffer.h b/src/rendering/hwrenderer/data/hw_viewpointbuffer.h
index 3a770ec91..01389e01a 100644
--- a/src/rendering/hwrenderer/data/hw_viewpointbuffer.h
+++ b/src/rendering/hwrenderer/data/hw_viewpointbuffer.h
@@ -5,7 +5,7 @@
 struct HWViewpointUniforms;
 class FRenderState;
 
-class GLViewpointBuffer
+class HWViewpointBuffer
 {
 	IDataBuffer *mBuffer;
 
@@ -24,8 +24,8 @@ class GLViewpointBuffer
 
 public:
 
-	GLViewpointBuffer();
-	~GLViewpointBuffer();
+	HWViewpointBuffer();
+	~HWViewpointBuffer();
 	void Clear();
 	int Bind(FRenderState &di, unsigned int index);
 	void Set2D(FRenderState &di, int width, int height);
diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp
index ceffc976c..b0b3b2fba 100644
--- a/src/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/src/rendering/vulkan/system/vk_framebuffer.cpp
@@ -152,7 +152,7 @@ void VulkanFrameBuffer::InitializeState()
 
 	mVertexData = new FFlatVertexBuffer(GetWidth(), GetHeight());
 	mSkyData = new FSkyVertexBuffer;
-	mViewpoints = new GLViewpointBuffer;
+	mViewpoints = new HWViewpointBuffer;
 	mLights = new FLightBuffer();
 
 	CreateFanToTrisIndexBuffer();
diff --git a/src/v_video.h b/src/v_video.h
index bd5fcc4d8..109c0f57f 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -57,7 +57,7 @@ class IIndexBuffer;
 class IVertexBuffer;
 class IDataBuffer;
 class FFlatVertexBuffer;
-class GLViewpointBuffer;
+class HWViewpointBuffer;
 class FLightBuffer;
 struct HWDrawInfo;
 
@@ -379,7 +379,7 @@ public:
 	FPortalSceneState *mPortalState;			// global portal state.
 	FSkyVertexBuffer *mSkyData = nullptr;		// the sky vertex buffer
 	FFlatVertexBuffer *mVertexData = nullptr;	// Global vertex data
-	GLViewpointBuffer *mViewpoints = nullptr;	// Viewpoint render data.
+	HWViewpointBuffer *mViewpoints = nullptr;	// Viewpoint render data.
 	FLightBuffer *mLights = nullptr;			// Dynamic lights
 	IShadowMap mShadowMap;