diff --git a/arch/arm/src/arm/up_cache.S b/arch/arm/src/arm/arm_cache.S
similarity index 99%
rename from arch/arm/src/arm/up_cache.S
rename to arch/arm/src/arm/arm_cache.S
index 7fd79572d5..33804d83a9 100644
--- a/arch/arm/src/arm/up_cache.S
+++ b/arch/arm/src/arm/arm_cache.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/arm/up_cache.S
+ * arch/arm/src/arm/arm_cache.S
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,7 +41,7 @@
  *
  ****************************************************************************/
 
-	.file	"up_cache.S"
+	.file	"arm_cache.S"
 
 /****************************************************************************
  * Included Files
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/arm_head.S
similarity index 99%
rename from arch/arm/src/arm/up_head.S
rename to arch/arm/src/arm/arm_head.S
index 009d0e8bad..c719611984 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/arch/arm/src/arm/arm_head.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/arm/up_head.S
+ * arch/arm/src/arm/arm_head.S
  *
  *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/arm_nommuhead.S
similarity index 99%
rename from arch/arm/src/arm/up_nommuhead.S
rename to arch/arm/src/arm/arm_nommuhead.S
index d8492108e0..e98aeb96e4 100644
--- a/arch/arm/src/arm/up_nommuhead.S
+++ b/arch/arm/src/arm/arm_nommuhead.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/arm/up_nommuhead.S
+ * arch/arm/src/arm/arm_nommuhead.S
  *
  *   Copyright (C) 2007, 2009-2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/arm/up_vectoraddrexcptn.S b/arch/arm/src/arm/arm_vectoraddrexcptn.S
similarity index 100%
rename from arch/arm/src/arm/up_vectoraddrexcptn.S
rename to arch/arm/src/arm/arm_vectoraddrexcptn.S
diff --git a/arch/arm/src/arm/up_vectors.S b/arch/arm/src/arm/arm_vectors.S
similarity index 99%
rename from arch/arm/src/arm/up_vectors.S
rename to arch/arm/src/arm/arm_vectors.S
index abe0607935..883fe05278 100644
--- a/arch/arm/src/arm/up_vectors.S
+++ b/arch/arm/src/arm/arm_vectors.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/arm/up_vectors.S
+ * arch/arm/src/arm/arm_vectors.S
  *
  *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/arm/up_vectortab.S b/arch/arm/src/arm/arm_vectortab.S
similarity index 99%
rename from arch/arm/src/arm/up_vectortab.S
rename to arch/arm/src/arm/arm_vectortab.S
index 026180e1d8..0c523705c0 100644
--- a/arch/arm/src/arm/up_vectortab.S
+++ b/arch/arm/src/arm/arm_vectortab.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/arm/up_vectortab.S
+ * arch/arm/src/arm/arm_vectortab.S
  *
  *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/armv6-m/up_exception.S b/arch/arm/src/armv6-m/arm_exception.S
similarity index 99%
rename from arch/arm/src/armv6-m/up_exception.S
rename to arch/arm/src/armv6-m/arm_exception.S
index 972b432b1c..5cf318c009 100644
--- a/arch/arm/src/armv6-m/up_exception.S
+++ b/arch/arm/src/armv6-m/arm_exception.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv6-m/up_exception.S
+ * arch/arm/src/armv6-m/arm_exception.S
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +55,7 @@
 	.globl		exception_common
 
 	.cpu		cortex-m0
-	.file		"up_exception.S"
+	.file		"arm_exception.S"
 
 /************************************************************************************
  * .text
diff --git a/arch/arm/src/armv6-m/arm_signal_dispatch.c b/arch/arm/src/armv6-m/arm_signal_dispatch.c
index 8f3d3f2ec4..4f613aaed6 100644
--- a/arch/arm/src/armv6-m/arm_signal_dispatch.c
+++ b/arch/arm/src/armv6-m/arm_signal_dispatch.c
@@ -61,7 +61,7 @@
  *
  *   Normally the user-mode signalling handling stub will also execute
  *   before the ultimate signal handler is called.  See
- *   arch/arm/src/armv6-m/up_signal_handler.S.  This function is the
+ *   arch/arm/src/armv6-m/arm_signal_handler.S.  This function is the
  *   user-space, signal handler trampoline function.  It is called from
  *   up_signal_dispatch() in user-mode.
  *
diff --git a/arch/arm/src/armv6-m/up_signal_handler.S b/arch/arm/src/armv6-m/arm_signal_handler.S
similarity index 98%
rename from arch/arm/src/armv6-m/up_signal_handler.S
rename to arch/arm/src/armv6-m/arm_signal_handler.S
index 9ad7ec8133..7b019ed664 100644
--- a/arch/arm/src/armv6-m/up_signal_handler.S
+++ b/arch/arm/src/armv6-m/arm_signal_handler.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/srcm/armv6-m/up_signal_handler.S
+ * arch/arm/srcm/armv6-m/arm_signal_handler.S
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
  ****************************************************************************/
 
 	.cpu	cortex-m0
-	.file	"up_signal_handler.S"
+	.file	"arm_signal_handler.S"
 
 /****************************************************************************
  * Private Functions
diff --git a/arch/arm/src/armv7-m/arm_signal_dispatch.c b/arch/arm/src/armv7-m/arm_signal_dispatch.c
index e50236a56c..9c1c4481e9 100644
--- a/arch/arm/src/armv7-m/arm_signal_dispatch.c
+++ b/arch/arm/src/armv7-m/arm_signal_dispatch.c
@@ -46,7 +46,7 @@
  *
  *   Normally the user-mode signaling handling stub will also execute
  *   before the ultimate signal handler is called.  See
- *   arch/arm/src/armv7-m/gnu/up_signal_handler.S.  This function is the
+ *   arch/arm/src/armv7-m/gnu/arm_signal_handler.S.  This function is the
  *   user-space, signal handler trampoline function.  It is called from
  *   up_signal_dispatch() in user-mode.
  *
diff --git a/arch/arm/src/armv7-m/gnu/up_exception.S b/arch/arm/src/armv7-m/gnu/arm_exception.S
similarity index 99%
rename from arch/arm/src/armv7-m/gnu/up_exception.S
rename to arch/arm/src/armv7-m/gnu/arm_exception.S
index 96db37101b..cd5e152662 100644
--- a/arch/arm/src/armv7-m/gnu/up_exception.S
+++ b/arch/arm/src/armv7-m/gnu/arm_exception.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/gnu/up_exception.S
+ * arch/arm/src/armv7-m/gnu/arm_exception.S
  *
  *   Copyright (C) 2009-2013, 2015-2016, 2018 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2012 Michael Smith. All rights reserved.
@@ -88,7 +88,7 @@
 
 	.syntax		unified
 	.thumb
-	.file		"up_exception.S"
+	.file		"arm_exception.S"
 
 /************************************************************************************
  * Macro Definitions
diff --git a/arch/arm/src/armv7-m/gnu/up_fetchadd.S b/arch/arm/src/armv7-m/gnu/arm_fetchadd.S
similarity index 99%
rename from arch/arm/src/armv7-m/gnu/up_fetchadd.S
rename to arch/arm/src/armv7-m/gnu/arm_fetchadd.S
index 93f49b0356..1a4cd68b32 100644
--- a/arch/arm/src/armv7-m/gnu/up_fetchadd.S
+++ b/arch/arm/src/armv7-m/gnu/arm_fetchadd.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-m/gnu/up_fetchadd.S
+ * arch/arm/src/armv7-m/gnu/arm_fetchadd.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,7 +26,7 @@
 
 	.syntax		unified
 	.thumb
-	.file	"up_fetchadd.S"
+	.file	"arm_fetchadd.S"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-m/gnu/up_fpu.S b/arch/arm/src/armv7-m/gnu/arm_fpu.S
similarity index 99%
rename from arch/arm/src/armv7-m/gnu/up_fpu.S
rename to arch/arm/src/armv7-m/gnu/arm_fpu.S
index 5573d963e5..d6fe3cb111 100644
--- a/arch/arm/src/armv7-m/gnu/up_fpu.S
+++ b/arch/arm/src/armv7-m/gnu/arm_fpu.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/gnu/up_fpu.S
+ * arch/arm/src/armv7-m/gnu/arm_fpu.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -46,7 +46,7 @@
 
 	.syntax		unified
 	.thumb
-	.file		"up_fpu.S"
+	.file		"arm_fpu.S"
 
 /************************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-m/gnu/up_lazyexception.S b/arch/arm/src/armv7-m/gnu/arm_lazyexception.S
similarity index 99%
rename from arch/arm/src/armv7-m/gnu/up_lazyexception.S
rename to arch/arm/src/armv7-m/gnu/arm_lazyexception.S
index 085c704950..e75f65c1f3 100644
--- a/arch/arm/src/armv7-m/gnu/up_lazyexception.S
+++ b/arch/arm/src/armv7-m/gnu/arm_lazyexception.S
@@ -71,7 +71,7 @@
 
 	.syntax		unified
 	.thumb
-	.file		"up_lazyexception.S"
+	.file		"arm_lazyexception.S"
 
 /************************************************************************************************
  * Macro Definitions
diff --git a/arch/arm/src/armv7-m/gnu/up_setjmp.S b/arch/arm/src/armv7-m/gnu/arm_setjmp.S
similarity index 99%
rename from arch/arm/src/armv7-m/gnu/up_setjmp.S
rename to arch/arm/src/armv7-m/gnu/arm_setjmp.S
index aca52a588f..657c47d62b 100644
--- a/arch/arm/src/armv7-m/gnu/up_setjmp.S
+++ b/arch/arm/src/armv7-m/gnu/arm_setjmp.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/gnu/up_setjmp.S
+ * arch/arm/src/armv7-m/gnu/arm_setjmp.S
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: David S. Alessio <David@DSA.Consulting>
diff --git a/arch/arm/src/armv7-m/gnu/up_signal_handler.S b/arch/arm/src/armv7-m/gnu/arm_signal_handler.S
similarity index 97%
rename from arch/arm/src/armv7-m/gnu/up_signal_handler.S
rename to arch/arm/src/armv7-m/gnu/arm_signal_handler.S
index 59b332d91f..ed384dc432 100644
--- a/arch/arm/src/armv7-m/gnu/up_signal_handler.S
+++ b/arch/arm/src/armv7-m/gnu/arm_signal_handler.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-m/gnu/up_signal_handler.S
+ * arch/arm/src/armv7-m/gnu/arm_signal_handler.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -35,7 +35,7 @@
 	.syntax		unified
 	.thumb
 	.cpu		cortex-m3
-	.file		"up_signal_handler.S"
+	.file		"arm_signal_handler.S"
 
 /****************************************************************************
  * Private Functions
diff --git a/arch/arm/src/armv7-m/gnu/up_testset.S b/arch/arm/src/armv7-m/gnu/arm_testset.S
similarity index 98%
rename from arch/arm/src/armv7-m/gnu/up_testset.S
rename to arch/arm/src/armv7-m/gnu/arm_testset.S
index 821065afd8..72d4da4b45 100644
--- a/arch/arm/src/armv7-m/gnu/up_testset.S
+++ b/arch/arm/src/armv7-m/gnu/arm_testset.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-m/gnu/up_testset.S
+ * arch/arm/src/armv7-m/gnu/arm_testset.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,7 +27,7 @@
 
 	.syntax		unified
 	.thumb
-	.file	"up_testset.S"
+	.file	"arm_testset.S"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/iar/up_fetchadd.S b/arch/arm/src/armv7-m/iar/arm_fetchadd.S
similarity index 99%
rename from arch/arm/src/armv7-m/iar/up_fetchadd.S
rename to arch/arm/src/armv7-m/iar/arm_fetchadd.S
index 8780935165..1a6c81de28 100644
--- a/arch/arm/src/armv7-m/iar/up_fetchadd.S
+++ b/arch/arm/src/armv7-m/iar/arm_fetchadd.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-m/iar/up_fetchadd.S
+ * arch/arm/src/armv7-m/iar/arm_fetchadd.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/arm/src/armv7-m/iar/up_testset.S b/arch/arm/src/armv7-m/iar/arm_testset.S
similarity index 98%
rename from arch/arm/src/armv7-m/iar/up_testset.S
rename to arch/arm/src/armv7-m/iar/arm_testset.S
index 21bc1b50b7..bf842d2cce 100644
--- a/arch/arm/src/armv7-m/iar/up_testset.S
+++ b/arch/arm/src/armv7-m/iar/arm_testset.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-m/iar/up_testset.S
+ * arch/arm/src/armv7-m/iar/arm_testset.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/arm/src/armv7-r/arm_fetchadd.S b/arch/arm/src/armv7-r/arm_fetchadd.S
index 77f661b984..5e25e82757 100644
--- a/arch/arm/src/armv7-r/arm_fetchadd.S
+++ b/arch/arm/src/armv7-r/arm_fetchadd.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-r/up_fetchadd.S
+ * arch/arm/src/armv7-r/arm_fetchadd.S
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/armv8-m/arm_signal_dispatch.c b/arch/arm/src/armv8-m/arm_signal_dispatch.c
index 4d3b7730b8..ac9409b50f 100755
--- a/arch/arm/src/armv8-m/arm_signal_dispatch.c
+++ b/arch/arm/src/armv8-m/arm_signal_dispatch.c
@@ -46,7 +46,7 @@
  *
  *   Normally the user-mode signaling handling stub will also execute
  *   before the ultimate signal handler is called.  See
- *   arch/arm/src/armv8-m/gnu/up_signal_handler.S.  This function is the
+ *   arch/arm/src/armv8-m/gnu/arm_signal_handler.S.  This function is the
  *   user-space, signal handler trampoline function.  It is called from
  *   up_signal_dispatch() in user-mode.
  *
diff --git a/arch/arm/src/c5471/Make.defs b/arch/arm/src/c5471/Make.defs
index a3eca41b7d..69a42af8cc 100644
--- a/arch/arm/src/c5471/Make.defs
+++ b/arch/arm/src/c5471/Make.defs
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-HEAD_ASRC = up_nommuhead.S
+HEAD_ASRC = arm_nommuhead.S
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S vfork.S
 
diff --git a/arch/arm/src/common/arm_internal.h b/arch/arm/src/common/arm_internal.h
index 75e9fa323b..5adf226844 100644
--- a/arch/arm/src/common/arm_internal.h
+++ b/arch/arm/src/common/arm_internal.h
@@ -206,7 +206,7 @@ EXTERN volatile uint32_t *g_current_regs[1];
 
 #endif
 
-/* This is the beginning of heap as provided from up_head.S.
+/* This is the beginning of heap as provided from arm_head.S.
  * This is the first address in DRAM after the loaded
  * program+bss+idle stack.  The end of the heap is
  * CONFIG_RAM_END
diff --git a/arch/arm/src/cxd56xx/Make.defs b/arch/arm/src/cxd56xx/Make.defs
index 61c8d344b0..90c1372f67 100644
--- a/arch/arm/src/cxd56xx/Make.defs
+++ b/arch/arm/src/cxd56xx/Make.defs
@@ -38,11 +38,11 @@
 HEAD_ASRC  =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S vfork.S
+CMN_ASRCS += arm_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -56,9 +56,9 @@ CMN_CSRCS += arm_unblocktask.c arm_usestack.c arm_doirq.c arm_hardfault.c
 CMN_CSRCS += arm_svcall.c arm_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -73,7 +73,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_mpu.c arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -81,7 +81,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y)
 CMN_CSRCS += arm_copyarmstate.c
 else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
diff --git a/arch/arm/src/dm320/Make.defs b/arch/arm/src/dm320/Make.defs
index 2de29957c5..1ad1407526 100644
--- a/arch/arm/src/dm320/Make.defs
+++ b/arch/arm/src/dm320/Make.defs
@@ -33,10 +33,10 @@
 #
 ############################################################################
 
-HEAD_ASRC = up_head.S
+HEAD_ASRC = arm_head.S
 
-CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
-CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
+CMN_ASRCS  = arm_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
+CMN_ASRCS += arm_vectors.S arm_vectoraddrexcptn.S arm_vectortab.S vfork.S
 
 CMN_CSRCS  = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c
 CMN_CSRCS += arm_dataabort.c arm_mdelay.c arm_udelay.c arm_exit.c
diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs
index eb2c745b7a..94f402b901 100644
--- a/arch/arm/src/efm32/Make.defs
+++ b/arch/arm/src/efm32/Make.defs
@@ -39,11 +39,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -57,9 +57,9 @@ CMN_CSRCS += arm_sigdeliver.c arm_stackframe.c arm_svcall.c arm_systemreset.c
 CMN_CSRCS += arm_trigger_irq.c arm_udelay.c arm_unblocktask.c arm_usestack.c arm_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -70,7 +70,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_mpu.c arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -78,7 +78,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/imx1/Make.defs b/arch/arm/src/imx1/Make.defs
index de867fb0ab..3faa644b54 100644
--- a/arch/arm/src/imx1/Make.defs
+++ b/arch/arm/src/imx1/Make.defs
@@ -33,10 +33,10 @@
 #
 ############################################################################
 
-HEAD_ASRC = up_head.S
+HEAD_ASRC = arm_head.S
 
-CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
-CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
+CMN_ASRCS  = arm_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
+CMN_ASRCS += arm_vectors.S arm_vectoraddrexcptn.S arm_vectortab.S vfork.S
 CMN_CSRCS  = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c
 CMN_CSRCS += arm_dataabort.c arm_mdelay.c arm_udelay.c arm_exit.c
 CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c
diff --git a/arch/arm/src/imxrt/Make.defs b/arch/arm/src/imxrt/Make.defs
index 467ba8edd1..29ccfb74a4 100644
--- a/arch/arm/src/imxrt/Make.defs
+++ b/arch/arm/src/imxrt/Make.defs
@@ -39,11 +39,11 @@ HEAD_ASRC  =
 # Common ARM and Cortex-M7 files
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -63,9 +63,9 @@ endif
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -80,7 +80,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -90,7 +90,7 @@ endif
 CMN_CSRCS += arm_cache.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs
index b62dad8638..ba36df80d7 100644
--- a/arch/arm/src/kinetis/Make.defs
+++ b/arch/arm/src/kinetis/Make.defs
@@ -39,11 +39,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -61,9 +61,9 @@ CMN_CSRCS += arm_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -78,7 +78,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -96,7 +96,7 @@ endif
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/kl/Make.defs b/arch/arm/src/kl/Make.defs
index 33ef8d4ce8..13a463e407 100644
--- a/arch/arm/src/kl/Make.defs
+++ b/arch/arm/src/kl/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = arm_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += arm_switchcontext.S vfork.S
 
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
@@ -50,7 +50,7 @@ CMN_CSRCS += arm_hardfault.c arm_svcall.c arm_vectors.c arm_vfork.c
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/lc823450/Make.defs b/arch/arm/src/lc823450/Make.defs
index 9a4c4779bf..c9e5cb814c 100644
--- a/arch/arm/src/lc823450/Make.defs
+++ b/arch/arm/src/lc823450/Make.defs
@@ -45,7 +45,7 @@ CMN_ASRCS += vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -61,7 +61,7 @@ CMN_CSRCS += arm_svcall.c arm_vfork.c arm_trigger_irq.c
 # CMN_CSRCS += up_dwt.c
 
 CMN_CSRCS += arm_stackframe.c
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 CMN_CSRCS += arm_vectors.c
 
 ifeq ($(CONFIG_ARCH_RAMVECTORS),y)
@@ -71,7 +71,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_ARCH_MEMCPY),y)
diff --git a/arch/arm/src/lpc17xx_40xx/Make.defs b/arch/arm/src/lpc17xx_40xx/Make.defs
index a1d3e463fd..752f7a116a 100644
--- a/arch/arm/src/lpc17xx_40xx/Make.defs
+++ b/arch/arm/src/lpc17xx_40xx/Make.defs
@@ -43,11 +43,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -66,9 +66,9 @@ CMN_CSRCS += arm_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -83,7 +83,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 # Use of common/arm_etherstub.c is deprecated.  The preferred mechanism is to
@@ -97,7 +97,7 @@ endif
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/lpc214x/Make.defs b/arch/arm/src/lpc214x/Make.defs
index 4851b20325..7e6cd0ff12 100644
--- a/arch/arm/src/lpc214x/Make.defs
+++ b/arch/arm/src/lpc214x/Make.defs
@@ -36,7 +36,7 @@
 
 HEAD_ASRC = lpc214x_head.S
 
-CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_vectors.S
 CMN_ASRCS += vfork.S
 
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
diff --git a/arch/arm/src/lpc2378/Make.defs b/arch/arm/src/lpc2378/Make.defs
index 2b64f2f86b..bfab92ad07 100644
--- a/arch/arm/src/lpc2378/Make.defs
+++ b/arch/arm/src/lpc2378/Make.defs
@@ -40,7 +40,7 @@
 
 HEAD_ASRC = lpc23xx_head.S
 
-CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_vectors.S
 CMN_ASRCS += vfork.S
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
 CMN_CSRCS += arm_createstack.c arm_dataabort.c arm_mdelay.c arm_udelay.c
diff --git a/arch/arm/src/lpc31xx/Make.defs b/arch/arm/src/lpc31xx/Make.defs
index edb7cfef65..34ba3414e7 100644
--- a/arch/arm/src/lpc31xx/Make.defs
+++ b/arch/arm/src/lpc31xx/Make.defs
@@ -33,10 +33,10 @@
 #
 ############################################################################
 
-HEAD_ASRC = up_head.S
+HEAD_ASRC = arm_head.S
 
-CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
-CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
+CMN_ASRCS  = arm_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
+CMN_ASRCS += arm_vectors.S arm_vectoraddrexcptn.S arm_vectortab.S vfork.S
 
 CMN_CSRCS  = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c
 CMN_CSRCS += arm_dataabort.c arm_mdelay.c arm_udelay.c arm_exit.c
diff --git a/arch/arm/src/lpc31xx/lpc31_boot.c b/arch/arm/src/lpc31xx/lpc31_boot.c
index 9ca94e2129..6b0b99b8fd 100644
--- a/arch/arm/src/lpc31xx/lpc31_boot.c
+++ b/arch/arm/src/lpc31xx/lpc31_boot.c
@@ -134,7 +134,8 @@ static const struct section_mapping_s g_section_mapping[] =
  ************************************************************************************/
 
 #ifndef CONFIG_ARCH_ROMPGTABLE
