diff --git a/ChangeLog b/ChangeLog
index 7888f86..1662416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-11-18  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* chopstx-gnu-linux.c (chx_systick_init_arch): Rename.
+	(chx_interrupt_controller_init): Rename.
+	* chopstx-cortex-m.c (chx_systick_init_arch): Rename.
+	(chx_interrupt_controller_init): Rename.
+	* chopstx.c (chx_systick_init): Use chx_systick_init_arch.
+	(chx_init): Use chx_interrupt_controller_init.
+
 2019-11-18  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* chopstx.c (chx_ready_pop): Check flag_sched_rr here.
diff --git a/chopstx-cortex-m.c b/chopstx-cortex-m.c
index e970076..929356f 100644
--- a/chopstx-cortex-m.c
+++ b/chopstx-cortex-m.c
@@ -115,7 +115,7 @@ struct SYST {
 static struct SYST *const SYST = (struct SYST *)0xE000E010;
 
 static void
-chx_systick_reset (void)
+chx_systick_init_arch (void)
 {
   SYST->RVR = 0;
   SYST->CVR = 0;
@@ -211,7 +211,7 @@ static uint32_t *const SHPR2 = (uint32_t *)0xE000ED1C;
 static uint32_t *const SHPR3 = (uint32_t *)0xE000ED20;
 
 static void
-chx_prio_init (void)
+chx_interrupt_controller_init (void)
 {
   *AIRCR = 0x05FA0000 | ( 5 << 8); /* PRIGROUP = 5, 2-bit:2-bit. */
   *SHPR2 = (CPU_EXCEPTION_PRIORITY_SVC << 24);
diff --git a/chopstx-gnu-linux.c b/chopstx-gnu-linux.c
index c22810a..14aca65 100644
--- a/chopstx-gnu-linux.c
+++ b/chopstx-gnu-linux.c
@@ -42,7 +42,7 @@ chx_dmb (void)
 static sigset_t ss_cur;
 
 static void
-chx_systick_reset (void)
+chx_systick_init_arch (void)
 {
   const struct itimerval it = { {0, 0}, {0, 0} };
 
@@ -110,7 +110,7 @@ chx_set_intr_prio (uint8_t n)
 }
 
 static void
-chx_prio_init (void)
+chx_interrupt_controller_init (void)
 {
 }
 
diff --git a/chopstx.c b/chopstx.c
index 2c3667c..e6ede3f 100644
--- a/chopstx.c
+++ b/chopstx.c
@@ -439,7 +439,7 @@ chx_timer_expired (void)
 void
 chx_systick_init (void)
 {
-  chx_systick_reset ();
+  chx_systick_init_arch ();
 
   if ((CHX_FLAGS_MAIN & CHOPSTX_SCHED_RR))
     {
@@ -456,7 +456,7 @@ chopstx_t chopstx_main;
 void
 chx_init (struct chx_thread *tp)
 {
-  chx_prio_init ();
+  chx_interrupt_controller_init ();
   chx_init_arch (tp);
   chx_spin_init (&chx_enable_sleep_lock);