diff --git a/TGS.Server/ChatProviders/IRCChatProvider.cs b/TGS.Server/ChatProviders/IRCChatProvider.cs
index 5e69103b9e..5d4f6efb3a 100644
--- a/TGS.Server/ChatProviders/IRCChatProvider.cs
+++ b/TGS.Server/ChatProviders/IRCChatProvider.cs
@@ -257,6 +257,7 @@ namespace TGS.Server.ChatProviders
 		/// </summary>
 		void IRCListen()
 		{
+			Thread.CurrentThread.Name = "IRC Listener Thread";
 			while (irc != null && Connected())
 				try
 				{
diff --git a/TGS.Server/Instance/Compiler.cs b/TGS.Server/Instance/Compiler.cs
index 13108a2692..5537794f55 100644
--- a/TGS.Server/Instance/Compiler.cs
+++ b/TGS.Server/Instance/Compiler.cs
@@ -143,6 +143,7 @@ namespace TGS.Server
 		//Initializing thread
 		public void InitializeImpl()
 		{
+			Thread.CurrentThread.Name = "Initialization Thread";
 			try
 			{
 				if (DaemonStatus() != DreamDaemonStatus.Offline)
@@ -287,6 +288,8 @@ namespace TGS.Server
 		//Compiler thread
 		void CompileImpl()
 		{
+			if(Thread.CurrentThread.Name == null)
+				Thread.CurrentThread.Name = "Compiler Thread";
 			try
 			{
 				if (!RepoConfigsMatch())
diff --git a/TGS.Server/Instance/DreamDaemon.cs b/TGS.Server/Instance/DreamDaemon.cs
index 9f7d13774f..8dc4ffe85b 100644
--- a/TGS.Server/Instance/DreamDaemon.cs
+++ b/TGS.Server/Instance/DreamDaemon.cs
@@ -303,6 +303,7 @@ namespace TGS.Server
 		/// </summary>
 		void Watchdog()
 		{
+			Thread.CurrentThread.Name = "Watchdog Thread";
 			try
 			{
 				lock (restartLock)