diff --git a/build/libraries/os/common/os_init_firm.c b/build/libraries/os/common/os_init_firm.c
index 58d1c165..5f6745e2 100644
--- a/build/libraries/os/common/os_init_firm.c
+++ b/build/libraries/os/common/os_init_firm.c
@@ -11,22 +11,22 @@
   in whole or in part, without the prior written consent of Nintendo.
 
   $Date::            $
-  $Rev:$
-  $Author:$
+  $Rev$
+  $Author$
  *---------------------------------------------------------------------------*/
 #include <firm.h>
 
 /*---------------------------------------------------------------------------*
   Name:         OS_InitNOR
 
-  Description:  initialize sdk os for norfirm
+  Description:  initialize sdk os for firm
 
   Arguments:    None
 
   Returns:      None
  *---------------------------------------------------------------------------*/
 #pragma profile off
-void OS_InitNOR(void)
+void OS_InitFIRM(void)
 {
 #ifdef SDK_ARM9
     //---- system shared area check
diff --git a/build/norfirm/norfirm-print/ARM7/Makefile b/build/norfirm/norfirm-print/ARM7/Makefile
index b58044db..1bc6dbf4 100644
--- a/build/norfirm/norfirm-print/ARM7/Makefile
+++ b/build/norfirm/norfirm-print/ARM7/Makefile
@@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------
 
 FIRM_PROC      = ARM7
-FIRM_TARGET    = NORFIRM
+FIRM_TARGET    = FIRM
 
 SUBDIRS		=
 
@@ -27,6 +27,8 @@ LINCLUDES	=   ../include
 
 TARGET_BIN	=	twl_norfirm7_print.axf
 
+CRT0_O		=	crt0_firm.o
+
 SRCS		=	\
                 main.c \
 
diff --git a/build/norfirm/norfirm-print/ARM7/main.c b/build/norfirm/norfirm-print/ARM7/main.c
index 80c63f4f..13134a0f 100644
--- a/build/norfirm/norfirm-print/ARM7/main.c
+++ b/build/norfirm/norfirm-print/ARM7/main.c
@@ -11,8 +11,8 @@
   in whole or in part, without the prior written consent of Nintendo.
 
   $Date::            $
-  $Rev:$
-  $Author:$
+  $Rev$
+  $Author$
  *---------------------------------------------------------------------------*/
 #include <firm.h>
 
@@ -21,7 +21,7 @@ void TwlSpMain( void )
 {
     OS_TPrintf( "\nNOR Boot time is %d msec.\n", OS_TicksToMilliSecondsBROM32(OS_GetTick()));
 
-    OS_InitNOR();
+    OS_InitFIRM();
 
     OS_TPrintf( "\nARM7 starts.\n" );
     OS_TPrintf( "\nARM7 ends.\n" );
diff --git a/build/norfirm/norfirm-print/ARM9/Makefile b/build/norfirm/norfirm-print/ARM9/Makefile
index 8fdefc6a..41f64e3f 100644
--- a/build/norfirm/norfirm-print/ARM9/Makefile
+++ b/build/norfirm/norfirm-print/ARM9/Makefile
@@ -16,7 +16,7 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_TARGET    = NORFIRM
+FIRM_TARGET    = FIRM
 
 SUBDIRS		=
 
@@ -26,6 +26,8 @@ LINCLUDES	=   ../include
 
 TARGET_BIN	=	twl_norfirm9_print.axf
 
+CRT0_O		=	crt0_firm.o
+
 SRCS		=	\
                 main.c \
 
diff --git a/build/norfirm/norfirm-print/ARM9/main.c b/build/norfirm/norfirm-print/ARM9/main.c
index e10429fe..08f1fdb1 100644
--- a/build/norfirm/norfirm-print/ARM9/main.c
+++ b/build/norfirm/norfirm-print/ARM9/main.c
@@ -11,8 +11,8 @@
   in whole or in part, without the prior written consent of Nintendo.
 
   $Date::            $
-  $Rev:$
-  $Author:$
+  $Rev$
+  $Author$
  *---------------------------------------------------------------------------*/
 #include <firm.h>
 
@@ -21,7 +21,7 @@ void TwlMain( void )
 {
     OS_TPrintf( "\nNOR Boot time is %d msec.\n", OS_TicksToMilliSecondsBROM32(OS_GetTick()));
 
-    OS_InitNOR();
+    OS_InitFIRM();
 
     OS_TPrintf( "\nARM9 starts.\n" );
     OS_TPrintf( "\nARM9 ends.\n" );
diff --git a/include/firm/hw/ARM7/mmap_firm.h b/include/firm/hw/ARM7/mmap_firm.h
index ab53e7d6..bfbcbe5d 100644
--- a/include/firm/hw/ARM7/mmap_firm.h
+++ b/include/firm/hw/ARM7/mmap_firm.h
@@ -21,20 +21,20 @@
 extern "C" {
 #endif
 
-//------------------------------------- NORFIRM
-#define HW_NORFIRM                      HW_WRAM
-#define HW_NORFIRM_END                  (HW_NORFIRM + HW_NORFIRM_SIZE)
-#define HW_NORFIRM_SIZE                 (HW_WRAM_0_SIZE + HW_WRAM_1_SIZE + HW_WRAM_A_SIZE_MAX + HW_WRAM_B_SIZE_MAX)
+//------------------------------------- FIRM
+#define HW_FIRM                         HW_WRAM
+#define HW_FIRM_END                     (HW_FIRM + HW_FIRM_SIZE)
+#define HW_FIRM_SIZE                    (HW_WRAM_0_SIZE + HW_WRAM_1_SIZE + HW_WRAM_A_SIZE_MAX + HW_WRAM_B_SIZE_MAX)
 
-//------------------------------------- NORFIRM_WRAM_ABC
-#define HW_NORFIRM_WRAM_A_MAP_END       (HW_WRAM_AREA_END - HW_PRV_WRAM_SIZE)
-#define HW_NORFIRM_WRAM_B_MAP_END       HW_NORFIRM_WRAM_A_MAP_END
-#define HW_NORFIRM_WRAM_C_MAP_END       HW_NORFIRM_WRAM_A_MAP_END
+//------------------------------------- FIRM_WRAM_ABC
+#define HW_FIRM_WRAM_A_MAP_END          (HW_WRAM_AREA_END - HW_PRV_WRAM_SIZE)
+#define HW_FIRM_WRAM_B_MAP_END          HW_FIRM_WRAM_A_MAP_END
+#define HW_FIRM_WRAM_C_MAP_END          HW_FIRM_WRAM_A_MAP_END
 
-//------------------------------------- HW_NORFIRM_FROM_BROM_BUF
-#define HW_NORFIRM_FROM_BROM_BUF        (HW_NORFIRM_FROM_BROM_BUF_END - HW_NORFIRM_FROM_BROM_BUF_SIZE)
-#define HW_NORFIRM_FROM_BROM_BUF_END    (HW_WRAM_AREA_END - 0x1000)  // END - 4KB
-#define HW_NORFIRM_FROM_BROM_BUF_SIZE   0x3000  // 12KB
+//------------------------------------- HW_FIRM_FROM_BROM_BUF
+#define HW_FIRM_FROM_BROM_BUF           (HW_FIRM_FROM_BROM_BUF_END - HW_FIRM_FROM_BROM_BUF_SIZE)
+#define HW_FIRM_FROM_BROM_BUF_END       (HW_WRAM_AREA_END - 0x1000)  // END - 4KB
+#define HW_FIRM_FROM_BROM_BUF_SIZE      0x3000  // 12KB
 
 
 #ifdef __cplusplus
diff --git a/include/firm/hw/ARM9/mmap_firm.h b/include/firm/hw/ARM9/mmap_firm.h
index 127312d1..4dea816f 100644
--- a/include/firm/hw/ARM9/mmap_firm.h
+++ b/include/firm/hw/ARM9/mmap_firm.h
@@ -21,20 +21,20 @@
 extern "C" {
 #endif
 
-//------------------------------------- NORFIRM
-#define HW_NORFIRM                      HW_WRAM_EX
-#define HW_NORFIRM_END                  (HW_NORFIRM + HW_NORFIRM_SIZE)
-#define HW_NORFIRM_SIZE                 HW_WRAM_C_SIZE_MAX
+//------------------------------------- FIRM
+#define HW_FIRM                         HW_WRAM_EX
+#define HW_FIRM_END                     (HW_FIRM + HW_FIRM_SIZE)
+#define HW_FIRM_SIZE                    HW_WRAM_C_SIZE_MAX
 
-//------------------------------------- NORFIRM_WRAM_ABC
-#define HW_NORFIRM_WRAM_A_MAP_END       HW_WRAM_AREA_END
-#define HW_NORFIRM_WRAM_B_MAP_END       HW_NORFIRM_WRAM_A_MAP_END
-#define HW_NORFIRM_WRAM_C_MAP_END       HW_NORFIRM_WRAM_A_MAP_END
+//------------------------------------- FIRM_WRAM_ABC
+#define HW_FIRM_WRAM_A_MAP_END          HW_WRAM_AREA_END
+#define HW_FIRM_WRAM_B_MAP_END          HW_FIRM_WRAM_A_MAP_END
+#define HW_FIRM_WRAM_C_MAP_END          HW_FIRM_WRAM_A_MAP_END
 
-//------------------------------------- HW_NORFIRM_FROM_BROM_BUF
-#define HW_NORFIRM_FROM_BROM_BUF        (HW_NORFIRM_FROM_BROM_BUF_END - HW_NORFIRM_FROM_BROM_BUF_SIZE)
-#define HW_NORFIRM_FROM_BROM_BUF_END    (HW_ITCM_END - 0x1000)  //  END - 4KB
-#define HW_NORFIRM_FROM_BROM_BUF_SIZE   0x3000  // 12KB
+//------------------------------------- HW_FIRM_FROM_BROM_BUF
+#define HW_FIRM_FROM_BROM_BUF           (HW_FIRM_FROM_BROM_BUF_END - HW_FIRM_FROM_BROM_BUF_SIZE)
+#define HW_FIRM_FROM_BROM_BUF_END       (HW_ITCM_END - 0x1000)  //  END - 4KB
+#define HW_FIRM_FROM_BROM_BUF_SIZE      0x3000  // 12KB
 
 
 #ifdef __cplusplus
diff --git a/include/firm/os/common/boot.h b/include/firm/os/common/boot.h
index dabd2936..d7ff924a 100644
--- a/include/firm/os/common/boot.h
+++ b/include/firm/os/common/boot.h
@@ -55,7 +55,7 @@ void OSi_Finalize(void);
 /*---------------------------------------------------------------------------*
   Name:         OSi_GetFromBromAddr
 
-  Description:  data address from bootrom to norfirm
+  Description:  data address from bootrom to firm
 
   Arguments:    None
 
@@ -63,7 +63,7 @@ void OSi_Finalize(void);
  *---------------------------------------------------------------------------*/
 static inline OSFromBromBuf* OSi_GetFromBromAddr( void )
 {
-    return  (OSFromBromBuf*)HW_NORFIRM_FROM_BROM_BUF;
+    return  (OSFromBromBuf*)HW_FIRM_FROM_BROM_BUF;
 }
 
 
diff --git a/include/firm/os/common/init.h b/include/firm/os/common/init.h
index 4f5baa43..45e596ca 100644
--- a/include/firm/os/common/init.h
+++ b/include/firm/os/common/init.h
@@ -24,15 +24,15 @@ extern "C" {
 #endif
 
 /*---------------------------------------------------------------------------*
-  Name:         OS_InitNOR
+  Name:         OS_InitFIRM
 
-  Description:  initialize sdk os for norfirm
+  Description:  initialize sdk os for firm
 
   Arguments:    None
 
   Returns:      None
  *---------------------------------------------------------------------------*/
-void OS_InitNOR(void);
+void OS_InitFIRM(void);
 
 
 #ifdef __cplusplus
diff --git a/include/firm/specfiles/ARM7-BB-NORFIRM.lcf.template b/include/firm/specfiles/ARM7-BB-FIRM.lcf.template
similarity index 96%
rename from include/firm/specfiles/ARM7-BB-NORFIRM.lcf.template
rename to include/firm/specfiles/ARM7-BB-FIRM.lcf.template
index 22925444..a0176d4e 100644
--- a/include/firm/specfiles/ARM7-BB-NORFIRM.lcf.template
+++ b/include/firm/specfiles/ARM7-BB-FIRM.lcf.template
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #  Project:  TwlFirm - tools - makelcf
-#  File:     ARM7-BB-NORFIRM.lcf.template
+#  File:     ARM7-BB-FIRM.lcf.template
 #
 #  Copyright 2007 Nintendo.  All rights reserved.
 #
diff --git a/include/firm/specfiles/ARM7-BB-NORFIRM.lsf b/include/firm/specfiles/ARM7-BB-FIRM.lsf
similarity index 100%
rename from include/firm/specfiles/ARM7-BB-NORFIRM.lsf
rename to include/firm/specfiles/ARM7-BB-FIRM.lsf
diff --git a/include/firm/specfiles/ARM7-TS-NORFIRM.lcf.template b/include/firm/specfiles/ARM7-TS-FIRM.lcf.template
similarity index 96%
rename from include/firm/specfiles/ARM7-TS-NORFIRM.lcf.template
rename to include/firm/specfiles/ARM7-TS-FIRM.lcf.template
index aa0b23e6..6194518c 100644
--- a/include/firm/specfiles/ARM7-TS-NORFIRM.lcf.template
+++ b/include/firm/specfiles/ARM7-TS-FIRM.lcf.template
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #  Project:  TwlFirm - tools - makelcf
-#  File:     ARM7-TS-NORFIRM.lcf.template
+#  File:     ARM7-TS-FIRM.lcf.template
 #
 #  Copyright 2007 Nintendo.  All rights reserved.
 #
diff --git a/include/firm/specfiles/ARM7-TS-NORFIRM.lsf b/include/firm/specfiles/ARM7-TS-FIRM.lsf
similarity index 100%
rename from include/firm/specfiles/ARM7-TS-NORFIRM.lsf
rename to include/firm/specfiles/ARM7-TS-FIRM.lsf
diff --git a/include/firm/specfiles/ARM9-BB-NORFIRM.lcf.template b/include/firm/specfiles/ARM9-BB-FIRM.lcf.template
similarity index 96%
rename from include/firm/specfiles/ARM9-BB-NORFIRM.lcf.template
rename to include/firm/specfiles/ARM9-BB-FIRM.lcf.template
index 01e36d01..da10b754 100644
--- a/include/firm/specfiles/ARM9-BB-NORFIRM.lcf.template
+++ b/include/firm/specfiles/ARM9-BB-FIRM.lcf.template
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #  Project:  TwlFirm - tools - makelcf
-#  File:     ARM9-BB-NORFIRM.lcf.template
+#  File:     ARM9-BB-FIRM.lcf.template
 #
 #  Copyright 2007 Nintendo.  All rights reserved.
 #
diff --git a/include/firm/specfiles/ARM9-BB-NORFIRM.lsf b/include/firm/specfiles/ARM9-BB-FIRM.lsf
similarity index 100%
rename from include/firm/specfiles/ARM9-BB-NORFIRM.lsf
rename to include/firm/specfiles/ARM9-BB-FIRM.lsf
diff --git a/include/firm/specfiles/ARM9-TS-NORFIRM.lcf.template b/include/firm/specfiles/ARM9-TS-FIRM.lcf.template
similarity index 96%
rename from include/firm/specfiles/ARM9-TS-NORFIRM.lcf.template
rename to include/firm/specfiles/ARM9-TS-FIRM.lcf.template
index b85af014..0558450b 100644
--- a/include/firm/specfiles/ARM9-TS-NORFIRM.lcf.template
+++ b/include/firm/specfiles/ARM9-TS-FIRM.lcf.template
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #  Project:  TwlFirm - tools - makelcf
-#  File:     ARM9-TS-NORFIRM.lcf.template
+#  File:     ARM9-TS-FIRM.lcf.template
 #
 #  Copyright 2007 Nintendo.  All rights reserved.
 #
diff --git a/include/firm/specfiles/ARM9-TS-NORFIRM.lsf b/include/firm/specfiles/ARM9-TS-FIRM.lsf
similarity index 100%
rename from include/firm/specfiles/ARM9-TS-NORFIRM.lsf
rename to include/firm/specfiles/ARM9-TS-FIRM.lsf