diff --git a/arch/z80/src/common/up_allocateheap.c b/arch/z80/src/common/up_allocateheap.c
index 818739cedab..d949f7ffe90 100644
--- a/arch/z80/src/common/up_allocateheap.c
+++ b/arch/z80/src/common/up_allocateheap.c
@@ -45,6 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/mm/mm.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
diff --git a/arch/z80/src/common/up_doirq.c b/arch/z80/src/common/up_doirq.c
index 5bfb42131d1..4d12c2b7809 100644
--- a/arch/z80/src/common/up_doirq.c
+++ b/arch/z80/src/common/up_doirq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/z80/src/common/up_doirq.c
+ * arch/z80/src/common/z80_doirq.c
  *
  *   Copyright (C) 2007-2009, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -58,7 +58,7 @@
  * Public Functions
  ****************************************************************************/
 
-FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs)
+FAR chipreg_t *z80_doirq(uint8_t irq, FAR chipreg_t *regs)
 {
   board_autoled_on(LED_INIRQ);
 
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 12401a44985..e61dcc489c3 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/sched_note.h>
+#include <nuttx/mm/mm.h>
 #include <nuttx/mm/iob.h>
 #include <nuttx/drivers/drivers.h>
 #include <nuttx/fs/loop.h>
@@ -126,7 +127,7 @@ void up_initialize(void)
    */
 
 #ifdef CONFIG_ARCH_ADDRENV
-  (void)up_mmuinit();
+  (void)z80_mmu_initialize();
 #endif
 
 #ifdef CONFIG_MM_IOB
@@ -165,7 +166,7 @@ void up_initialize(void)
   /* Initialize the serial device driver */
 
 #ifdef USE_SERIALDRIVER
-  up_serialinit();
+  z80_serial_initialize();
 #endif
 
   /* Initialize the console device driver (if it is other than the standard
diff --git a/arch/z80/src/common/up_internal.h b/arch/z80/src/common/up_internal.h
index 7fca935d6a9..d225e633ef8 100644
--- a/arch/z80/src/common/up_internal.h
+++ b/arch/z80/src/common/up_internal.h
@@ -95,15 +95,7 @@
 #endif
 
 /****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
@@ -121,35 +113,29 @@ void z80_rtc_irqinitialize(void);
 #endif
 
 #ifdef USE_LOWSERIALINIT
-void up_lowserialinit(void);
+void z80_lowserial_initialize(void);
 #endif
 
-/* Defined in up_doirq.c */
+/* Defined in xyz_doirq.c */
 
-FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs);
+FAR chipreg_t *z80_doirq(uint8_t irq, FAR chipreg_t *regs);
 
 /* Define in zyz_sigdeliver */
 
-void up_sigdeliver(void);
+void z80_sigdeliver(void);
 
 #ifdef CONFIG_ARCH_ADDRENV
 /* Defined in CPU-specific logic (only for Z180) */
 
-int up_mmuinit(void);
-#endif
-
-/* Defined in xyz_allocateheap.c */
-
-#if CONFIG_MM_REGIONS > 1
-void up_addregion(void);
+int z80_mmu_initialize(void);
 #endif
 
 /* Defined in xyz_serial.c */
 
 #ifdef USE_SERIALDRIVER
-void up_serialinit(void);
+void z80_serial_initialize(void);
 #else
-# define up_serialinit()
+# define z80_serial_initialize()
 #endif
 
 /* Defined in drivers/lowconsole.c */
