diff --git a/trunk/bootrom/build/libraries/os/ARM9/os_timer.c b/trunk/bootrom/build/libraries/os/ARM9/os_timer.c
index 564dd57..afe445f 100644
--- a/trunk/bootrom/build/libraries/os/ARM9/os_timer.c
+++ b/trunk/bootrom/build/libraries/os/ARM9/os_timer.c
@@ -16,7 +16,6 @@
  *---------------------------------------------------------------------------*/
 #include <brom/os.h>
 
-void timer_handler(void);
 
 //----------------------------------------------------------------------
 #define REG_OS_TMCNT_H_E_MASK      REG_OS_TM0CNT_H_E_MASK
@@ -49,7 +48,7 @@ void osInitTimer( void )
     {
         isInit = TRUE;
 
-        i_osStopTimer64();
+        osStopTimer64();
     }
 }
 
@@ -201,7 +200,7 @@ void osStartTimer64( u64 count, OSTimerPrescaler preScale )
 //
 //  stop a timer
 //
-void i_osStopTimer( OSTimer id )
+void osStopTimer( OSTimer id )
 {
     SDK_ASSERT(OS_TIMER_0 <= id && id <= OS_TIMER_3);
     //---- check if system reserved
@@ -213,15 +212,15 @@ void i_osStopTimer( OSTimer id )
 //
 //  stop 2 timers
 //
-void i_osStopTimer32( OSTimer32 id )
+void osStopTimer32( OSTimer32 id )
 {
     SDK_ASSERT(OS_TIMER32_01 <= id && id <= OS_TIMER32_23);
     //---- check if system reserved
     SDK_ASSERT(!i_osIsTimerReserved(id));
     SDK_ASSERT(!i_osIsTimerReserved(id + 1));
 
-    i_osStopTimer((OSTimer)((int)id + 1));
-    i_osStopTimer((OSTimer)id);
+    osStopTimer((OSTimer)((int)id + 1));
+    osStopTimer((OSTimer)id);
 }
 
 //
@@ -235,15 +234,15 @@ void i_osStopTimer48( OSTimer48 id )
     SDK_ASSERT(!i_osIsTimerReserved(id + 1));
     SDK_ASSERT(!i_osIsTimerReserved(id + 2));
 
-    i_osStopTimer((OSTimer)((int)id + 2));
-    i_osStopTimer((OSTimer)((int)id + 1));
-    i_osStopTimer((OSTimer)id);
+    osStopTimer((OSTimer)((int)id + 2));
+    osStopTimer((OSTimer)((int)id + 1));
+    osStopTimer((OSTimer)id);
 }
 
 //
 //  stop all 4 timers
 //
-void i_osStopTimer64( void )
+void osStopTimer64( void )
 {
     //---- check if system reserved
     SDK_ASSERT(!i_osIsTimerReserved(OS_TIMER_0));
@@ -251,10 +250,10 @@ void i_osStopTimer64( void )
     SDK_ASSERT(!i_osIsTimerReserved(OS_TIMER_2));
     SDK_ASSERT(!i_osIsTimerReserved(OS_TIMER_3));
 
-    i_osStopTimer(OS_TIMER_3);
-    i_osStopTimer(OS_TIMER_2);
-    i_osStopTimer(OS_TIMER_1);
-    i_osStopTimer(OS_TIMER_0);
+    osStopTimer(OS_TIMER_3);
+    osStopTimer(OS_TIMER_2);
+    osStopTimer(OS_TIMER_1);
+    osStopTimer(OS_TIMER_0);
 }
 
 
diff --git a/trunk/bootrom/include/brom/os/ARM9/timer.h b/trunk/bootrom/include/brom/os/ARM9/timer.h
index 4f30eb1..31aee6f 100644
--- a/trunk/bootrom/include/brom/os/ARM9/timer.h
+++ b/trunk/bootrom/include/brom/os/ARM9/timer.h
@@ -145,7 +145,7 @@ void    osStartTimer64( u64 count, OSTimerPrescaler preScale );
 
 
 /*---------------------------------------------------------------------------*
-  Name:         i_osStopTimer
+  Name:         osStopTimer
 
   Description:  stop timer(s)
 
@@ -156,19 +156,19 @@ void    osStartTimer64( u64 count, OSTimerPrescaler preScale );
 //
 //  stop a timer
 //
-void    i_osStopTimer( OSTimer id );
+void    osStopTimer( OSTimer id );
 //
 //  stop 2 timers
 //
-void    i_osStopTimer32( OSTimer32 id );
+void    osStopTimer32( OSTimer32 id );
 //
 //  stop 3 timers
 //
-void    i_osStopTimer48( OSTimer48 id );
+void    osStopTimer48( OSTimer48 id );
 //
 //  stop all 4 timers
 //
-void    i_osStopTimer64( void );
+void    osStopTimer64( void );
 
 
 #endif // SDK_ARM11
diff --git a/trunk/bootrom/include/brom/os/common/tick.h b/trunk/bootrom/include/brom/os/common/tick.h
index 832f429..c47eae1 100644
--- a/trunk/bootrom/include/brom/os/common/tick.h
+++ b/trunk/bootrom/include/brom/os/common/tick.h
@@ -39,7 +39,7 @@ typedef u32 OSTick32;
 //---- tick APIs
 extern  void osInitTick( void );
 extern  u64  osGetTick( void );
-extern  void osSetTick( u64 );
+extern  void i_osSetTick( u64 );
 
 
 //---- conversion tick count <-> real time count