diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025fb29..3b78d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@ set(MAIN_HEADERS
 	src/tilemap.h
 	src/flashmap.h
 	src/graphics.h
-	src/debuglogger.h
+	src/gl-debug.h
 	src/global-ibo.h
 	src/exception.h
 	src/filesystem.h
@@ -180,7 +180,7 @@ set(MAIN_SOURCE
 	src/tilemap.cpp
 	src/autotiles.cpp
 	src/graphics.cpp
-	src/debuglogger.cpp
+	src/gl-debug.cpp
 	src/etc.cpp
 	src/config.cpp
 	src/settingsmenu.cpp
diff --git a/mkxp.pro b/mkxp.pro
index 78aee3e..c9a1bda 100644
--- a/mkxp.pro
+++ b/mkxp.pro
@@ -105,7 +105,7 @@ HEADERS += \
 	src/tilemap.h \
 	src/flashmap.h \
 	src/graphics.h \
-	src/debuglogger.h \
+	src/gl-debug.h \
 	src/global-ibo.h \
 	src/exception.h \
 	src/filesystem.h \
@@ -158,7 +158,7 @@ SOURCES += \
 	src/tilemap.cpp \
 	src/autotiles.cpp \
 	src/graphics.cpp \
-	src/debuglogger.cpp \
+	src/gl-debug.cpp \
 	src/etc.cpp \
 	src/config.cpp \
 	src/settingsmenu.cpp \
diff --git a/src/debuglogger.cpp b/src/gl-debug.cpp
similarity index 82%
rename from src/debuglogger.cpp
rename to src/gl-debug.cpp
index 94d7c5b..f192c7c 100644
--- a/src/debuglogger.cpp
+++ b/src/gl-debug.cpp
@@ -1,5 +1,5 @@
 /*
-** debuglogger.cpp
+** gl-debug.cpp
 **
 ** This file is part of mkxp.
 **
@@ -19,25 +19,25 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "debuglogger.h"
+#include "gl-debug.h"
 #include "debugwriter.h"
 
 #include <iostream>
 
 #include "gl-fun.h"
 
-struct DebugLoggerPrivate
+struct GLDebugLoggerPrivate
 {
 	std::ostream *stream;
 
-	DebugLoggerPrivate(const char *logFilename)
+	GLDebugLoggerPrivate(const char *logFilename)
 	{
 		(void) logFilename;
 
 		stream = &std::clog;
 	}
 
-	~DebugLoggerPrivate()
+	~GLDebugLoggerPrivate()
 	{
 	}
 
@@ -62,8 +62,8 @@ static void APIENTRY arbDebugFunc(GLenum source,
                                   const GLchar* message,
                                   const void* userParam)
 {
-	DebugLoggerPrivate *p =
-		static_cast<DebugLoggerPrivate*>(const_cast<void*>(userParam));
+	GLDebugLoggerPrivate *p =
+		static_cast<GLDebugLoggerPrivate*>(const_cast<void*>(userParam));
 
 	(void) source;
 	(void) type;
@@ -75,9 +75,9 @@ static void APIENTRY arbDebugFunc(GLenum source,
 	p->writeLine(message);
 }
 
-DebugLogger::DebugLogger(const char *filename)
+GLDebugLogger::GLDebugLogger(const char *filename)
 {
-	p = new DebugLoggerPrivate(filename);
+	p = new GLDebugLoggerPrivate(filename);
 
 	if (gl.DebugMessageCallback)
 		gl.DebugMessageCallback(arbDebugFunc, p);
@@ -85,7 +85,7 @@ DebugLogger::DebugLogger(const char *filename)
 		Debug() << "DebugLogger: no debug extensions found";
 }
 
-DebugLogger::~DebugLogger()
+GLDebugLogger::~GLDebugLogger()
 {
 	delete p;
 }
diff --git a/src/debuglogger.h b/src/gl-debug.h
similarity index 87%
rename from src/debuglogger.h
rename to src/gl-debug.h
index c9e8fb9..f275b6f 100644
--- a/src/debuglogger.h
+++ b/src/gl-debug.h
@@ -1,5 +1,5 @@
 /*
-** debuglogger.h
+** gl-debug.h
 **
 ** This file is part of mkxp.
 **
@@ -27,16 +27,16 @@
 #include <stdio.h>
 #include <algorithm>
 
-struct DebugLoggerPrivate;
+struct GLDebugLoggerPrivate;
 
-class DebugLogger
+class GLDebugLogger
 {
 public:
-	DebugLogger(const char *filename = 0);
-	~DebugLogger();
+	GLDebugLogger(const char *filename = 0);
+	~GLDebugLogger();
 
 private:
-	DebugLoggerPrivate *p;
+	GLDebugLoggerPrivate *p;
 };
 
 #define GL_MARKER(format, ...) \
diff --git a/src/main.cpp b/src/main.cpp
index 23fc918..6185e58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,7 @@
 
 #include "sharedstate.h"
 #include "eventthread.h"
-#include "debuglogger.h"
+#include "gl-debug.h"
 #include "debugwriter.h"
 #include "exception.h"
 #include "gl-fun.h"
@@ -105,7 +105,7 @@ int rgssThreadFun(void *userdata)
 
 	SDL_GL_SetSwapInterval(threadData->config.vsync ? 1 : 0);
 
-	DebugLogger dLogger;
+	GLDebugLogger dLogger;
 
 	/* Setup AL context */
 	ALCdevice *alcDev = alcOpenDevice(0);