diff --git a/arch/arm/src/armv8-m/up_assert.c b/arch/arm/src/armv8-m/arm_assert.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_assert.c
rename to arch/arm/src/armv8-m/arm_assert.c
index 0b5f736e4d3..a8389311e09 100755
--- a/arch/arm/src/armv8-m/up_assert.c
+++ b/arch/arm/src/armv8-m/arm_assert.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_assert.c
+ * arch/arm/src/armv8-m/arm_assert.c
  *
  * 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/armv8-m/up_blocktask.c b/arch/arm/src/armv8-m/arm_blocktask.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_blocktask.c
rename to arch/arm/src/armv8-m/arm_blocktask.c
index e0bd82f4006..a5997105996 100755
--- a/arch/arm/src/armv8-m/up_blocktask.c
+++ b/arch/arm/src/armv8-m/arm_blocktask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_blocktask.c
+ * arch/arm/src/armv8-m/arm_blocktask.c
  *
  * 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/armv8-m/up_cache.c b/arch/arm/src/armv8-m/arm_cache.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_cache.c
rename to arch/arm/src/armv8-m/arm_cache.c
index 863f1857e55..23339a1be2f 100755
--- a/arch/arm/src/armv8-m/up_cache.c
+++ b/arch/arm/src/armv8-m/arm_cache.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_cache.c
+ * arch/arm/src/armv8-m/arm_cache.c
  *
  *   Copyright (C) 2015, 2018-2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/armv8-m/up_copyarmstate.c b/arch/arm/src/armv8-m/arm_copyarmstate.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_copyarmstate.c
rename to arch/arm/src/armv8-m/arm_copyarmstate.c
index 87ab5b332c8..ebde866ee29 100755
--- a/arch/arm/src/armv8-m/up_copyarmstate.c
+++ b/arch/arm/src/armv8-m/arm_copyarmstate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_copyarmstate.c
+ * arch/arm/src/armv8-m/arm_copyarmstate.c
  *
  * 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/armv8-m/up_copyfullstate.c b/arch/arm/src/armv8-m/arm_copyfullstate.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_copyfullstate.c
rename to arch/arm/src/armv8-m/arm_copyfullstate.c
index cfd6fe8bcff..dee5db55e1b 100755
--- a/arch/arm/src/armv8-m/up_copyfullstate.c
+++ b/arch/arm/src/armv8-m/arm_copyfullstate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_copyfullstate.c
+ * arch/arm/src/armv8-m/arm_copyfullstate.c
  *
  * 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/armv8-m/up_doirq.c b/arch/arm/src/armv8-m/arm_doirq.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_doirq.c
rename to arch/arm/src/armv8-m/arm_doirq.c
index 7349da94532..e207a99c21f 100755
--- a/arch/arm/src/armv8-m/up_doirq.c
+++ b/arch/arm/src/armv8-m/arm_doirq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_doirq.c
+ * arch/arm/src/armv8-m/arm_doirq.c
  *
  * 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/armv8-m/up_hardfault.c b/arch/arm/src/armv8-m/arm_hardfault.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_hardfault.c
rename to arch/arm/src/armv8-m/arm_hardfault.c
index 94d0d732b86..8719d02ca35 100755
--- a/arch/arm/src/armv8-m/up_hardfault.c
+++ b/arch/arm/src/armv8-m/arm_hardfault.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_hardfault.c
+ * arch/arm/src/armv8-m/arm_hardfault.c
  *
  * 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/armv8-m/up_initialstate.c b/arch/arm/src/armv8-m/arm_initialstate.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_initialstate.c
rename to arch/arm/src/armv8-m/arm_initialstate.c
index 390eb26545f..afd6487028f 100755
--- a/arch/arm/src/armv8-m/up_initialstate.c
+++ b/arch/arm/src/armv8-m/arm_initialstate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_initialstate.c
+ * arch/arm/src/armv8-m/arm_initialstate.c
  *
  * 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/armv8-m/up_itm.c b/arch/arm/src/armv8-m/arm_itm.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_itm.c
rename to arch/arm/src/armv8-m/arm_itm.c
index 208c2dda58c..f69233c1ece 100755
--- a/arch/arm/src/armv8-m/up_itm.c
+++ b/arch/arm/src/armv8-m/arm_itm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_itm.c
+ * arch/arm/src/armv8-m/arm_itm.c
  *
  *   Copyright (c) 2009 - 2013 ARM LIMITED
  *
