diff --git a/build/gcdfirm/sdmc-launcher/ARM9/main.c b/build/gcdfirm/sdmc-launcher/ARM9/main.c
index 7e709671..19c51647 100644
--- a/build/gcdfirm/sdmc-launcher/ARM9/main.c
+++ b/build/gcdfirm/sdmc-launcher/ARM9/main.c
@@ -203,10 +203,10 @@ static BOOL CheckHeader(void)
          (u32)rhs->main_ram_address > (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address > (u32)rhs->sub_entry_address ||
         // should be in main memory (end address)
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ram_address + rhs->main_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ram_address + rhs->sub_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->main_ram_address + rhs->main_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->sub_ram_address + rhs->sub_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
         // should be in static area without Limited region (end address)
          (u32)rhs->main_ram_address + rhs->main_size <= (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address + rhs->sub_size <= (u32)rhs->sub_entry_address ||
diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c
index 4700b4ea..73e5e2c3 100644
--- a/build/nandfirm/menu-launcher/ARM9/main.c
+++ b/build/nandfirm/menu-launcher/ARM9/main.c
@@ -210,10 +210,10 @@ static BOOL CheckHeader(void)
          (u32)rhs->main_ram_address > (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address > (u32)rhs->sub_entry_address ||
         // should be in main memory (end address)
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ram_address + rhs->main_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ram_address + rhs->sub_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->main_ram_address + rhs->main_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->sub_ram_address + rhs->sub_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
         // should be in static area without Limited region (end address)
          (u32)rhs->main_ram_address + rhs->main_size <= (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address + rhs->sub_size <= (u32)rhs->sub_entry_address ||
diff --git a/build/nandfirm/menu-launcher2/ARM9/main.c b/build/nandfirm/menu-launcher2/ARM9/main.c
index 4521d28c..27996d00 100644
--- a/build/nandfirm/menu-launcher2/ARM9/main.c
+++ b/build/nandfirm/menu-launcher2/ARM9/main.c
@@ -212,10 +212,10 @@ static BOOL CheckHeader(void)
          (u32)rhs->main_ram_address > (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address > (u32)rhs->sub_entry_address ||
         // should be in main memory (end address)
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ram_address + rhs->main_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ram_address + rhs->sub_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
+         HW_FIRM_FS_AES_BUFFER <= (u32)rhs->main_ram_address + rhs->main_size ||
+         HW_FIRM_FS_AES_BUFFER <= (u32)rhs->sub_ram_address + rhs->sub_size ||
+         HW_FIRM_FS_AES_BUFFER <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
+         HW_FIRM_FS_AES_BUFFER <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
         // should be in static area without Limited region (end address)
          (u32)rhs->main_ram_address + rhs->main_size <= (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address + rhs->sub_size <= (u32)rhs->sub_entry_address ||
diff --git a/build/nandfirm/sdmc-launcher/ARM9/main.c b/build/nandfirm/sdmc-launcher/ARM9/main.c
index 077fd8e7..367836df 100644
--- a/build/nandfirm/sdmc-launcher/ARM9/main.c
+++ b/build/nandfirm/sdmc-launcher/ARM9/main.c
@@ -207,10 +207,10 @@ static BOOL CheckHeader(void)
          (u32)rhs->main_ram_address > (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address > (u32)rhs->sub_entry_address ||
         // should be in main memory (end address)
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ram_address + rhs->main_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ram_address + rhs->sub_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
-         HW_TWL_MAIN_MEM_END <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->main_ram_address + rhs->main_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->sub_ram_address + rhs->sub_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->main_ltd_ram_address + rhs->main_ltd_size ||
+         HW_FIRM_FATFS_COMMAND_BUFFER <= (u32)rhs->sub_ltd_ram_address + rhs->sub_ltd_size ||
         // should be in static area without Limited region (end address)
          (u32)rhs->main_ram_address + rhs->main_size <= (u32)rhs->main_entry_address ||
          (u32)rhs->sub_ram_address + rhs->sub_size <= (u32)rhs->sub_entry_address ||