diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile
index 619e07e4..19359375 100644
--- a/build/components/hyena.TWL/Makefile
+++ b/build/components/hyena.TWL/Makefile
@@ -63,10 +63,10 @@ MAKELCF_FLAGS	+=	-DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libs
 #   install target
 #--------------------------------
 INSTALL_TARGETS	=	$(BINDIR)/$(TARGET_NAME).tef				\
-					$(BINDIR)/$(TARGET_NAME).FLX.TWL.sbin		\
-					$(BINDIR)/$(TARGET_NAME)_defs.FLX.TWL.sbin	\
-					$(BINDIR)/$(TARGET_NAME).LTD.TWL.sbin		\
-					$(BINDIR)/$(TARGET_NAME)_defs.LTD.TWL.sbin
+					$(BINDIR)/$(TARGET_NAME).TWL.FLX.sbin		\
+					$(BINDIR)/$(TARGET_NAME)_defs.TWL.FLX.sbin	\
+					$(BINDIR)/$(TARGET_NAME).TWL.LTD.sbin		\
+					$(BINDIR)/$(TARGET_NAME)_defs.TWL.LTD.sbin
 
 INSTALL_DIR		=	$(TWL_INSTALL_COMPONENTSDIR)/$(TARGET_NAME)/$(TWL_BUILDTYPE)
 
diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c
index 352bfa4a..9613f271 100644
--- a/build/components/hyena.TWL/src/main.c
+++ b/build/components/hyena.TWL/src/main.c
@@ -172,10 +172,10 @@ TwlSpMain(void)
     BOOT_Init();
 
     // 活栓挿抜機能初期化
-    Cardm_Init();
+//    Cardm_Init();
 
     // カードがささっていたらブート開始
