diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavLockMethodHandler.cs b/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavLockMethodHandler.cs
index 4950bde..1a065a3 100644
--- a/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavLockMethodHandler.cs
+++ b/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavLockMethodHandler.cs
@@ -41,7 +41,7 @@ namespace WebDAVSharp.Server.MethodHandlers {
 		/// <param name="store">The <see cref="IWebDavStore" /> that the <see cref="WebDavServer" /> is hosting.</param>
 		/// <exception cref="WebDAVSharp.Server.Exceptions.WebDavPreconditionFailedException"></exception>
 		public void ProcessRequest(WebDavServer server, HttpContext context, IWebDavStore store, String fileName) {
-			ILog log = LogManager.GetCurrentClassLogger();
+			ILog log = LogManager.GetLogger<WebDavLockMethodHandler>();
 
 			/***************************************************************************************************
 			 * Retreive al the information from the request
diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavPropfindMethodHandler.cs b/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavPropfindMethodHandler.cs
index 4eaa937..c5a74b6 100644
--- a/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavPropfindMethodHandler.cs
+++ b/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavPropfindMethodHandler.cs
@@ -42,7 +42,7 @@ namespace WebDAVSharp.Server.MethodHandlers {
 		/// <param name="store">The <see cref="IWebDavStore" /> that the <see cref="WebDavServer" /> is hosting.</param>
 		/// <exception cref="WebDAVSharp.Server.Exceptions.WebDavUnauthorizedException"></exception>
 		public void ProcessRequest(WebDavServer server, HttpContext context, IWebDavStore store, String fileName) {
-			_log = LogManager.GetCurrentClassLogger();
+			_log = LogManager.GetLogger<WebDavPropfindMethodHandler>();
 
 			/***************************************************************************************************
 			 * Retreive all the information from the request
@@ -138,7 +138,7 @@ namespace WebDAVSharp.Server.MethodHandlers {
 		/// </returns>
 		/// <exception cref="WebDAVSharp.Server.Exceptions.WebDavConflictException"></exception>
 		private static List<IWebDavStoreItem> GetWebDavStoreItems(IWebDavStoreItem iWebDavStoreItem, int depth) {
-			ILog _log = LogManager.GetCurrentClassLogger();
+			ILog _log = LogManager.GetLogger<WebDavPropfindMethodHandler>();
 			List<IWebDavStoreItem> list = new List<IWebDavStoreItem>();
 
 			//IWebDavStoreCollection
diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavProppatchMethodHandler.cs b/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavProppatchMethodHandler.cs
index 9c97a66..3b0bb01 100644
--- a/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavProppatchMethodHandler.cs
+++ b/WebDavSharp_MVC/WebDAVSharp.Server/MethodHandlers/WebDavProppatchMethodHandler.cs
@@ -39,7 +39,7 @@ namespace WebDAVSharp.Server.MethodHandlers {
 		/// objects to use.</param>
 		/// <param name="store">The <see cref="IWebDavStore" /> that the <see cref="WebDavServer" /> is hosting.</param>
 		public void ProcessRequest(WebDavServer server, HttpContext context, IWebDavStore store, String fileName) {
-			ILog log = LogManager.GetCurrentClassLogger();
+			ILog log = LogManager.GetLogger<WebDavProppatchMethodHandler>();
 
 			/***************************************************************************************************
 			 * Retreive al the information from the request
diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/Stores/DiskStore/WebDavDiskStoreItem.cs b/WebDavSharp_MVC/WebDAVSharp.Server/Stores/DiskStore/WebDavDiskStoreItem.cs
index d12ba55..99cc2f0 100644
--- a/WebDavSharp_MVC/WebDAVSharp.Server/Stores/DiskStore/WebDavDiskStoreItem.cs
+++ b/WebDavSharp_MVC/WebDAVSharp.Server/Stores/DiskStore/WebDavDiskStoreItem.cs
@@ -51,7 +51,7 @@ namespace WebDAVSharp.Server.Stores.DiskStore {
 			//Identity = new WindowsIdentity()
 			Identity = WindowsIdentity.GetCurrent();
 
-			Log = LogManager.GetCurrentClassLogger();
+			Log = LogManager.GetLogger<WebDavDiskStoreItem>();
 		}
 
 		/// <summary>
diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/WebDavServer.cs b/WebDavSharp_MVC/WebDAVSharp.Server/WebDavServer.cs
index 8eaa6f4..af03393 100644
--- a/WebDavSharp_MVC/WebDAVSharp.Server/WebDavServer.cs
+++ b/WebDavSharp_MVC/WebDAVSharp.Server/WebDavServer.cs
@@ -84,7 +84,7 @@ namespace WebDAVSharp.Server {
 						methodHandler
 					};
 			_methodHandlers = handlersWithNames.ToDictionary(v => v.name, v => v.methodHandler);
-			_log = LogManager.GetCurrentClassLogger();
+			_log = LogManager.GetLogger<WebDavServer>();
 		}
 
 		/// <summary>