diff --git a/arch/arm/src/armv7-a/arm_copyarmstate.c b/arch/arm/src/armv7-a/arm_copyarmstate.c
index 9c8a7797af..5684873766 100644
--- a/arch/arm/src/armv7-a/arm_copyarmstate.c
+++ b/arch/arm/src/armv7-a/arm_copyarmstate.c
@@ -47,18 +47,6 @@
 
 #ifdef CONFIG_ARCH_FPU
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -76,7 +64,7 @@ void up_copyarmstate(uint32_t *dest, uint32_t *src)
 {
   int i;
 
-  /* In the Cortex-M model, the state is copied from the stack to the TCB,
+  /* In the Cortex-A model, the state is copied from the stack to the TCB,
    * but only a reference is passed to get the state from the TCB.  So the
    * following check avoids copying the TCB save area onto itself:
    */
diff --git a/arch/arm/src/armv7-a/svcall.h b/arch/arm/src/armv7-a/svcall.h
index 513299c170..9e3c679e89 100644
--- a/arch/arm/src/armv7-a/svcall.h
+++ b/arch/arm/src/armv7-a/svcall.h
@@ -72,7 +72,7 @@
 #  endif
 #endif
 
-/* Cortex M3 system calls ***********************************************************/
+/* Cortex-A system calls ************************************************************/
 
 /* SYS call 0:
  *
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index 990e30aa1d..fa17d4fe3f 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_COMMON_CORTEXM_MPU_H
-#define __ARCH_ARM_SRC_COMMON_CORTEXM_MPU_H
+#ifndef __ARCH_ARM_SRC_ARMV7M_MPU_H
+#define __ARCH_ARM_SRC_ARMV7M_MPU_H
 
 /************************************************************************************
  * Included Files
@@ -570,5 +570,5 @@ static inline void mpu_peripheral(uintptr_t base, size_t size)
 #endif
 
 #endif  /* __ASSEMBLY__ */
-#endif  /* __ARCH_ARM_SRC_COMMON_CORTEXM_MPU_H */
+#endif  /* __ARCH_ARM_SRC_ARMV7M_MPU_H */
 
diff --git a/arch/arm/src/armv7-m/svcall.h b/arch/arm/src/armv7-m/svcall.h
index f9f85c597a..cc2b2716b2 100644
--- a/arch/arm/src/armv7-m/svcall.h
+++ b/arch/arm/src/armv7-m/svcall.h
@@ -72,7 +72,7 @@
 #  endif
 #endif
 
-/* Cortex M3 system calls ***********************************************************/
+/* Cortex-M system calls ************************************************************/
 
 /* SYS call 0:
  *