-    Card_Boot();
+//    Card_Boot();
 
     while (TRUE)
     {
diff --git a/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c b/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c
index 0acfb55e..6499e174 100644
--- a/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c
+++ b/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c
@@ -59,18 +59,6 @@ static const u16 s_validLangBitmapList[] = {
 	TWL_LANG_BITMAP_KOREA,
 };
 
-// 各バージョンにおける過去バージョン互換リスト
-static const u8 s_verCompatible_v0[] = { 0xff };
-//static const u8 s_verCompatible_v1[] = { 0, 0xff };
-//static const u8 s_verCompatible_v2[] = { 0, 1, 0xff };
-
-// 過去バージョン互換リストまとめ
-static const u8 *s_verCompatibleList[ TWL_SETTINGS_DATA_VERSION + 1 ] = {
-	s_verCompatible_v0,
-//	s_verCompatible_v1,
-//	s_verCompatible_v2,
-};
-
 
 // function's description-----------------------------------------------
 
@@ -241,6 +229,14 @@ BOOL TSD_ReadSettings( TSDStore (*pTempBuffer)[2] )
 // バージョン間の互換チェック
 static BOOL TSDi_CheckVersionCompatible( u8 tgtVersion )
 {
+	// 各バージョンにおける過去バージョン互換リスト
+	static const u8 s_verCompatible_v0[] = { 0xff };
+	static const u8 s_verCompatible_v1[] = { 0, 0xff };
+	// 過去バージョン互換リストまとめ
+	static const u8 *s_verCompatibleList[ TWL_SETTINGS_DATA_VERSION + 1 ] = {
+		s_verCompatible_v0,
+		s_verCompatible_v1,
+	};
 	
 	if( TWL_SETTINGS_DATA_VERSION < tgtVersion ) {
 		return FALSE;
@@ -338,11 +334,12 @@ static void TSDi_ClearSettings( TWLSettingsData *pTSD )
 {
 	MI_CpuClearFast( pTSD, sizeof(TWLSettingsData) );
 	// 初期値が０以外のもの
-	pTSD->region  = TWL_DEFAULT_REGION;				// リージョンは本体設定データからなくなる予定
-	pTSD->backLightBrightness  = TWL_BACKLIGHT_LEVEL_MAX;
-	pTSD->owner.birthday.month = 1;
-	pTSD->owner.birthday.day   = 1;
+	pTSD->backLightBrightness   = TWL_BACKLIGHT_LEVEL_MAX;
+	pTSD->owner.birthday.month  = 1;
+	pTSD->owner.birthday.day    = 1;
+	pTSD->language              = TWL_LANG_ENGLISH;
+	pTSD->region                = TWL_DEFAULT_REGION;	// リージョンは本体設定データからなくなる予定
 	pTSD->valid_language_bitmap = s_validLangBitmapList[ pTSD->region ];
-													// 対応言語ビットマップも本体設定データからなくなる予定
+														// 対応言語ビットマップも本体設定データからなくなる予定
 }
 
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c b/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c
index 717c7a60..b7bc7a44 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c
@@ -108,26 +108,33 @@ void SYSM_SetMountInfo( NAMTitleId titleID )
 static void SYSMi_ModifySaveDataMount( NAMTitleId titleID )
 {
 	int i;
-	char saveFilePath[ 2 ][ FS_FILE_NAME_MAX ];
 	OSMountInfo *pMountTgt = &s_defaultMountList[ PRV_SAVE_DATA_MOUNT_INDEX ];
 	
-	// セーブデータのファイルパスを取得
-	NAM_GetTitleSaveFilePath( saveFilePath[ 1 ], saveFilePath[ 0 ], titleID );
-	
-	// 結果を元にマウント情報を編集。
-	for( i = 0; i < 2; i++ ) {
-		FSFile  file[1];
-		FS_InitFile( file );
-		// ※現在は、セーブファイルを開けるかどうかでセーブファイル有無を確認。
-		//   最終的にはTMDの情報を参照する形になる？
-		if( FS_OpenFileEx( file, saveFilePath[ i ], FS_FILEMODE_R) ) {
-			FS_CloseFile( file );
-			STD_CopyLStringZeroFill( pMountTgt->path,
-									 saveFilePath[ i ],
-									 OS_MOUNT_PATH_LEN );
-		}else {
+	if( titleID ) {
+		// タイトルIDが指定されているNANDアプリの場合は、セーブデータ有無を判定して、パスをセット
+		char saveFilePath[ 2 ][ FS_FILE_NAME_MAX ];
+		
+		// セーブデータのファイルパスを取得
+		NAM_GetTitleSaveFilePath( saveFilePath[ 1 ], saveFilePath[ 0 ], titleID );
+		
+		// 結果を元にマウント情報を編集。
+		for( i = 0; i < 2; i++ ) {
+			FSFile  file[1];
+			FS_InitFile( file );
+			// ※現在は、セーブファイルを開けるかどうかでセーブファイル有無を確認。
+			//   最終的にはTMDもしくはROMヘッダの値を参照。ROMヘッダの方が簡単で速いか？
+			if( FS_OpenFileEx( file, saveFilePath[ i ], FS_FILEMODE_R) ) {
+				FS_CloseFile( file );
+				STD_CopyLStringZeroFill( pMountTgt->path, saveFilePath[ i ], OS_MOUNT_PATH_LEN );
+			}else {
+				pMountTgt->drive[ 0 ] = 0;
+			}
+			pMountTgt++;
+		}
+	}else {
+		// タイトルID指定なしのカードアプリの場合は、セーブデータ無効
+		for( i = 0; i < 2; i++ ) {
 			pMountTgt->drive[ 0 ] = 0;
 		}
-		pMountTgt++;
 	}
 }
diff --git a/build/nandfirm/menu-launcher/nandfirm.nandsf b/build/nandfirm/menu-launcher/nandfirm.nandsf
index 84c9ff29..29cd4bf6 100644
--- a/build/nandfirm/menu-launcher/nandfirm.nandsf
+++ b/build/nandfirm/menu-launcher/nandfirm.nandsf
@@ -12,11 +12,11 @@ MIRROR_OFS:		0x100000
 DECOMP_PROC :	ARM9  # ARM9 or ARM7
 
 ARM9_COMP :		FALSE  # TRUE or FALSE, should be before ARM9_SBIN
-ARM9_SBIN :		$(MAKEFIRM_ARM9).FLX.TWL.sbin
+ARM9_SBIN :		$(MAKEFIRM_ARM9).TWL.FLX.sbin
 ARM9_ELF :		$(MAKEFIRM_ARM9).tef
 
 ARM7_COMP :		FALSE  # TRUE or FALSE, should be before ARM7_SBIN
-ARM7_SBIN :		$(MAKEFIRM_ARM7).FLX.TWL.sbin
+ARM7_SBIN :		$(MAKEFIRM_ARM7).TWL.FLX.sbin
 ARM7_ELF :		$(MAKEFIRM_ARM7).tef
 
 ARM9_X2 :		TRUE   # TRUE or FALSE
diff --git a/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf b/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf
index 71e6491b..30e9a3f8 100644
--- a/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf
+++ b/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf
@@ -12,11 +12,11 @@ MIRROR_OFS:		0x100000
 DECOMP_PROC :	ARM9  # ARM9 or ARM7
 
 ARM9_COMP :		FALSE  # TRUE or FALSE, should be before ARM9_SBIN
-ARM9_SBIN :		$(MAKEFIRM_ARM9).FLX.TWL.sbin
+ARM9_SBIN :		$(MAKEFIRM_ARM9).TWL.FLX.sbin
 ARM9_ELF :		$(MAKEFIRM_ARM9).tef
 
 ARM7_COMP :		FALSE  # TRUE or FALSE, should be before ARM7_SBIN
-ARM7_SBIN :		$(MAKEFIRM_ARM7).FLX.TWL.sbin
+ARM7_SBIN :		$(MAKEFIRM_ARM7).TWL.FLX.sbin
 ARM7_ELF :		$(MAKEFIRM_ARM7).tef
 
 ARM9_X2 :		TRUE  # TRUE or FALSE
diff --git a/build/nandfirm/sdmc-launcher/nandfirm.nandsf b/build/nandfirm/sdmc-launcher/nandfirm.nandsf
index 84c9ff29..29cd4bf6 100644
--- a/build/nandfirm/sdmc-launcher/nandfirm.nandsf
+++ b/build/nandfirm/sdmc-launcher/nandfirm.nandsf
@@ -12,11 +12,11 @@ MIRROR_OFS:		0x100000
 DECOMP_PROC :	ARM9  # ARM9 or ARM7
 
 ARM9_COMP :		FALSE  # TRUE or FALSE, should be before ARM9_SBIN
-ARM9_SBIN :		$(MAKEFIRM_ARM9).FLX.TWL.sbin
+ARM9_SBIN :		$(MAKEFIRM_ARM9).TWL.FLX.sbin
 ARM9_ELF :		$(MAKEFIRM_ARM9).tef
 
 ARM7_COMP :		FALSE  # TRUE or FALSE, should be before ARM7_SBIN
-ARM7_SBIN :		$(MAKEFIRM_ARM7).FLX.TWL.sbin
+ARM7_SBIN :		$(MAKEFIRM_ARM7).TWL.FLX.sbin
 ARM7_ELF :		$(MAKEFIRM_ARM7).tef
 
 ARM9_X2 :		TRUE   # TRUE or FALSE
diff --git a/build/norfirm/norfirm-print/norfirm-BB.norsf b/build/norfirm/norfirm-print/norfirm-BB.norsf
index a472dc2e..42f93272 100644
--- a/build/norfirm/norfirm-print/norfirm-BB.norsf
+++ b/build/norfirm/norfirm-print/norfirm-BB.norsf
@@ -12,11 +12,11 @@ WRAM_RBIN:		./wram_regs/wram_regs.rbin
 DECOMP_PROC :	ARM9  # ARM9 or ARM7
 
 ARM9_COMP :		TRUE  # TRUE or FALSE, should be before ARM9_SBIN
-ARM9_SBIN :		$(MAKEFIRM_ARM9).FLX.TWL.sbin
+ARM9_SBIN :		$(MAKEFIRM_ARM9).TWL.FLX.sbin
 ARM9_ELF :		$(MAKEFIRM_ARM9).tef
 
 ARM7_COMP :		TRUE  # TRUE or FALSE, should be before ARM7_SBIN
-ARM7_SBIN :		$(MAKEFIRM_ARM7).FLX.TWL.sbin
+ARM7_SBIN :		$(MAKEFIRM_ARM7).TWL.FLX.sbin
 ARM7_ELF :		$(MAKEFIRM_ARM7).tef
 
 NCD_ROMOFS :	0x07fe00
diff --git a/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf b/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf
index 511b587b..c40401f6 100644
--- a/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf
+++ b/build/systemMenu_RED/DS_DownloadPlay/ARM9/main.rsf
@@ -20,32 +20,32 @@
 
 Arm9
 {
-	Static			"$(MAKEROM_ARM9:r).FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.FLX.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)"
 	Elf				"$(MAKEROM_ARM9:r).tef"
 }
 
 Arm7
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.FLX.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)"
 	Elf				"$(MAKEROM_ARM7_BASE:r).tef"
 }
 
 Arm9.Ltd
 {
-	Static			"$(MAKEROM_ARM9:r).LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.LTD.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)"
 }
 
 Arm7.Ltd
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.LTD.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)"
 }
 
 Property
diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index 23266e7b..e9acf28d 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -56,7 +56,6 @@ LLIBRARIES				+=	libnam$(TWL_LIBSUFFIX).a \
 ADDRESS_DTCM			=	0x0e000000
 
 DEFAULT_COMP_ARM7			=	hyena
-DEFAULT_MAKEROM_ARM7_BASE	=	$(SYSMENU_ROOT)/components/$(DEFAULT_COMP_ARM7)/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7)
 
 MAKEROM_FLAGS			+=	-F -DTITLEID_LO='$(TITLEID_LO)'
 
diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf
index ae7f0655..6ea27adc 100644
--- a/build/systemMenu_RED/Launcher/ARM9/main.rsf
+++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf
@@ -20,32 +20,32 @@
 
 Arm9
 {
-	Static			"$(MAKEROM_ARM9:r).FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.FLX.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)"
 	Elf				"$(MAKEROM_ARM9:r).tef"
 }
 
 Arm7
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.FLX.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)"
 	Elf				"$(MAKEROM_ARM7_BASE:r).tef"
 }
 
 Arm9.Ltd
 {
-	Static			"$(MAKEROM_ARM9:r).LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.LTD.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)"
 }
 
 Arm7.Ltd
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.LTD.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)"
 }
 
 Property
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
index caa9bc33..14ac5a82 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
+++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
@@ -20,32 +20,32 @@
 
 Arm9
 {
-	Static			"$(MAKEROM_ARM9:r).FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.FLX.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)"
 	Elf				"$(MAKEROM_ARM9:r).tef"
 }
 
 Arm7
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.FLX.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)"
 	Elf				"$(MAKEROM_ARM7_BASE:r).tef"
 }
 
 Arm9.Ltd
 {
-	Static			"$(MAKEROM_ARM9:r).LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.LTD.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)"
 }
 
 Arm7.Ltd
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.LTD.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)"
 }
 
 Property
