diff --git a/libs/libc/machine/arm/Kconfig b/libs/libc/machine/arm/Kconfig
index a56ac5707e..6adc22cf06 100644
--- a/libs/libc/machine/arm/Kconfig
+++ b/libs/libc/machine/arm/Kconfig
@@ -25,5 +25,5 @@ source libs/libc/machine/arm/armv7-m/Kconfig
 endif
 
 if ARCH_ARMV8M
-source libs/libc/machine/arm/armv8/Kconfig
+source libs/libc/machine/arm/armv8-m/Kconfig
 endif
diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs
index 89e008e887..dfdaee667e 100644
--- a/libs/libc/machine/arm/Make.defs
+++ b/libs/libc/machine/arm/Make.defs
@@ -54,7 +54,7 @@ include $(TOPDIR)/libs/libc/machine/arm/armv6-m/Make.defs
 else ifeq ($(CONFIG_ARCH_ARMV7M),y)     # All ARMv7-M
 include $(TOPDIR)/libs/libc/machine/arm/armv7-m/Make.defs
 else ifeq ($(CONFIG_ARCH_ARMV8M),y)     # All ARMv8-M
-include $(TOPDIR)/libs/libc/machine/arm/armv8/Make.defs
+include $(TOPDIR)/libs/libc/machine/arm/armv8-m/Make.defs
 endif
 
 ifeq ($(CONFIG_CXX_EXCEPTION),y)
diff --git a/libs/libc/machine/arm/armv8/Kconfig b/libs/libc/machine/arm/armv8-m/Kconfig
similarity index 97%
rename from libs/libc/machine/arm/armv8/Kconfig
rename to libs/libc/machine/arm/armv8-m/Kconfig
index dab8132cf3..825ee73d90 100644
--- a/libs/libc/machine/arm/armv8/Kconfig
+++ b/libs/libc/machine/arm/armv8-m/Kconfig
@@ -5,7 +5,7 @@
 
 if ARCH_ARMV8M
 
-config ARMV8_LIBM
+config ARMV8M_LIBM
 	bool "Architecture specific optimizations"
 	default n
 	select LIBM_ARCH_CEIL if CONFIG_ARCH_DPFPU
diff --git a/libs/libc/machine/arm/armv8/Make.defs b/libs/libc/machine/arm/armv8-m/Make.defs
similarity index 93%
rename from libs/libc/machine/arm/armv8/Make.defs
rename to libs/libc/machine/arm/armv8-m/Make.defs
index 8e306f5878..f2bdda50f4 100644
--- a/libs/libc/machine/arm/armv8/Make.defs
+++ b/libs/libc/machine/arm/armv8-m/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# libs/libc/machine/arm/armv8/Make.defs
+# libs/libc/machine/arm/armv8-m/Make.defs
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_ARMV8_LIBM),y)
+ifeq ($(CONFIG_ARMV8M_LIBM),y)
 
 ifeq ($(LIBM_ARCH_CEIL),y)
 CSRCS += arch_ceil.c
@@ -83,7 +83,7 @@ ifeq ($(LIBM_ARCH_TRUNC),y)
 CSRCS += arch_trunc.c
 endif
 
-DEPPATH += --dep-path machine/arm/armv8
-VPATH += :machine/arm/armv8
+DEPPATH += --dep-path machine/arm/armv8-m
+VPATH += :machine/arm/armv8-m
 
