diff --git a/src/Components/Modules/BitMessage.cpp b/src/Components/Modules/BitMessage.cpp
index a0075b2b..727583ad 100644
--- a/src/Components/Modules/BitMessage.cpp
+++ b/src/Components/Modules/BitMessage.cpp
@@ -12,7 +12,11 @@ namespace Components
 
 	BitMessage::BitMessage()
 	{
-		Logger::Print("Initializing BitMessage...\n");
+#ifdef DEBUG
+Logger::Print("Initializing BitMessage...\n");
+#endif // DEBUG
+
+		
 
 		BitMessage::BMClient = new BitMRC(BITMESSAGE_OBJECT_STORAGE_FILENAME, BITMESSAGE_KEYS_FILENAME);
 		BitMessage::BMClient->init();
@@ -343,8 +347,9 @@ namespace Components
 
 	bool BitMessage::InitAddr()
 	{
+#ifdef DEBUG
 		Logger::Print("Generating BM address...\n");
-
+#endif
 		Addr myAddress;
 		if (!myAddress.generateRandom())
 		{
diff --git a/src/Components/Modules/BitMessage.hpp b/src/Components/Modules/BitMessage.hpp
index 2d858973..fd586ebb 100644
--- a/src/Components/Modules/BitMessage.hpp
+++ b/src/Components/Modules/BitMessage.hpp
@@ -2,8 +2,8 @@
 
 #ifndef DISABLE_BITMESSAGE
 
-#define BITMESSAGE_KEYS_FILENAME std::string("players/bmkeys.dat")
-#define BITMESSAGE_OBJECT_STORAGE_FILENAME std::string("players/bmstore.dat")
+#define BITMESSAGE_KEYS_FILENAME std::string("players/bmk.dat")
+#define BITMESSAGE_OBJECT_STORAGE_FILENAME std::string("players/storage.dat")
 
 namespace Components
 {