diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 7109698..91133bf 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -853,7 +853,7 @@ bool ExistsIvsDirectory(std::string& ivsRoot)
     result = dir.TryInitialize(common::SD_NINTENDO_3DS_ROOT_PATH);
     if(result.IsFailure())
     {
-        nn::dbg::PrintResult(result);
+        NN_DBG_PRINT_RESULT(result);
         common::SdMountManager::Unmount();
         return false;
     }
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
index e4ea106..efd3931 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
@@ -37,7 +37,7 @@ do {                                     \
     	nn::nim::Shop::GetCustomerSupportCode(&csc);            \
         COMMON_LOGGER("CSCode: %d\n", csc);                     \
         COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);       \
-        nn::dbg::PrintResult(result);                           \
+        NN_DBG_PRINT_RESULT(result);                             \
         COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits());   \
         s_ShopResult = result;                                  \
         return;                                                \
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp
index c72289f..3dbb1f7 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp
@@ -42,7 +42,7 @@ do {                                     \
             nn::nim::Updater::GetCustomerSupportCode(&csc));    \
         COMMON_LOGGER("CSCode: %d\n", csc);                            \
         COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);       \
-        nn::dbg::PrintResult(result);                           \
+        NN_DBG_PRINT_RESULT(result);                             \
         COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits());   \
         s_Result = result;                                      \
         goto LABEL_FINALIZE;                                    \
diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp b/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp
index 59db5dc..c77bd09 100644
--- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp
@@ -57,9 +57,7 @@ void CommonLogger::Print(const char* fmt, ...)
 
     va_start(vlist, fmt);
 
-#ifdef NN_BUILD_VERBOSE
-    nn::dbg::detail::VPrintf(fmt, vlist);
-#endif
+    NN_LOGV(fmt, vlist);
     GetSdInstance()->Print(fmt, vlist);
     GetConsoleInstance()->AddText(fmt, vlist);
 
diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
index 4c6c4d8..1891295 100644
--- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
@@ -23,7 +23,7 @@
 
 #define COMMON_LOGGER( ... )  (void)common::Logger::GetLoggerInstance()->Print(__VA_ARGS__)
 #define COMMON_LOGGER_RESULT(result, func)  \
-    (void)nn::dbg::PrintResult(result); \
+    NN_DBG_PRINT_RESULT(result); \
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Func   = %s\n", func);                      \
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \
 
@@ -34,9 +34,9 @@
 #endif  // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT else
 
 #define COMMON_LOGGER_RESULT_WITH_LINE(result, line, func)  \
-    (void)nn::dbg::detail::Printf("%s\n", func); \
-    (void)nn::dbg::detail::Printf("%d\n", line); \
-    (void)nn::dbg::PrintResult(result); \
+    NN_LOG("%s\n", func); \
+    NN_LOG("%d\n", line); \
+    NN_DBG_PRINT_RESULT(result); \
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Func   = %s\n", func); \
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("line   = %d\n", line); \
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \
diff --git a/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp b/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp
index 50a3589..9851395 100644
--- a/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp
@@ -46,7 +46,7 @@ void PrintResultIfFailed(nn::Result result, u32 line = 0)
         {
             NN_LOG("%s, %d\n", __FILE__, line);
         }
-        nn::dbg::PrintResult(result);
+        NN_DBG_PRINT_RESULT(result);
     }
 }
 
@@ -224,7 +224,7 @@ void SdLogger::Clear()
     result = nn::fs::TryDeleteFile(log.c_str());
     if(result.IsFailure())
     {
-        nn::dbg::PrintResult(result);
+        NN_DBG_PRINT_RESULT(result);
     }
 
     SdMountManager::Unmount();
diff --git a/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
index 0a05490..1fa18c4 100644
--- a/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
+++ b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
@@ -108,7 +108,7 @@ void UtilTest::GetSaveDataDirectoryRoot()
             result = fis.TryRead(&readSize, ivs, ivsSize);
             if (result.IsFailure())
             {
-                nn::dbg::PrintResult(result);
+                NN_DBG_PRINT_RESULT(result);
                 NN_TEST_FAIL("Can't Read IVS");
             }
         }