-endif # CONFIG_ARMV8_LIBM
+endif # CONFIG_ARMV8M_LIBM
diff --git a/libs/libc/machine/arm/armv8/arch_ceil.c b/libs/libc/machine/arm/armv8-m/arch_ceil.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_ceil.c
rename to libs/libc/machine/arm/armv8-m/arch_ceil.c
index bca708ea4b..9394fdeb27 100644
--- a/libs/libc/machine/arm/armv8/arch_ceil.c
+++ b/libs/libc/machine/arm/armv8-m/arch_ceil.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_ceil.c
+ * libs/libc/machine/arm/armv8-m/arch_ceil.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_ceilf.c b/libs/libc/machine/arm/armv8-m/arch_ceilf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_ceilf.c
rename to libs/libc/machine/arm/armv8-m/arch_ceilf.c
index c5cff28e95..490c4ca597 100644
--- a/libs/libc/machine/arm/armv8/arch_ceilf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_ceilf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_ceilf.c
+ * libs/libc/machine/arm/armv8-m/arch_ceilf.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_floor.c b/libs/libc/machine/arm/armv8-m/arch_floor.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_floor.c
rename to libs/libc/machine/arm/armv8-m/arch_floor.c
index e401226034..f9a0b9ccb4 100644
--- a/libs/libc/machine/arm/armv8/arch_floor.c
+++ b/libs/libc/machine/arm/armv8-m/arch_floor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_floor.c
+ * libs/libc/machine/arm/armv8-m/arch_floor.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_floorf.c b/libs/libc/machine/arm/armv8-m/arch_floorf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_floorf.c
rename to libs/libc/machine/arm/armv8-m/arch_floorf.c
index b9dc9c2ff1..6adb6787f6 100644
--- a/libs/libc/machine/arm/armv8/arch_floorf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_floorf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_floorf.c
+ * libs/libc/machine/arm/armv8-m/arch_floorf.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_nearbyint.c b/libs/libc/machine/arm/armv8-m/arch_nearbyint.c
similarity index 97%
rename from libs/libc/machine/arm/armv8/arch_nearbyint.c
rename to libs/libc/machine/arm/armv8-m/arch_nearbyint.c
index a4fae9b312..701e787a29 100644
--- a/libs/libc/machine/arm/armv8/arch_nearbyint.c
+++ b/libs/libc/machine/arm/armv8-m/arch_nearbyint.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_nearbyint.c
+ * libs/libc/machine/arm/armv8-m/arch_nearbyint.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_nearbyintf.c b/libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
similarity index 97%
rename from libs/libc/machine/arm/armv8/arch_nearbyintf.c
rename to libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
index c00c84835a..67690660da 100644
--- a/libs/libc/machine/arm/armv8/arch_nearbyintf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_nearbyintf.c
+ * libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_rint.c b/libs/libc/machine/arm/armv8-m/arch_rint.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_rint.c
rename to libs/libc/machine/arm/armv8-m/arch_rint.c
index 8e9094124f..b3b9d31e96 100644
--- a/libs/libc/machine/arm/armv8/arch_rint.c
+++ b/libs/libc/machine/arm/armv8-m/arch_rint.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_rint.c
+ * libs/libc/machine/arm/armv8-m/arch_rint.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_rintf.c b/libs/libc/machine/arm/armv8-m/arch_rintf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_rintf.c
rename to libs/libc/machine/arm/armv8-m/arch_rintf.c
index 76ae43dd29..7c57f922c9 100644
--- a/libs/libc/machine/arm/armv8/arch_rintf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_rintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_rintf.c
+ * libs/libc/machine/arm/armv8-m/arch_rintf.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_round.c b/libs/libc/machine/arm/armv8-m/arch_round.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_round.c
rename to libs/libc/machine/arm/armv8-m/arch_round.c
index fd890cd1b7..969a859612 100644
--- a/libs/libc/machine/arm/armv8/arch_round.c
+++ b/libs/libc/machine/arm/armv8-m/arch_round.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_round.c
+ * libs/libc/machine/arm/armv8-m/arch_round.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_roundf.c b/libs/libc/machine/arm/armv8-m/arch_roundf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_roundf.c
rename to libs/libc/machine/arm/armv8-m/arch_roundf.c
index b791d32262..6e9a85c674 100644
--- a/libs/libc/machine/arm/armv8/arch_roundf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_roundf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_roundf.c
+ * libs/libc/machine/arm/armv8-m/arch_roundf.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_trunc.c b/libs/libc/machine/arm/armv8-m/arch_trunc.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_trunc.c
rename to libs/libc/machine/arm/armv8-m/arch_trunc.c
index a8845baf56..2929b6d61c 100644
--- a/libs/libc/machine/arm/armv8/arch_trunc.c
+++ b/libs/libc/machine/arm/armv8-m/arch_trunc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_trunc.c
+ * libs/libc/machine/arm/armv8-m/arch_trunc.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
diff --git a/libs/libc/machine/arm/armv8/arch_truncf.c b/libs/libc/machine/arm/armv8-m/arch_truncf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_truncf.c
rename to libs/libc/machine/arm/armv8-m/arch_truncf.c
index 470ece383a..5d513440b5 100644
--- a/libs/libc/machine/arm/armv8/arch_truncf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_truncf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv8/arch_truncf.c
+ * libs/libc/machine/arm/armv8-m/arch_truncf.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *