3 files changed, 13 insertions, 13 deletions

diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt
index e237b6429..42b42018b 100644
--- a/Tools/MCADefrag/CMakeLists.txt
+++ b/Tools/MCADefrag/CMakeLists.txt
@@ -39,8 +39,8 @@ set_exe_flags()
 set(SHARED_SRC
 	../../src/StringCompression.cpp
 	../../src/StringUtils.cpp
-	../../src/Listeners.cpp
-	../../src/LogDispacher.cpp
+	../../src/LoggerListeners.cpp
+	../../src/Logger.cpp
 )
 set(SHARED_HDR
 	../../src/ByteBuffer.h
diff --git a/Tools/MCADefrag/MCADefrag.cpp b/Tools/MCADefrag/MCADefrag.cpp
index 702b04ebf..d5d233fd2 100644
--- a/Tools/MCADefrag/MCADefrag.cpp
+++ b/Tools/MCADefrag/MCADefrag.cpp
@@ -5,8 +5,8 @@
 
 #include "Globals.h"
 #include "MCADefrag.h"
-#include "LogDispacher.h"
-#include "Listeners.h"
+#include "Logger.h"
+#include "LoggerListeners.h"
 #include "zlib/zlib.h"
 
 
@@ -22,12 +22,12 @@ static const Byte g_Zeroes[4096] = {0};
 
 int main(int argc, char ** argv)
 {
-	Logger::cLoggerListener * consoleLogListener = Logger::MakeConsoleListener();
-	Logger::cLoggerListener * fileLogListener = new Logger::cFileListener();
-	Logger::GetInstance().AttachListener(consoleLogListener);
-	Logger::GetInstance().AttachListener(fileLogListener);
+	cLogger::cListener * consoleLogListener = MakeConsoleListener();
+	cLogger::cListener * fileLogListener = new cFileListener();
+	cLogger::GetInstance().AttachListener(consoleLogListener);
+	cLogger::GetInstance().AttachListener(fileLogListener);
 	
-	Logger::InitiateMultithreading();
+	cLogger::InitiateMultithreading();
 	
 	cMCADefrag Defrag;
 	if (!Defrag.Init(argc, argv))
@@ -37,9 +37,9 @@ int main(int argc, char ** argv)
 	
 	Defrag.Run();
 	
-	Logger::GetInstance().DetachListener(consoleLogListener);
+	cLogger::GetInstance().DetachListener(consoleLogListener);
 	delete consoleLogListener;
-	Logger::GetInstance().DetachListener(fileLogListener);
+	cLogger::GetInstance().DetachListener(fileLogListener);
 	delete fileLogListener;
 	
 	return 0;
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt
index 16c59bb43..bc3923d90 100644
--- a/Tools/ProtoProxy/CMakeLists.txt
+++ b/Tools/ProtoProxy/CMakeLists.txt
@@ -40,8 +40,8 @@ set(SHARED_SRC
 	../../src/PolarSSL++/CtrDrbgContext.cpp
 	../../src/PolarSSL++/EntropyContext.cpp
 	../../src/PolarSSL++/RsaPrivateKey.cpp
-	../../src/Listeners.cpp
-	../../src/LogDispacher.cpp
+	../../src/LoggerListeners.cpp
+	../../src/Logger.cpp
 )
 set(SHARED_HDR
 	../../src/ByteBuffer.h