diff --git a/arch/arm/src/armv8-m/up_itm_syslog.c b/arch/arm/src/armv8-m/arm_itm_syslog.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_itm_syslog.c
rename to arch/arm/src/armv8-m/arm_itm_syslog.c
index 1c74df3b43d..e0a9ee5555b 100755
--- a/arch/arm/src/armv8-m/up_itm_syslog.c
+++ b/arch/arm/src/armv8-m/arm_itm_syslog.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_itm_syslog.c
+ * arch/arm/src/armv8-m/arm_itm_syslog.c
  *
  *   Copyright (C) 2014 Pierre-noel Bouteville . All rights reserved.
  *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
diff --git a/arch/arm/src/armv8-m/up_memfault.c b/arch/arm/src/armv8-m/arm_memfault.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_memfault.c
rename to arch/arm/src/armv8-m/arm_memfault.c
index 70a0e619035..45809c4b29c 100755
--- a/arch/arm/src/armv8-m/up_memfault.c
+++ b/arch/arm/src/armv8-m/arm_memfault.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_memfault.c
+ * arch/arm/src/armv8-m/arm_memfault.c
  *
  * 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/armv8-m/up_mpu.c b/arch/arm/src/armv8-m/arm_mpu.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_mpu.c
rename to arch/arm/src/armv8-m/arm_mpu.c
index 3bbaa98d1cb..0b70fa59375 100755
--- a/arch/arm/src/armv8-m/up_mpu.c
+++ b/arch/arm/src/armv8-m/arm_mpu.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * arch/arm/src/armv8-m/up_mpu.c
+ * arch/arm/src/armv8-m/arm_mpu.c
  *
  * 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/armv8-m/up_ramvec_attach.c b/arch/arm/src/armv8-m/arm_ramvec_attach.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_ramvec_attach.c
rename to arch/arm/src/armv8-m/arm_ramvec_attach.c
index fa83f4c792d..e7f2690fb38 100755
--- a/arch/arm/src/armv8-m/up_ramvec_attach.c
+++ b/arch/arm/src/armv8-m/arm_ramvec_attach.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/irq/up_ramvec_attach.c
+ * arch/arm/irq/arm_ramvec_attach.c
  *
  * 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/armv8-m/up_ramvec_initialize.c b/arch/arm/src/armv8-m/arm_ramvec_initialize.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_ramvec_initialize.c
rename to arch/arm/src/armv8-m/arm_ramvec_initialize.c
index 2c16d03b4a2..fff9b431dbc 100755
--- a/arch/arm/src/armv8-m/up_ramvec_initialize.c
+++ b/arch/arm/src/armv8-m/arm_ramvec_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_ramvec_initialize.c
+ * arch/arm/src/armv8-m/arm_ramvec_initialize.c
  *
  * 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/armv8-m/up_releasepending.c b/arch/arm/src/armv8-m/arm_releasepending.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_releasepending.c
rename to arch/arm/src/armv8-m/arm_releasepending.c
index b5576c6818e..19529655545 100755
--- a/arch/arm/src/armv8-m/up_releasepending.c
+++ b/arch/arm/src/armv8-m/arm_releasepending.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- *  arch/arm/src/armv8-m/up_releasepending.c
+ *  arch/arm/src/armv8-m/arm_releasepending.c
  *
  * 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/armv8-m/up_reprioritizertr.c b/arch/arm/src/armv8-m/arm_reprioritizertr.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_reprioritizertr.c
rename to arch/arm/src/armv8-m/arm_reprioritizertr.c
index 55d94887376..d78eb944bf8 100755
--- a/arch/arm/src/armv8-m/up_reprioritizertr.c
+++ b/arch/arm/src/armv8-m/arm_reprioritizertr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- *  arch/arm/src/armv8-m/up_reprioritizertr.c
+ *  arch/arm/src/armv8-m/arm_reprioritizertr.c
  *
  * 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/armv8-m/up_schedulesigaction.c b/arch/arm/src/armv8-m/arm_schedulesigaction.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_schedulesigaction.c
rename to arch/arm/src/armv8-m/arm_schedulesigaction.c
index e199366794b..415b8b9cc3f 100755
--- a/arch/arm/src/armv8-m/up_schedulesigaction.c
+++ b/arch/arm/src/armv8-m/arm_schedulesigaction.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_schedulesigaction.c
+ * arch/arm/src/armv8-m/arm_schedulesigaction.c
  *
  * 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/armv8-m/up_sigdeliver.c b/arch/arm/src/armv8-m/arm_sigdeliver.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_sigdeliver.c