-static inline void up_setlevel1entry(uint32_t paddr, uint32_t vaddr, uint32_t mmuflags)
+static inline void up_setlevel1entry(uint32_t paddr, uint32_t vaddr,
+                                     uint32_t mmuflags)
 {
   uint32_t *pgtable = (uint32_t *)PGTABLE_BASE_VADDR;
   uint32_t  index   = vaddr >> 20;
@@ -174,7 +175,8 @@ static inline void up_setlevel2coarseentry(uint32_t ctabvaddr, uint32_t paddr,
 #ifndef CONFIG_ARCH_ROMPGTABLE
 static void up_setupmappings(void)
 {
-  int i, j;
+  int i;
+  int j;
 
   for (i = 0; i < NMAPPINGS; i++)
     {
@@ -288,16 +290,18 @@ static void up_copyvectorblock(void)
    * read only, then temporarily mark the mapping write-able (non-buffered).
    */
 
-#if !defined(CONFIG_ARCH_ROMPGTABLE) && defined(CONFIG_ARCH_LOWVECTORS) && defined(CONFIG_PAGING)
+#if !defined(CONFIG_ARCH_ROMPGTABLE) && defined(CONFIG_ARCH_LOWVECTORS) && \
+     defined(CONFIG_PAGING)
   up_vectorpermissions(MMU_L2_VECTRWFLAGS);
 #endif
 
-  /* Copy the vectors into ISRAM at the address that will be mapped to the vector
-   * address:
+  /* Copy the vectors into ISRAM at the address that will be mapped to the
+   * vector address:
    *
    *   LPC31_VECTOR_PADDR - Unmapped, physical address of vector table in SRAM
    *   LPC31_VECTOR_VSRAM - Virtual address of vector table in SRAM
-   *   LPC31_VECTOR_VADDR - Virtual address of vector table (0x00000000 or 0xffff0000)
+   *   LPC31_VECTOR_VADDR - Virtual address of vector table (0x00000000 or
+   *                        0xffff0000)
    */
 
   src  = (uint32_t *)&_vector_start;
@@ -331,7 +335,7 @@ static void up_copyvectorblock(void)
  * Name: arm_boot
  *
  * Description:
- *   Complete boot operations started in up_head.S
+ *   Complete boot operations started in arm_head.S
  *
  ************************************************************************************/
 
diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs
index 69236db964..2bcf51241b 100644
--- a/arch/arm/src/lpc43xx/Make.defs
+++ b/arch/arm/src/lpc43xx/Make.defs
@@ -36,11 +36,11 @@
 HEAD_ASRC  =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -54,9 +54,9 @@ CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_unblocktask.c arm_udelay.c
 CMN_CSRCS += arm_usestack.c arm_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -71,7 +71,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -79,7 +79,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/lpc54xx/Make.defs b/arch/arm/src/lpc54xx/Make.defs
index 819e1e41b3..1ef8eed316 100644
--- a/arch/arm/src/lpc54xx/Make.defs
+++ b/arch/arm/src/lpc54xx/Make.defs
@@ -36,11 +36,11 @@
 HEAD_ASRC  =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -54,9 +54,9 @@ CMN_CSRCS += arm_svcall.c arm_trigger_irq.c arm_unblocktask.c arm_udelay.c
 CMN_CSRCS += arm_usestack.c arm_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -71,7 +71,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -79,7 +79,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/max326xx/Make.defs b/arch/arm/src/max326xx/Make.defs
index 37857b078b..82e2b3a659 100644
--- a/arch/arm/src/max326xx/Make.defs
+++ b/arch/arm/src/max326xx/Make.defs
@@ -38,11 +38,11 @@
 HEAD_ASRC  =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -56,9 +56,9 @@ CMN_CSRCS += arm_stackframe.c arm_svcall.c arm_trigger_irq.c arm_unblocktask.c
 CMN_CSRCS += arm_udelay.c arm_usestack.c arm_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -69,7 +69,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_mpu.c arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -77,7 +77,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/moxart/Make.defs b/arch/arm/src/moxart/Make.defs
index c32d0c0e5f..54ea75c45f 100644
--- a/arch/arm/src/moxart/Make.defs
+++ b/arch/arm/src/moxart/Make.defs
@@ -38,8 +38,8 @@
 
 HEAD_ASRC = moxart_head.S
 
-CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
-CMN_ASRCS += up_nommuhead.S vfork.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_vectors.S
+CMN_ASRCS += arm_nommuhead.S vfork.S
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
 CMN_CSRCS += arm_createstack.c arm_dataabort.c arm_mdelay.c arm_udelay.c
 CMN_CSRCS += arm_exit.c arm_initialstate.c arm_initialize.c
diff --git a/arch/arm/src/nrf52/Make.defs b/arch/arm/src/nrf52/Make.defs
index 98f7ec4b08..2e6d3764a9 100644
--- a/arch/arm/src/nrf52/Make.defs
+++ b/arch/arm/src/nrf52/Make.defs
@@ -36,11 +36,11 @@
 HEAD_ASRC  =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S vfork.S
+CMN_ASRCS += arm_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -54,9 +54,9 @@ CMN_CSRCS += arm_stackframe.c arm_svcall.c arm_trigger_irq.c arm_udelay.c
 CMN_CSRCS += arm_unblocktask.c arm_usestack.c arm_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -67,7 +67,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_mpu.c arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -75,7 +75,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/nuc1xx/Make.defs b/arch/arm/src/nuc1xx/Make.defs
index efc62640fa..a27e6f4255 100644
--- a/arch/arm/src/nuc1xx/Make.defs
+++ b/arch/arm/src/nuc1xx/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = arm_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += arm_switchcontext.S vfork.S
 
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
@@ -50,7 +50,7 @@ CMN_CSRCS += arm_hardfault.c arm_svcall.c arm_vectors.c arm_vfork.c
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/s32k1xx/s32k11x/Make.defs b/arch/arm/src/s32k1xx/s32k11x/Make.defs
index 6d6c18f549..8536e9f14a 100644
--- a/arch/arm/src/s32k1xx/s32k11x/Make.defs
+++ b/arch/arm/src/s32k1xx/s32k11x/Make.defs
@@ -35,7 +35,7 @@
 
 # Source files specific to the Cortex-M0+
 
-CMN_ASRCS += up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS += arm_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += arm_switchcontext.S vfork.S
 
 CMN_CSRCS += arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c
@@ -46,7 +46,7 @@ CMN_CSRCS += arm_vectors.c
 
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_DEBUG_FEATURES),y)
diff --git a/arch/arm/src/s32k1xx/s32k14x/Make.defs b/arch/arm/src/s32k1xx/s32k14x/Make.defs
index d1b929e7c7..6acc966a14 100644
--- a/arch/arm/src/s32k1xx/s32k14x/Make.defs
+++ b/arch/arm/src/s32k1xx/s32k14x/Make.defs
@@ -36,11 +36,11 @@
 # Source files specific to the Cortex-M4F
 
 CMN_ASRCS += arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -51,9 +51,9 @@ CMN_CSRCS += arm_sigdeliver.c arm_svcall.c arm_trigger_irq.c arm_unblocktask.c
 CMN_CSRCS += arm_systemreset.c
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -63,11 +63,11 @@ endif
 
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_mpu.c arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs
index 4df403bc41..340db0f62d 100644
--- a/arch/arm/src/sam34/Make.defs
+++ b/arch/arm/src/sam34/Make.defs
@@ -44,11 +44,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -70,9 +70,9 @@ endif
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -87,11 +87,11 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/samd2l2/Make.defs b/arch/arm/src/samd2l2/Make.defs
index bbe26c9665..f2dcbbf85f 100644
--- a/arch/arm/src/samd2l2/Make.defs
+++ b/arch/arm/src/samd2l2/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = arm_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += arm_switchcontext.S vfork.S
 
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
@@ -50,7 +50,7 @@ CMN_CSRCS += arm_hardfault.c arm_svcall.c arm_vectors.c arm_vfork.c
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/samd5e5/Make.defs b/arch/arm/src/samd5e5/Make.defs
index cfcfd70ef5..9fad6845a3 100644
--- a/arch/arm/src/samd5e5/Make.defs
+++ b/arch/arm/src/samd5e5/Make.defs
@@ -43,11 +43,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -63,9 +63,9 @@ CMN_CSRCS += arm_hardfault.c arm_vfork.c
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -76,11 +76,11 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_mpu.c arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/samv7/Make.defs b/arch/arm/src/samv7/Make.defs
index 92d5abe4c2..fac52120ae 100644
--- a/arch/arm/src/samv7/Make.defs
+++ b/arch/arm/src/samv7/Make.defs
@@ -44,11 +44,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -72,16 +72,16 @@ CMN_CSRCS += arm_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
 CMN_CSRCS += arm_cache.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
@@ -94,7 +94,7 @@ CMN_CSRCS += arm_mpu.c
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 endif
 
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index e18e05db99..4b7646e6ea 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -39,11 +39,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -65,9 +65,9 @@ CMN_CSRCS += arm_lwl_console.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -82,7 +82,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -90,7 +90,7 @@ CMN_CSRCS += arm_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
diff --git a/arch/arm/src/stm32f0l0g0/Make.defs b/arch/arm/src/stm32f0l0g0/Make.defs
index 84e17fd635..84fb03c65c 100644
--- a/arch/arm/src/stm32f0l0g0/Make.defs
+++ b/arch/arm/src/stm32f0l0g0/Make.defs
@@ -36,7 +36,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = arm_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += arm_switchcontext.S vfork.S
 
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
@@ -51,7 +51,7 @@ CMN_CSRCS += arm_hardfault.c arm_svcall.c arm_vectors.c arm_vfork.c
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 6bb8f447f3..d10499b1e8 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -44,11 +44,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -72,16 +72,16 @@ endif
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
 CMN_CSRCS += arm_cache.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
@@ -100,7 +100,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs
index 05e2191699..4cb092ef62 100644
--- a/arch/arm/src/stm32h7/Make.defs
+++ b/arch/arm/src/stm32h7/Make.defs
@@ -44,11 +44,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S vfork.S
+CMN_ASRCS += arm_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -68,15 +68,15 @@ CMN_CSRCS += arm_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
 CMN_CSRCS += arm_cache.c
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
@@ -99,7 +99,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs
index 4d4c189851..32604ca5a8 100644
--- a/arch/arm/src/stm32l4/Make.defs
+++ b/arch/arm/src/stm32l4/Make.defs
@@ -45,11 +45,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -69,14 +69,14 @@ CMN_CSRCS += arm_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif
 
@@ -91,7 +91,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
diff --git a/arch/arm/src/str71x/Make.defs b/arch/arm/src/str71x/Make.defs
index 916fcd63ea..8ecefa00db 100644
--- a/arch/arm/src/str71x/Make.defs
+++ b/arch/arm/src/str71x/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC = str71x_head.S
 
-CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_vectors.S
 CMN_ASRCS += vfork.S
 
 CMN_CSRCS  = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c
diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs
index afd45dd487..9875cf26d2 100644
--- a/arch/arm/src/tiva/Make.defs
+++ b/arch/arm/src/tiva/Make.defs
@@ -37,11 +37,11 @@
 HEAD_ASRC  =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S  vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S  vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -63,15 +63,15 @@ ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-  CMN_ASRCS += up_lazyexception.S
+  CMN_ASRCS += arm_lazyexception.S
 else
-  CMN_ASRCS += up_exception.S
+  CMN_ASRCS += arm_exception.S
 endif
 
 CMN_CSRCS += arm_vectors.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-  CMN_ASRCS += up_fpu.S
+  CMN_ASRCS += arm_fpu.S
   CMN_CSRCS += arm_copyarmstate.c
 endif
 
@@ -90,7 +90,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
   CMN_CSRCS += arm_task_start.c arm_pthread_start.c
   CMN_CSRCS += arm_signal_dispatch.c
-  CMN_UASRCS += up_signal_handler.S
+  CMN_UASRCS += arm_signal_handler.S
 else
   CMN_CSRCS += arm_allocateheap.c
 endif
diff --git a/arch/arm/src/xmc4/Make.defs b/arch/arm/src/xmc4/Make.defs
index 5cf0221a37..7dc3e1e8c1 100644
--- a/arch/arm/src/xmc4/Make.defs
+++ b/arch/arm/src/xmc4/Make.defs
@@ -39,11 +39,11 @@ CMN_UASRCS =
 CMN_UCSRCS =
 
 CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
+CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-CMN_ASRCS += up_setjmp.S
+CMN_ASRCS += arm_setjmp.S
 endif
 endif
 
@@ -61,9 +61,9 @@ CMN_CSRCS += arm_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_ASRCS += up_lazyexception.S
+CMN_ASRCS += arm_lazyexception.S
 else
-CMN_ASRCS += up_exception.S
+CMN_ASRCS += arm_exception.S
 endif
 CMN_CSRCS += arm_vectors.c
 
@@ -78,7 +78,7 @@ endif
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += arm_task_start.c arm_pthread_start.c
 CMN_CSRCS += arm_signal_dispatch.c
-CMN_UASRCS += up_signal_handler.S
+CMN_UASRCS += arm_signal_handler.S
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)
@@ -96,7 +96,7 @@ endif
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS += up_fpu.S
+CMN_ASRCS += arm_fpu.S
 CMN_CSRCS += arm_copyarmstate.c
 endif