diff --git a/arch/z16/src/common/up_initialstate.c b/arch/z16/src/common/up_initialstate.c
index b6b3ced50ae..c01c18e89c2 100644
--- a/arch/z16/src/common/up_initialstate.c
+++ b/arch/z16/src/common/up_initialstate.c
@@ -78,7 +78,7 @@
 
 void up_initial_state(_TCB *tcb)
 {
-  uint32 *reg32           = (uint32_t*)tcb->xcp.regs;
+  uint32_t *reg32          = (uint32_t*)tcb->xcp.regs;
 
   /* Initialize the initial exception register context structure */
 
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index 63a875c56bc..90c7d79c529 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -76,7 +76,7 @@
 #ifdef CONFIG_ARCH_STACKDUMP
 static void up_registerdump(void)
 {
-  FAR uint32 *regs32 = (FAR uint32_t*)current_regs;
+  FAR uint32_t *regs32 = (FAR uint32_t*)current_regs;
   lldbg("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
         "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
         regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
diff --git a/arch/z16/src/common/up_schedulesigaction.c b/arch/z16/src/common/up_schedulesigaction.c
index 9ed9c4fb598..e76a8c4ffd4 100644
--- a/arch/z16/src/common/up_schedulesigaction.c
+++ b/arch/z16/src/common/up_schedulesigaction.c
@@ -141,7 +141,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver)
 
           else
             {
-              FAR uint32 *current_pc  = (FAR uint32_t*)&current_regs[REG_PC];
+              FAR uint32_t *current_pc  = (FAR uint32_t*)&current_regs[REG_PC];
 
               /* Save the return address and interrupt state. These will be
                * restored by the signal trampoline after the signals have
@@ -174,7 +174,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver)
 
       else
         {
-          FAR uint32 *saved_pc     = (FAR uint32_t*)&tcb->xcp.regs[REG_PC];
+          FAR uint32_t *saved_pc     = (FAR uint32_t*)&tcb->xcp.regs[REG_PC];
 
           /* Save the return lr and cpsr and one scratch register
            * These will be restored by the signal trampoline after
diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c
index ae04fa54df8..85f3e972d94 100644
--- a/arch/z16/src/common/up_sigdeliver.c
+++ b/arch/z16/src/common/up_sigdeliver.c
@@ -83,7 +83,7 @@ void up_sigdeliver(void)
 #ifndef CONFIG_DISABLE_SIGNALS
   FAR _TCB  *rtcb = (_TCB*)g_readytorun.head;
   chipreg_t regs[XCPTCONTEXT_REGS];
-  FAR uint32 *regs32 = (FAR uint32_t*)regs;
+  FAR uint32_t *regs32 = (FAR uint32_t*)regs;
   sig_deliver_t sigdeliver;
 
   /* Save the errno.  This must be preserved throughout the signal handling