rename to arch/arm/src/armv8-m/arm_sigdeliver.c
index 47c83b963a6..180bfbde9cb 100755
--- a/arch/arm/src/armv8-m/up_sigdeliver.c
+++ b/arch/arm/src/armv8-m/arm_sigdeliver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_sigdeliver.c
+ * arch/arm/src/armv8-m/arm_sigdeliver.c
  *
  * 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/armv8-m/up_signal_dispatch.c b/arch/arm/src/armv8-m/arm_signal_dispatch.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_signal_dispatch.c
rename to arch/arm/src/armv8-m/arm_signal_dispatch.c
index 0c0f8d37c54..4e55ca89ddb 100755
--- a/arch/arm/src/armv8-m/up_signal_dispatch.c
+++ b/arch/arm/src/armv8-m/arm_signal_dispatch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_signal_dispatch.c
+ * arch/arm/src/armv8-m/arm_signal_dispatch.c
  *
  * 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/armv8-m/up_stackcheck.c b/arch/arm/src/armv8-m/arm_stackcheck.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_stackcheck.c
rename to arch/arm/src/armv8-m/arm_stackcheck.c
index e8791490348..624b15008af 100755
--- a/arch/arm/src/armv8-m/up_stackcheck.c
+++ b/arch/arm/src/armv8-m/arm_stackcheck.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_stackcheck.c
+ * arch/arm/src/armv8-m/arm_stackcheck.c
  *
  *   Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
  *
diff --git a/arch/arm/src/armv8-m/up_svcall.c b/arch/arm/src/armv8-m/arm_svcall.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_svcall.c
rename to arch/arm/src/armv8-m/arm_svcall.c
index 76c204faa89..374b1343e4f 100755
--- a/arch/arm/src/armv8-m/up_svcall.c
+++ b/arch/arm/src/armv8-m/arm_svcall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_svcall.c
+ * arch/arm/src/armv8-m/arm_svcall.c
  *
  * 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/armv8-m/up_systemreset.c b/arch/arm/src/armv8-m/arm_systemreset.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_systemreset.c
rename to arch/arm/src/armv8-m/arm_systemreset.c
index 0b712c46376..0a0784ec00b 100755
--- a/arch/arm/src/armv8-m/up_systemreset.c
+++ b/arch/arm/src/armv8-m/arm_systemreset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_systemreset.c
+ * arch/arm/src/armv8-m/arm_systemreset.c
  *
  * 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/armv8-m/up_systick.c b/arch/arm/src/armv8-m/arm_systick.c
similarity index 99%
rename from arch/arm/src/armv8-m/up_systick.c
rename to arch/arm/src/armv8-m/arm_systick.c
index 79285cf2d7e..f0532243846 100755
--- a/arch/arm/src/armv8-m/up_systick.c
+++ b/arch/arm/src/armv8-m/arm_systick.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_systick.c
+ * arch/arm/src/armv8-m/arm_systick.c
  *
  * 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/armv8-m/up_trigger_irq.c b/arch/arm/src/armv8-m/arm_trigger_irq.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_trigger_irq.c
rename to arch/arm/src/armv8-m/arm_trigger_irq.c
index 935ab9133e2..4be5477d4ad 100755
--- a/arch/arm/src/armv8-m/up_trigger_irq.c
+++ b/arch/arm/src/armv8-m/arm_trigger_irq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/irq/up_trigger_irq.c
+ * arch/arm/irq/arm_trigger_irq.c
  *
  * 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/armv8-m/up_unblocktask.c b/arch/arm/src/armv8-m/arm_unblocktask.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_unblocktask.c
rename to arch/arm/src/armv8-m/arm_unblocktask.c
index 62d5533d790..80058cd21ae 100755
--- a/arch/arm/src/armv8-m/up_unblocktask.c
+++ b/arch/arm/src/armv8-m/arm_unblocktask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- *  arch/arm/src/armv8-m/up_unblocktask.c
+ *  arch/arm/src/armv8-m/arm_unblocktask.c
  *
  * 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/armv8-m/up_vectors.c b/arch/arm/src/armv8-m/arm_vectors.c
similarity index 98%
rename from arch/arm/src/armv8-m/up_vectors.c
rename to arch/arm/src/armv8-m/arm_vectors.c
index 04d2a6f8d18..620643dedc9 100755
--- a/arch/arm/src/armv8-m/up_vectors.c
+++ b/arch/arm/src/armv8-m/arm_vectors.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-m/up_vectors.c
+ * arch/arm/src/armv8-m/arm_vectors.c
  *
  *   Copyright (C) 2012 Michael Smith. All rights reserved.
  *