diff --git a/arch/z80/src/ez80/ez80_lowuart.c b/arch/z80/src/ez80/ez80_lowuart.c
index 6b38e03fac7..dc69ecca8e5 100644
--- a/arch/z80/src/ez80/ez80_lowuart.c
+++ b/arch/z80/src/ez80/ez80_lowuart.c
@@ -176,10 +176,10 @@ static void ez80_setbaud(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_lowserialinit
+ * Name: z80_lowserial_initialize
  ****************************************************************************/
 
-void up_lowserialinit(void)
+void z80_lowserial_initialize(void)
 {
 #ifdef HAVE_SERIAL
   uint8_t regval;
diff --git a/arch/z80/src/ez80/ez80_rtc.c b/arch/z80/src/ez80/ez80_rtc.c
index e840fa331ca..5671a86ee6c 100644
--- a/arch/z80/src/ez80/ez80_rtc.c
+++ b/arch/z80/src/ez80/ez80_rtc.c
@@ -69,42 +69,6 @@
 #  error "CONFIG_RTC_DATETIME must be set to use this driver"
 #endif
 
-#ifdef CONFIG_RTC_HIRES
-#  error "CONFIG_RTC_HIRES must NOT be set with this driver"
-#endif
-
-/* Constants ****************************************************************/
-
-#define SYNCHRO_TIMEOUT      (0x00020000)
-#define INITMODE_TIMEOUT     (0x00010000)
-
-/* Proxy definitions to make the same code work for all the EZ80 series ****/
-
-# define EZ80_RCC_XXX       EZ80_RCC_BDCR
-# define RCC_XXX_YYYRST      RCC_BDCR_BDRST
-# define RCC_XXX_RTCEN       RCC_BDCR_RTCEN
-# define RCC_XXX_RTCSEL_MASK RCC_BDCR_RTCSEL_MASK
-# define RCC_XXX_RTCSEL_LSE  RCC_BDCR_RTCSEL_LSE
-# define RCC_XXX_RTCSEL_LSI  RCC_BDCR_RTCSEL_LSI
-# define RCC_XXX_RTCSEL_HSE  RCC_BDCR_RTCSEL_HSE
-
-/* Time conversions */
-
-#define MINUTES_IN_HOUR 60
-#define HOURS_IN_DAY 24
-
-#define hours_add(parm_hrs) \
-  time->tm_hour += parm_hrs;\
-  if ((HOURS_IN_DAY-1) < (time->tm_hour))\
-    {\
-      time->tm_hour = (parm_hrs - HOURS_IN_DAY);\
-    }
-
-#define RTC_ALRMR_DIS_MASK            (RTC_ALRMR_MSK4 | RTC_ALRMR_MSK3 | \
-                                       RTC_ALRMR_MSK2 | RTC_ALRMR_MSK1)
-#define RTC_ALRMR_DIS_DATE_MASK       (RTC_ALRMR_MSK4)
-#define RTC_ALRMR_ENABLE              (0)
-
 /****************************************************************************
  * Private Types
  *****************************************************************************/
@@ -783,6 +747,7 @@ int ez80_rtc_cancelalarm(void)
 
 #ifdef CONFIG_RTC_ALARM
 int ez80_rtc_rdalarm(FAR struct rtc_time *almtime)
+{
   struct rtc_almregs_s almregs;
   int ret = -EINVAL;
 
diff --git a/arch/z80/src/ez80/ez80_rtc.h b/arch/z80/src/ez80/ez80_rtc.h
index d286359f18d..57b2f775202 100644
--- a/arch/z80/src/ez80/ez80_rtc.h
+++ b/arch/z80/src/ez80/ez80_rtc.h
@@ -97,11 +97,11 @@ struct alm_setalarm_s
 
 #undef EXTERN
 #if defined(__cplusplus)
-#define EXTERN extern "C"
+#  define EXTERN extern "C"
 extern "C"
 {
 #else
-#define EXTERN extern
+#  define EXTERN extern
 #endif
 
 /****************************************************************************
@@ -205,4 +205,5 @@ int ez80_rtc_rdalarm(FAR struct rtc_time *almtime);
 int ez80_rtc_cancelalarm(void);
 
 #endif /* CONFIG_RTC_ALARM */
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_EZ80_SRC_EZ80_RTC_H */
diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c
index 5a862cd9881..bd08d3da8cd 100644
--- a/arch/z80/src/ez80/ez80_schedulesigaction.c
+++ b/arch/z80/src/ez80/ez80_schedulesigaction.c
@@ -70,7 +70,7 @@ static void ez80_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver, FAR c
 
   /* Then set up to vector to the trampoline with interrupts disabled */
 
-  regs[XCPT_PC]  = (chipreg_t)up_sigdeliver;
+  regs[XCPT_PC]  = (chipreg_t)z80_sigdeliver;
   regs[XCPT_I]   = 0;
 }
 
diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c
index 8b43caaf5c5..17c615868e9 100644
--- a/arch/z80/src/ez80/ez80_serial.c
+++ b/arch/z80/src/ez80/ez80_serial.c
@@ -652,14 +652,14 @@ static bool ez80_txempty(struct uart_dev_s *dev)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_serialinit
+ * Name: z80_serial_initialize
  *
  * Description:
  *   Register serial console and serial ports.
  *
  ****************************************************************************/
 
-void up_serialinit(void)
+void z80_serial_initialize(void)
 {
   uint8_t regval;
 
diff --git a/arch/z80/src/ez80/ez80_sigdeliver.c b/arch/z80/src/ez80/ez80_sigdeliver.c
index 6d7f50d5ac7..6e32d977be7 100644
--- a/arch/z80/src/ez80/ez80_sigdeliver.c
+++ b/arch/z80/src/ez80/ez80_sigdeliver.c
@@ -59,7 +59,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_sigdeliver
+ * Name: z80_sigdeliver
  *
  * Description:
  *   This is the a signal handling trampoline.  When a signal action was
@@ -68,7 +68,7 @@
  *
  ****************************************************************************/
 
-void up_sigdeliver(void)
+void z80_sigdeliver(void)
 {
   FAR struct tcb_s *rtcb = this_task();
   chipreg_t regs[XCPTCONTEXT_REGS];
diff --git a/arch/z80/src/ez80/ez80_vectors.asm b/arch/z80/src/ez80/ez80_vectors.asm
index e26bddf32cf..b876f11272c 100644
--- a/arch/z80/src/ez80/ez80_vectors.asm
+++ b/arch/z80/src/ez80/ez80_vectors.asm
@@ -57,7 +57,7 @@ EZ80_UNUSED	EQU	40h
 ;**************************************************************************
 
 	xref	_ez80_startup
-	xref	_up_doirq
+	xref	_z80_doirq
 
 ;**************************************************************************
 ; Global Symbols Exported
@@ -241,7 +241,7 @@ _ez80_rstcommon:
         ld      bc, #0			; BC = reset number
 	ld	c, a			;   Save the reset number in C
 	push	bc			; Argument #1 is the Reset number
-	call	_up_doirq		; Decode the IRQ
+	call	_z80_doirq		; Decode the IRQ
 
 	; On return, HL points to the beginning of the reg structure to restore
 	; Note that (1) the arguments pushed on the stack are not popped, and (2) the
diff --git a/arch/z80/src/z180/z180_lowserial.c b/arch/z80/src/z180/z180_lowserial.c
index 6464d8e74a2..78fdb264278 100644
--- a/arch/z80/src/z180/z180_lowserial.c
+++ b/arch/z80/src/z180/z180_lowserial.c
@@ -63,7 +63,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_lowserialinit
+ * Name: z80_lowserial_initialize
  *
  * Description:
  *   Called early in the boot sequence to initialize the serial ports
@@ -71,7 +71,7 @@
  ****************************************************************************/
 
 #ifdef USE_LOWSERIALINIT
-void up_lowserialinit(void)
+void z80_lowserial_initialize(void)
 {
   /* Initialize UART and [E]SCC serial devices */
 
diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c
index fa435c7c089..631e087b438 100644
--- a/arch/z80/src/z180/z180_mmu.c
+++ b/arch/z80/src/z180/z180_mmu.c
@@ -126,7 +126,7 @@ static inline FAR struct z180_cbr_s *z180_mmu_alloccbr(void)
  *   called very early in the boot process to get the basic operating
  *   memory configuration correct.  This function does *not* perform all
  *   necessray MMU initialization... only the basics needed at power-up.
- *   up_mmuinit() must be called later to complete the entire MMU
+ *   z80_mmu_initialize() must be called later to complete the entire MMU
  *   initialization.
  *
  ****************************************************************************/
@@ -151,7 +151,7 @@ void z180_mmu_lowinit(void) __naked
 }
 
 /****************************************************************************
- * Name: up_mmuinit
+ * Name: z80_mmu_initialize
  *
  * Description:
  *   Perform higher level initialization of the MMU and physical memory
@@ -159,7 +159,7 @@ void z180_mmu_lowinit(void) __naked
  *
  ****************************************************************************/
 
-int up_mmuinit(void)
+int z80_mmu_initialize(void)
 {
   /* Here we use the granule allocator as a page allocator.  We lie and
    * say that 1 page is 1 byte.
diff --git a/arch/z80/src/z180/z180_mmu.h b/arch/z80/src/z180/z180_mmu.h
index 69ee13cc52c..e6bb27b481d 100644
--- a/arch/z80/src/z180/z180_mmu.h
+++ b/arch/z80/src/z180/z180_mmu.h
@@ -126,7 +126,7 @@
  *   called very early in the boot process to get the basic operating
  *   memory configuration correct.  This function does *not* perform all
  *   necessray MMU initialization... only the basics needed at power-up.
- *   up_mmuinit() must be called later to complete the entire MMU
+ *   z80_mmu_initialize() must be called later to complete the entire MMU
  *   initialization.
  *
  ****************************************************************************/
@@ -134,7 +134,7 @@
 void z180_mmu_lowinit(void) __naked;
 
 /****************************************************************************
- * Name: up_mmuinit
+ * Name: z80_mmu_initialize
  *
  * Description:
  *   Perform higher level initialization of the MMU and physical memory
@@ -142,6 +142,6 @@ void z180_mmu_lowinit(void) __naked;
  *
  ****************************************************************************/
 
-int up_mmuinit(void);
+int z80_mmu_initialize(void);
 
 #endif /* __ARCH_Z80_SRC_Z180_Z180_MMU_H */
diff --git a/arch/z80/src/z180/z180_scc.c b/arch/z80/src/z180/z180_scc.c
index 78c244043e2..19eff690599 100644
--- a/arch/z80/src/z180/z180_scc.c
+++ b/arch/z80/src/z180/z180_scc.c
@@ -565,14 +565,14 @@ static bool z180_txempty(struct uart_dev_s *dev)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_serialinit
+ * Name: z80_serial_initialize
  *
  * Description:
  *   Register serial console and serial ports.
  *
  ****************************************************************************/
 
-void up_serialinit(void)
+void z80_serial_initialize(void)
 {
   /* Make sure that all UART interrupts are disabled */
 #warning "Missing logic"
diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c
index 9c8e21a8c85..470b6ab194a 100644
--- a/arch/z80/src/z180/z180_schedulesigaction.c
+++ b/arch/z80/src/z180/z180_schedulesigaction.c
@@ -74,7 +74,7 @@ static void z180_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
 
   /* Then set up to vector to the trampoline with interrupts disabled */
 
-  regs[XCPT_PC]  = (chipreg_t)up_sigdeliver;
+  regs[XCPT_PC]  = (chipreg_t)z80_sigdeliver;
   regs[XCPT_I]   = 0;
 }
 
diff --git a/arch/z80/src/z180/z180_sigdeliver.c b/arch/z80/src/z180/z180_sigdeliver.c
index 845c39aae8a..b6b90038fbe 100644
--- a/arch/z80/src/z180/z180_sigdeliver.c
+++ b/arch/z80/src/z180/z180_sigdeliver.c
@@ -55,7 +55,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_sigdeliver
+ * Name: z80_sigdeliver
  *
  * Description:
  *   This is the a signal handling trampoline.  When a signal action was
@@ -64,7 +64,7 @@
  *
  ****************************************************************************/
 
-void up_sigdeliver(void)
+void z80_sigdeliver(void)
 {
   FAR struct tcb_s  *rtcb = this_task();
   chipreg_t regs[XCPTCONTEXT_REGS];
diff --git a/arch/z80/src/z180/z180_vectcommon.asm b/arch/z80/src/z180/z180_vectcommon.asm
index c7d9a608a11..f95ae5d2516 100644
--- a/arch/z80/src/z180/z180_vectcommon.asm
+++ b/arch/z80/src/z180/z180_vectcommon.asm
@@ -56,7 +56,7 @@
 ; Global symbols used
 ;**************************************************************************
 
-	.globl	_up_doirq			; Interrupt decoding logic
+	.globl	_z80_doirq			; Interrupt decoding logic
 
 ;**************************************************************************
 ; Vector Handlers
@@ -178,7 +178,7 @@ _up_vectcommon::
 	push	hl				; Place argument #2 at the top of stack
 	push	bc				; Argument #1 is the Reset number
 	inc		sp				; (make byte sized)
-	call	_up_doirq		; Decode the IRQ
+	call	_z80_doirq		; Decode the IRQ
 
 	; On return, HL points to the beginning of the reg structure to restore
 	; Note that (1) the arguments pushed on the stack are not popped, and (2) the
diff --git a/arch/z80/src/z8/switch.h b/arch/z80/src/z8/switch.h
index a32308ada0c..e2c8111cff2 100644
--- a/arch/z80/src/z8/switch.h
+++ b/arch/z80/src/z8/switch.h
@@ -68,7 +68,7 @@
  *   value[0] = RP (MS byte) and Flags (LS) byte
  *   value[1] = PC
  *
- * The pointer to the save structure is a stack pointer at the time that up_doirq()
+ * The pointer to the save structure is a stack pointer at the time that z80_doirq()
  * was called:
  *
  *         PC[7:0]
diff --git a/arch/z80/src/z8/z8_head.S b/arch/z80/src/z8/z8_head.S
index d629cac1669..0d197d3dd54 100644
--- a/arch/z80/src/z8/z8_head.S
+++ b/arch/z80/src/z8/z8_head.S
@@ -71,7 +71,7 @@
 	xref	_board_autoled_initialize:ROM
 #endif
 	xref	_nx_start:ROM
-	xref	_up_doirq:ROM
+	xref	_z80_doirq:ROM
 	xref	_low_nearbss
 	xref	_len_nearbss
 	xref	_low_farbss
diff --git a/arch/z80/src/z8/z8_lowuart.c b/arch/z80/src/z8/z8_lowuart.c
index 4d16dd296e6..0e89dbe2cd1 100644
--- a/arch/z80/src/z8/z8_lowuart.c
+++ b/arch/z80/src/z8/z8_lowuart.c
@@ -70,10 +70,10 @@ extern uint32_t get_freq(void);
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_lowserialinit
+ * Name: z80_lowserial_initialize
  ****************************************************************************/
 
-void up_lowserialinit(void)
+void z80_lowserial_initialize(void)
 {
 #if defined(CONFIG_UART0_SERIAL_CONSOLE) || \
    (defined(EZ8_UART1) && defined(CONFIG_UART1_SERIAL_CONSOLE))
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index 11470b56d57..64572043860 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -102,7 +102,7 @@ void z8_registerdump(void)
 
         /* Dump the saved machine state:
          * The g_z8irqstate.regs pointer is the value of the stack pointer at
-         * the time that up_doirq() was called.  Therefore, we can calculate
+         * the time that z80_doirq() was called.  Therefore, we can calculate
          * the correct value for the stack pointer on return from interrupt:
          */
 
diff --git a/arch/z80/src/z8/z8_saveirqcontext.c b/arch/z80/src/z8/z8_saveirqcontext.c
index 4c0ea8f4d54..9a85955533e 100644
--- a/arch/z80/src/z8/z8_saveirqcontext.c
+++ b/arch/z80/src/z8/z8_saveirqcontext.c
@@ -109,7 +109,7 @@ void z8_saveirqcontext(FAR chipreg_t *regs)
       regs[XCPT_IRQCTL] = 0x0080; /* IRQE bit will enable interrupts */
 
       /* The g_z8irqstate.regs pointer is the value of the stack pointer at
-       * the time that up_doirq() was called.  Therefore, we can calculate
+       * the time that z80_doirq() was called.  Therefore, we can calculate
        * the correct value for the stack pointer on return from interrupt:
        */
 
diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c
index 3c73c516447..d29b0dfe67c 100644
--- a/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/arch/z80/src/z8/z8_schedulesigaction.c
@@ -71,7 +71,7 @@ static void z8_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
 
   /* Then set up to vector to the trampoline with interrupts disabled */
 
-  regs[XCPT_PC]          = (chipreg_t)up_sigdeliver;
+  regs[XCPT_PC]          = (chipreg_t)z80_sigdeliver;
   regs[XCPT_IRQCTL]      = 0;
 }
 
diff --git a/arch/z80/src/z8/z8_serial.c b/arch/z80/src/z8/z8_serial.c
index cef30e31d5b..e0f874c254c 100644
--- a/arch/z80/src/z8/z8_serial.c
+++ b/arch/z80/src/z8/z8_serial.c
@@ -701,14 +701,14 @@ static bool z8_txempty(FAR struct uart_dev_s *dev)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_serialinit
+ * Name: z80_serial_initialize
  *
  * Description:
  *   Register serial console and serial ports.
  *
  ****************************************************************************/
 
-void up_serialinit(void)
+void z80_serial_initialize(void)
 {
    /* Disable all UART interrupts */
 
diff --git a/arch/z80/src/z8/z8_sigdeliver.c b/arch/z80/src/z8/z8_sigdeliver.c
index 63cc25d2078..96bc5cb9af3 100644
--- a/arch/z80/src/z8/z8_sigdeliver.c
+++ b/arch/z80/src/z8/z8_sigdeliver.c
@@ -75,7 +75,7 @@ static void z8_copystate(FAR chipreg_t *dest, FAR const chipreg_t *src)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_sigdeliver
+ * Name: z80_sigdeliver
  *
  * Description:
  *   This is the a signal handling trampoline.  When a signal action was
@@ -84,7 +84,7 @@ static void z8_copystate(FAR chipreg_t *dest, FAR const chipreg_t *src)
  *
  ****************************************************************************/
 
-void up_sigdeliver(void)
+void z80_sigdeliver(void)
 {
   FAR struct tcb_s *rtcb = this_task();
   chipreg_t regs[XCPTCONTEXT_REGS];
diff --git a/arch/z80/src/z8/z8_vector.S b/arch/z80/src/z8/z8_vector.S
index bb219d78c4d..5ece90abc3c 100644
--- a/arch/z80/src/z8/z8_vector.S
+++ b/arch/z80/src/z8/z8_vector.S
@@ -52,7 +52,7 @@
  * External References / External Definitions
  **************************************************************************/
 
-	xref	_up_doirq:ROM
+	xref	_z80_doirq:ROM
 
 #if defined(ENCORE_VECTORS)
 	xdef	_z8_wdt_handler
@@ -758,7 +758,7 @@ _z8_common_handler:
 	
 	/* Process the interrupt */
 
-	call	_up_doirq		/* Call the IRQ handler */
+	call	_z80_doirq		/* Call the IRQ handler */
 
 	/* Release arguments from the stack */
 
diff --git a/arch/z80/src/z80/z80_head.asm b/arch/z80/src/z80/z80_head.asm
index 0febd3df2b6..511beee210e 100644
--- a/arch/z80/src/z80/z80_head.asm
+++ b/arch/z80/src/z80/z80_head.asm
@@ -61,7 +61,7 @@
 ;**************************************************************************
 
 	.globl	_nx_start		; OS entry point
-	.globl	_up_doirq		; Interrupt decoding logic
+	.globl	_z80_doirq		; Interrupt decoding logic
 
 ;**************************************************************************
 ; Reset entry point
@@ -216,7 +216,7 @@ _up_rstcommon::
 	push	hl				; Place argument #2 at the top of stack
 	push	bc				; Argument #1 is the Reset number
 	inc		sp				; (make byte sized)
-	call	_up_doirq		; Decode the IRQ
+	call	_z80_doirq		; Decode the IRQ
 
 	; On return, HL points to the beginning of the reg structure to restore
 	; Note that (1) the arguments pushed on the stack are not popped, and (2) the
diff --git a/arch/z80/src/z80/z80_rom.asm b/arch/z80/src/z80/z80_rom.asm
index 16ef4111ab2..60a89cca988 100644
--- a/arch/z80/src/z80/z80_rom.asm
+++ b/arch/z80/src/z80/z80_rom.asm
@@ -61,7 +61,7 @@
 ;**************************************************************************
 
 	.globl	_nx_start		; OS entry point
-	.globl	_up_doirq		; Interrupt decoding logic
+	.globl	_z80_doirq		; Interrupt decoding logic
 
 ;**************************************************************************
 ; System start logic
@@ -209,7 +209,7 @@ _up_rstcommon:
 	push	hl				; Place argument #2 at the top of stack
 	push	bc				; Argument #1 is the Reset number
 	inc		sp				; (make byte sized)
-	call	_up_doirq		; Decode the IRQ
+	call	_z80_doirq		; Decode the IRQ
 
 	; On return, HL points to the beginning of the reg structure to restore
 	; Note that (1) the arguments pushed on the stack are not popped, and (2) the
diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c
index 9caaac0c44a..028c78afc19 100644
--- a/arch/z80/src/z80/z80_schedulesigaction.c
+++ b/arch/z80/src/z80/z80_schedulesigaction.c
@@ -72,7 +72,7 @@ static void z80_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
 
   /* Then set up to vector to the trampoline with interrupts disabled */
 
-  regs[XCPT_PC]          = (chipreg_t)up_sigdeliver;
+  regs[XCPT_PC]          = (chipreg_t)z80_sigdeliver;
   regs[XCPT_I]           = 0;
 }
 
diff --git a/arch/z80/src/z80/z80_sigdeliver.c b/arch/z80/src/z80/z80_sigdeliver.c
index 0689a9ba621..ad33e7e122c 100644
--- a/arch/z80/src/z80/z80_sigdeliver.c
+++ b/arch/z80/src/z80/z80_sigdeliver.c
@@ -56,7 +56,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_sigdeliver
+ * Name: z80_sigdeliver
  *
  * Description:
  *   This is the a signal handling trampoline.  When a signal action was
@@ -65,7 +65,7 @@
  *
  ****************************************************************************/
 
-void up_sigdeliver(void)
+void z80_sigdeliver(void)
 {
   FAR struct tcb_s *rtcb = this_task();
   chipreg_t regs[XCPTCONTEXT_REGS];
diff --git a/configs/z80sim/src/z80_serial.c b/configs/z80sim/src/z80_serial.c
index abe80c38ec2..a2e8788a1f7 100644
--- a/configs/z80sim/src/z80_serial.c
+++ b/configs/z80sim/src/z80_serial.c
@@ -309,29 +309,14 @@ static bool up_txempty(FAR struct uart_dev_s *dev)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_serialinit
+ * Name: z80_serial_initialize
  *
  * Description:
- *   Performs the low level UART initialization early in
- *   debug so that the serial console will be available
- *   during bootup.  This must be called before up_serialinit.
+ *   Register serial console and serial ports.
  *
  ****************************************************************************/
 
-void up_earlyserialinit(void)
-{
-}
-
-/****************************************************************************
- * Name: up_serialinit
- *
- * Description:
- *   Register serial console and serial ports.  This assumes
- *   that up_earlyserialinit was called previously.
- *
- ****************************************************************************/
-
-void up_serialinit(void)
+void z80_serial_initialize(void)
 {
   (void)uart_register("/dev/console", &g_uartport);
   (void)uart_register("/dev/ttyS0", &g_uartport);