diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile
index dfa19be..007d622 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile
@@ -44,7 +44,8 @@ SOURCES[]           =
                         ../common/ResFont.cpp
                         ../common/HardwareStateManager.cpp
 
-CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
+include $(ROOT)/common/BuildSwitch.om
+CTR_BANNER_SPEC     =   $(TARGET_NAME).bsf
 
 ROMFS_ROOT          =   ../common/romfiles
 
@@ -66,7 +67,7 @@ LIBS               +=   libnn_cfg \
 
 INSTALL_SDK_TOOL = true
 
-ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
+ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile
index 4e80b07..5567dd4 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile
@@ -47,7 +47,8 @@ SOURCES[]           =
                         ../common/ResFont.cpp
                         ../common/HardwareStateManager.cpp
 
-CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
+include $(ROOT)/common/BuildSwitch.om
+CTR_BANNER_SPEC     =   $(TARGET_NAME).bsf
 
 ROMFS_ROOT          =   ../common/romfiles
 
@@ -69,7 +70,7 @@ LIBS               +=   libnn_cfg \
 
 INSTALL_SDK_TOOL = true
 
-ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
+ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile
index ef5f9f7..2cc5c19 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile
@@ -32,7 +32,6 @@ TEST_COMMON_SOURCES[] =
                         ../../../common/LogConsole.cpp
                         ../../../common/CommonLogger.cpp
                         ../../../common/SdMountManager.cpp
-                        ../../../common/PlayHistoryManager.cpp
                         ../../../common/VersionDetect.cpp
                         ../../../common/HardwareStateManager.cpp
                         ../../../common/FileTransfer.cpp
@@ -54,7 +53,7 @@ LIBS                +=  libnn_test \
 
 
 ROM_SPEC_FILE       =   ../../../ConsoleBackup/ConsoleBackup.rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 
 include $(makePlatformDefsPath build.tests)
diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp
index 486e320..4f2f9be 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp
@@ -65,10 +65,10 @@ bool ExporterTest::InitializeSuite()
     nn::am::InitializeForSystemMenu();
 
     // ヒープの確保
-    common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
+    common::HeapManager gxHeap(s_GxHeapSize);
 
     // RenderSystem の準備
-    uptr heapForGx = reinterpret_cast<uptr>(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize));
+    uptr heapForGx = reinterpret_cast<uptr>(gxHeap.GetAddr());
     demo::RenderSystemDrawing renderSystem;
     renderSystem.Initialize(heapForGx, s_GxHeapSize);
 
diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile
index 30f3b2d..bcb51d9 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile
@@ -33,7 +33,6 @@ TEST_COMMON_SOURCES[] =
                         ../../../common/LogConsole.cpp
                         ../../../common/CommonLogger.cpp
                         ../../../common/SdMountManager.cpp
-                        ../../../common/PlayHistoryManager.cpp
                         ../../../common/VersionDetect.cpp
                         ../../../common/HardwareStateManager.cpp
                         ../../../common/FileTransfer.cpp
@@ -56,7 +55,7 @@ LIBS                +=  libnn_test \
 
 
 ROM_SPEC_FILE       =   ../../../ConsoleRestore/ConsoleRestore.rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 
 include $(makePlatformDefsPath build.tests)
diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp
index 97adbe2..ddd1aa2 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp
@@ -66,10 +66,10 @@ bool TitleDownloaderTest::InitializeSuite()
     nn::am::InitializeForSystemMenu();
 
     // ヒープの確保
-    common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
+    common::HeapManager gxHeap(s_GxHeapSize);
 
     // RenderSystem の準備
-    uptr heapForGx = reinterpret_cast<uptr>(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize));
+    uptr heapForGx = reinterpret_cast<uptr>(gxHeap.GetAddr());
     demo::RenderSystemDrawing renderSystem;
     renderSystem.Initialize(heapForGx, s_GxHeapSize);
 
diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile
index 825ae74..c33d265 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile
@@ -46,7 +46,7 @@ LIBS                +=  libnn_test \
 
 
 ROM_SPEC_FILE       =   ../../../ConsoleRestore/ConsoleRestore.rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 
 include $(makePlatformDefsPath build.tests)
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile
index 4001800..8daafd0 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile
@@ -39,6 +39,7 @@ SOURCES[]           =
                         ../../common/configLoader.cpp
                         ../../common/VersionDetect.cpp
 
+include $(ROOT)/common/BuildSwitch.om
 CTR_BANNER_SPEC     =   AutoBoot.bsf
 
 ROMFS_ROOT          =   ../../common/romfiles
@@ -56,7 +57,7 @@ LIBS               +=   libnn_cfg \
 
 INSTALL_SDK_TOOL = true
 
-ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
+ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile
index f9b9027..0c27e16 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile
@@ -39,7 +39,8 @@ SOURCES[]           =
                         ../../common/configLoader.cpp
                         ../../common/VersionDetect.cpp
 
-CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
+include $(ROOT)/common/BuildSwitch.om
+CTR_BANNER_SPEC     =   $(TARGET_NAME).bsf
 
 ROMFS_ROOT          =   ../../common/romfiles
 
@@ -56,7 +57,7 @@ LIBS               +=   libnn_cfg \
 
 INSTALL_SDK_TOOL = true
 
-ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
+ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile
index 3eec50d..4f6a1e0 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile
@@ -39,7 +39,8 @@ SOURCES[]           =
                         ../../common/configLoader.cpp
                         ../../common/VersionDetect.cpp
 
-CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
+include $(ROOT)/common/BuildSwitch.om
+CTR_BANNER_SPEC     =   $(TARGET_NAME).bsf
 
 ROMFS_ROOT          =   ../../common/romfiles
 
@@ -56,7 +57,7 @@ LIBS               +=   libnn_cfg \
 
 INSTALL_SDK_TOOL = true
 
-ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
+ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile
index ada531f..2c0d424 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile
@@ -39,7 +39,8 @@ SOURCES[]           =
                         ../../common/configLoader.cpp
                         ../../common/VersionDetect.cpp
 
-CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
+include $(ROOT)/common/BuildSwitch.om
+CTR_BANNER_SPEC     =   $(TARGET_NAME).bsf
 
 ROMFS_ROOT          =   ../../common/romfiles
 
@@ -56,7 +57,7 @@ LIBS               +=   libnn_cfg \
 
 INSTALL_SDK_TOOL = true
 
-ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
+ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules