diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 83501acbc2..12401a4498 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -97,12 +97,12 @@ void up_initialize(void)
 
   /* Initialize the interrupt subsystem */
 
-  up_irqinitialize();
+  z80_irq_initialize();
 
 #ifdef CONFIG_RTC_ALARM
   /* Enable RTC alarm interrupts */
 
-  ez80_rtc_irqinitialize();
+  z80_rtc_irqinitialize();
 #endif
 
 #if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
diff --git a/arch/z80/src/common/up_internal.h b/arch/z80/src/common/up_internal.h
index 8c18f8e930..7fca935d6a 100644
--- a/arch/z80/src/common/up_internal.h
+++ b/arch/z80/src/common/up_internal.h
@@ -114,10 +114,10 @@ extern "C"
 
 /* Supplied by chip- or board-specific logic */
 
-void up_irqinitialize(void);
+void z80_irq_initialize(void);
 
 #ifdef CONFIG_RTC_ALARM
-void ez80_rtc_irqinitialize(void);
+void z80_rtc_irqinitialize(void);
 #endif
 
 #ifdef USE_LOWSERIALINIT
@@ -132,9 +132,9 @@ FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs);
 
 void up_sigdeliver(void);
 
+#ifdef CONFIG_ARCH_ADDRENV
 /* Defined in CPU-specific logic (only for Z180) */
 
-#ifdef CONFIG_ARCH_ADDRENV
 int up_mmuinit(void);
 #endif
 
diff --git a/arch/z80/src/ez80/ez80_irq.c b/arch/z80/src/ez80/ez80_irq.c
index 67b37c4eca..c099c68af1 100644
--- a/arch/z80/src/ez80/ez80_irq.c
+++ b/arch/z80/src/ez80/ez80_irq.c
@@ -60,10 +60,10 @@ volatile chipreg_t *g_current_regs;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_irqinitialize
+ * Name: z80_irq_initialize
  ****************************************************************************/
 
-void up_irqinitialize(void)
+void z80_irq_initialize(void)
 {
   g_current_regs = NULL;
 
diff --git a/arch/z80/src/ez80/ez80_rtc.c b/arch/z80/src/ez80/ez80_rtc.c
index 02508bfa46..e840fa331c 100644
--- a/arch/z80/src/ez80/ez80_rtc.c
+++ b/arch/z80/src/ez80/ez80_rtc.c
@@ -523,11 +523,11 @@ int up_rtc_initialize(void)
 }
 
 /************************************************************************************
- * Name: ez80_rtc_irqinitialize
+ * Name: z80_rtc_irqinitialize
  *
  * Description:
  *   Initialize IRQs for RTC, not possible during up_rtc_initialize because
- *   up_irqinitialize is called later.
+ *   z80_irq_initialize is called later.
  *
  * Input Parameters:
  *   None
@@ -538,7 +538,7 @@ int up_rtc_initialize(void)
  ************************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
-int ez80_rtc_irqinitialize(void)
+int z80_rtc_irqinitialize(void)
 {
   DEBUGVERIFY(irq_attach(EZ80_RTC_IRQ, ez80_alarm_interrupt, NULL));
 }
diff --git a/arch/z80/src/z180/z180_irq.c b/arch/z80/src/z180/z180_irq.c
index aeadf1dfd0..ecd2d60a54 100644
--- a/arch/z80/src/z180/z180_irq.c
+++ b/arch/z80/src/z180/z180_irq.c
@@ -160,14 +160,14 @@ irqstate_t up_irq_enable(void) __naked
 }
 
 /****************************************************************************
- * Name: up_irqinitialize
+ * Name: z80_irq_initialize
  *
  * Description:
  *   Initialize and enable interrupts
  *
  ****************************************************************************/
 
-void up_irqinitialize(void)
+void z80_irq_initialize(void)
 {
   uint16_t vectaddr = (uint16_t)up_vectors;
   uint8_t regval;
diff --git a/arch/z80/src/z8/z8_irq.c b/arch/z80/src/z8/z8_irq.c
index fdca20fa8d..2f3244b157 100644
--- a/arch/z80/src/z8/z8_irq.c
+++ b/arch/z80/src/z8/z8_irq.c
@@ -60,10 +60,10 @@ struct z8_irqstate_s g_z8irqstate;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_irqinitialize
+ * Name: z80_irq_initialize
  ****************************************************************************/
 
-void up_irqinitialize(void)
+void z80_irq_initialize(void)
 {
   /* Clear and disable all interrupts.  Set all to priority 0. */