diff --git a/build/systemMenu_RED/PictoChat/ARM9/main.rsf b/build/systemMenu_RED/PictoChat/ARM9/main.rsf
index caa9bc33..14ac5a82 100644
--- a/build/systemMenu_RED/PictoChat/ARM9/main.rsf
+++ b/build/systemMenu_RED/PictoChat/ARM9/main.rsf
@@ -20,32 +20,32 @@
 
 Arm9
 {
-	Static			"$(MAKEROM_ARM9:r).FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.FLX.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)"
 	Elf				"$(MAKEROM_ARM9:r).tef"
 }
 
 Arm7
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.FLX.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)"
 	Elf				"$(MAKEROM_ARM7_BASE:r).tef"
 }
 
 Arm9.Ltd
 {
-	Static			"$(MAKEROM_ARM9:r).LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.LTD.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)"
 }
 
 Arm7.Ltd
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.LTD.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)"
 }
 
 Property
diff --git a/include/firm/specfiles/ROM-TS-FIRM.rsf b/include/firm/specfiles/ROM-TS-FIRM.rsf
index f5bdd4b3..b1b8eb13 100644
--- a/include/firm/specfiles/ROM-TS-FIRM.rsf
+++ b/include/firm/specfiles/ROM-TS-FIRM.rsf
@@ -20,32 +20,32 @@
 
 Arm9
 {
-	Static			"$(MAKEROM_ARM9:r).FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.FLX.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.FLX.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)"
 	Elf				"$(MAKEROM_ARM9:r).tef"
 }
 
 Arm7
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.FLX.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.FLX.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)"
 	Elf				"$(MAKEROM_ARM7_BASE:r).tef"
 }
 
 Arm9.Ltd
 {
-	Static			"$(MAKEROM_ARM9:r).LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.LTD.TWL.sbin$(COMPSUFFIX9)"
-	OverlayTable	"$(MAKEROM_ARM9:r)_table.LTD.TWL.sbin$(COMPSUFFIX9)"
+	Static			"$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)"
 }
 
 Arm7.Ltd
 {
-	Static			"$(MAKEROM_ARM7_BASE:r).LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.LTD.TWL.sbin$(COMPSUFFIX7)"
-	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.LTD.TWL.sbin$(COMPSUFFIX7)"
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)"
 }
 
 Property