diff --git a/src/base/system.c b/src/base/system.c
index 4d989d817..f9edd2ac2 100644
--- a/src/base/system.c
+++ b/src/base/system.c
@@ -1143,7 +1143,7 @@ int net_host_lookup(const char *hostname, NETADDR *addr, int types)
 	if(priv_net_extract(hostname, host, sizeof(host), &port))
 		return -1;
 
-	dbg_msg("host lookup", "host='%s' port=%d %d", host, port, types);
+	dbg_msg("host_lookup", "host='%s' port=%d %d", host, port, types);
 
 	mem_zero(&hints, sizeof(hints));
 
diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp
index 12fcd5b3d..281a47c35 100644
--- a/src/engine/client/backend_sdl.cpp
+++ b/src/engine/client/backend_sdl.cpp
@@ -428,7 +428,7 @@ void CCommandProcessorFragment_OpenGL::SetState(const CCommandBuffer::SState &St
 			}
 			else
 			{
-				dbg_msg("OpenGL", "Error: this call should not happen.");
+				dbg_msg("opengl", "Error: this call should not happen.");
 			}
 		}
 	}
@@ -3888,7 +3888,7 @@ void CCommandProcessorFragment_SDL::Cmd_Init(const SCommand_Init *pCommand)
 
 	// check what this context can do
 	const GLubyte *pVersionString = glGetString(GL_VERSION);
-	dbg_msg("OpenGL", "Version string: %s", (const char *)pVersionString);
+	dbg_msg("opengl", "Version string: %s", (const char *)pVersionString);
 	// parse version string
 	ParseVersionString(pVersionString, pCommand->m_pCapabilities->m_ContextMajor, pCommand->m_pCapabilities->m_ContextMinor, pCommand->m_pCapabilities->m_ContextPatch);
 
@@ -4139,7 +4139,7 @@ void CCommandProcessor_SDL_OpenGL::RunBuffer(CCommandBuffer *pBuffer)
 		if(m_General.RunCommand(pCommand))
 			continue;
 
-		dbg_msg("graphics", "unknown command %d", pCommand->m_Cmd);
+		dbg_msg("gfx", "unknown command %d", pCommand->m_Cmd);
 	}
 }
 
diff --git a/src/engine/client/opengl_sl.cpp b/src/engine/client/opengl_sl.cpp
index 31f05e555..15952cae5 100644
--- a/src/engine/client/opengl_sl.cpp
+++ b/src/engine/client/opengl_sl.cpp
@@ -86,7 +86,7 @@ bool CGLSL::LoadShader(CGLSLCompiler *pCompiler, IStorage *pStorage, const char
 
 			glGetShaderInfoLog(shader, maxLength, &maxLength, buff);
 
-			dbg_msg("GLSL", "%s: %s", pFile, buff);
+			dbg_msg("glsl", "%s: %s", pFile, buff);
 			glDeleteShader(shader);
 			return false;
 		}
@@ -197,7 +197,7 @@ void CGLSLCompiler::ParseLine(std::string &Line, const char *pReadLine, int Type
 					}
 					else
 					{
-						dbg_msg("Shader compiler", "Fix shader for older OpenGL versions.");
+						dbg_msg("shadercompiler", "Fix shader for older OpenGL versions.");
 					}
 				}
 				else if(str_comp(aTmpStr, "noperspective") == 0 || str_comp(aTmpStr, "smooth") == 0 || str_comp(aTmpStr, "flat") == 0)
@@ -225,7 +225,7 @@ void CGLSLCompiler::ParseLine(std::string &Line, const char *pReadLine, int Type
 
 					if(!Found)
 					{
-						dbg_msg("Shader compiler", "Fix shader for older OpenGL versions.");
+						dbg_msg("shadercompiler", "Fix shader for older OpenGL versions.");
 					}
 
 					Line.append("varying");
diff --git a/src/engine/client/opengl_sl_program.cpp b/src/engine/client/opengl_sl_program.cpp
index 8abc1bb18..2a0b696d5 100644
--- a/src/engine/client/opengl_sl_program.cpp
+++ b/src/engine/client/opengl_sl_program.cpp
@@ -51,7 +51,7 @@ void CGLSLProgram::LinkProgram()
 		int iLogLength;
 		glGetProgramInfoLog(m_ProgramID, 1024, &iLogLength, sInfoLog);
 		str_format(sFinalMessage, 1536, "Error! Shader program wasn't linked! The linker returned:\n\n%s", sInfoLog);
-		dbg_msg("GLSL Program", "%s", sFinalMessage);
+		dbg_msg("glslprogram", "%s", sFinalMessage);
 	}
 
 	//detach all shaders attached to this program
diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp
index d497792bc..bf74d699c 100644
--- a/src/engine/client/text.cpp
+++ b/src/engine/client/text.cpp
@@ -483,7 +483,7 @@ class CTextRender : public IEngineTextRender
 
 				if(GlyphIndex == 0)
 				{
-					dbg_msg("pFont", "font has no glyph for either %d or replacement char %d", Chr, ReplacementChr);
+					dbg_msg("textrender", "font has no glyph for either %d or replacement char %d", Chr, ReplacementChr);
 					return;
 				}
 			}
@@ -491,7 +491,7 @@ class CTextRender : public IEngineTextRender
 
 		if(FT_Load_Glyph(FtFace, GlyphIndex, FT_LOAD_RENDER | FT_LOAD_NO_BITMAP))
 		{
-			dbg_msg("pFont", "error loading glyph %d", Chr);
+			dbg_msg("textrender", "error loading glyph %d", Chr);
 			return;
 		}
 
@@ -1822,7 +1822,7 @@ public:
 
 				if(FT_Load_Char(pFont->m_FtFace, NextCharacter, FT_LOAD_RENDER | FT_LOAD_NO_BITMAP))
 				{
-					dbg_msg("pFont", "error loading glyph %d", NextCharacter);
+					dbg_msg("textrender", "error loading glyph %d", NextCharacter);
 					pCurrent = pTmp;
 					continue;
 				}
@@ -1903,7 +1903,7 @@ public:
 #endif
 			if(FT_Load_Char(pFont->m_FtFace, NextCharacter, FTFlags))
 			{
-				dbg_msg("GetGlyphOffsetX", "error loading glyph %d", NextCharacter);
+				dbg_msg("textrender", "error loading glyph %d in GetGlyphOffsetX", NextCharacter);
 				return -1;
 			}
 
@@ -1935,7 +1935,7 @@ public:
 #endif
 				if(FT_Load_Char(pFont->m_FtFace, NextCharacter, FTFlags))
 				{
-					dbg_msg("pFont", "error loading glyph %d", NextCharacter);
+					dbg_msg("textrender", "error loading glyph %d in CalculateTextWidth", NextCharacter);
 					pCurrent = pTmp;
 					continue;
 				}
@@ -1956,7 +1956,7 @@ public:
 				FoundTextContainer = true;
 		if(FoundTextContainer)
 		{
-			dbg_msg("text render", "%s", "Found non empty text container");
+			dbg_msg("textrender", "%s", "Found non empty text container");
 			dbg_assert(false, "text container was not empty");
 		}
 
diff --git a/src/engine/client/video.cpp b/src/engine/client/video.cpp
index 10d391333..0bc18321c 100644
--- a/src/engine/client/video.cpp
+++ b/src/engine/client/video.cpp
@@ -278,7 +278,7 @@ void CVideo::NextAudioFrame(void (*Mix)(short *pFinalOut, unsigned Frames))
 	if(m_NextAudioFrame && m_Recording && m_HasAudio)
 	{
 		m_ProcessingAudioFrame = true;
-		//dbg_msg("video recorder", "video_frame: %lf", (double)(m_Vframe/m_FPS));
+		//dbg_msg("video_recorder", "video_frame: %lf", (double)(m_Vframe/m_FPS));
 		//if((double)(m_Vframe/m_FPS) < m_AudioStream.pEnc->frame_number*m_AudioStream.pEnc->frame_size/m_AudioStream.pEnc->sample_rate)
 		//return;
 		Mix(m_aBuffer, ALEN);
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 5221a3d29..3fed0c16a 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -2933,7 +2933,7 @@ void CGameClient::LoadMapSettings()
 		int Size = pMap->GetDataSize(pItem->m_Settings);
 		char *pSettings = (char *)pMap->GetData(pItem->m_Settings);
 		char *pNext = pSettings;
-		dbg_msg("New tune ", "%s", pNext);
+		dbg_msg("tune", "%s", pNext);
 		while(pNext < pSettings + Size)
 		{
 			int StrSize = str_length(pNext) + 1;
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index edce59e2c..883cf7b79 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -3207,27 +3207,27 @@ void CGameContext::OnInit(/*class IKernel *pKernel*/)
 			if(Index == TILE_OLDLASER)
 			{
 				g_Config.m_SvOldLaser = 1;
-				dbg_msg("game layer", "found old laser tile");
+				dbg_msg("game_layer", "found old laser tile");
 			}
 			else if(Index == TILE_NPC)
 			{
 				m_Tuning.Set("player_collision", 0);
-				dbg_msg("game layer", "found no collision tile");
+				dbg_msg("game_layer", "found no collision tile");
 			}
 			else if(Index == TILE_EHOOK)
 			{
 				g_Config.m_SvEndlessDrag = 1;
-				dbg_msg("game layer", "found unlimited hook time tile");
+				dbg_msg("game_layer", "found unlimited hook time tile");
 			}
 			else if(Index == TILE_NOHIT)
 			{
 				g_Config.m_SvHit = 0;
-				dbg_msg("game layer", "found no weapons hitting others tile");
+				dbg_msg("game_layer", "found no weapons hitting others tile");
 			}
 			else if(Index == TILE_NPH)
 			{
 				m_Tuning.Set("player_hooking", 0);
-				dbg_msg("game layer", "found no player hooking tile");
+				dbg_msg("game_layer", "found no player hooking tile");
 			}
 
 			if(Index >= ENTITY_OFFSET)
@@ -3243,27 +3243,27 @@ void CGameContext::OnInit(/*class IKernel *pKernel*/)
 				if(Index == TILE_OLDLASER)
 				{
 					g_Config.m_SvOldLaser = 1;
-					dbg_msg("front layer", "found old laser tile");
+					dbg_msg("front_layer", "found old laser tile");
 				}
 				else if(Index == TILE_NPC)
 				{
 					m_Tuning.Set("player_collision", 0);
-					dbg_msg("front layer", "found no collision tile");
+					dbg_msg("front_layer", "found no collision tile");
 				}
 				else if(Index == TILE_EHOOK)
 				{
 					g_Config.m_SvEndlessDrag = 1;
-					dbg_msg("front layer", "found unlimited hook time tile");
+					dbg_msg("front_layer", "found unlimited hook time tile");
 				}
 				else if(Index == TILE_NOHIT)
 				{
 					g_Config.m_SvHit = 0;
-					dbg_msg("front layer", "found no weapons hitting others tile");
+					dbg_msg("front_layer", "found no weapons hitting others tile");
 				}
 				else if(Index == TILE_NPH)
 				{
 					m_Tuning.Set("player_hooking", 0);
-					dbg_msg("front layer", "found no player hooking tile");
+					dbg_msg("front_layer", "found no player hooking tile");
 				}
 				if(Index >= ENTITY_OFFSET)
 				{