diff --git a/features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_lowpan_border_router.ar b/features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_lowpan_border_router.ar
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_lowpan_border_router.ar
rename to features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_lowpan_border_router.ar
diff --git a/features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_border_router.a b/features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_border_router.a
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_border_router.a
rename to features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_border_router.a
diff --git a/features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_lowpan_border_router.a b/features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_lowpan_border_router.a
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_lowpan_border_router.a
rename to features/nanostack/FEATURE_LOWPAN_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_lowpan_border_router.a
diff --git a/features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_lowpan_host.ar b/features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_lowpan_host.ar
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_lowpan_host.ar
rename to features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_lowpan_host.ar
diff --git a/features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_host.a b/features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_host.a
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_host.a
rename to features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_host.a
diff --git a/features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_lowpan_host.a b/features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_lowpan_host.a
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_lowpan_host.a
rename to features/nanostack/FEATURE_LOWPAN_HOST/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_lowpan_host.a
diff --git a/features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_lowpan_router.ar b/features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_lowpan_router.ar
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_lowpan_router.ar
rename to features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_lowpan_router.ar
diff --git a/features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_router.a b/features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_router.a
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_router.a
rename to features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_lowpan_router.a
diff --git a/features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_lowpan_router.a b/features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_lowpan_router.a
similarity index 100%
rename from features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_lowpan_router.a
rename to features/nanostack/FEATURE_LOWPAN_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_lowpan_router.a
diff --git a/features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_nanostack_full.ar b/features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_nanostack_full.ar
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_nanostack_full.ar
rename to features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_nanostack_full.ar
diff --git a/features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_nanostack_full.a b/features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_nanostack_full.a
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_nanostack_full.a
rename to features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_nanostack_full.a
diff --git a/features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_nanostack_full.a b/features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_nanostack_full.a
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_nanostack_full.a
rename to features/nanostack/FEATURE_NANOSTACK_FULL/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_nanostack_full.a
diff --git a/features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_thread_border_router.ar b/features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_thread_border_router.ar
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_thread_border_router.ar
rename to features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_thread_border_router.ar
diff --git a/features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_border_router.a b/features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_border_router.a
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_border_router.a
rename to features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_border_router.a
diff --git a/features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_thread_border_router.a b/features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_thread_border_router.a
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_thread_border_router.a
rename to features/nanostack/FEATURE_THREAD_BORDER_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_thread_border_router.a
diff --git a/features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_thread_end_device.ar b/features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_thread_end_device.ar
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_thread_end_device.ar
rename to features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_thread_end_device.ar
diff --git a/features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_end_device.a b/features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_end_device.a
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_end_device.a
rename to features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_end_device.a
diff --git a/features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_thread_end_device.a b/features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_thread_end_device.a
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_thread_end_device.a
rename to features/nanostack/FEATURE_THREAD_END_DEVICE/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_thread_end_device.a
diff --git a/features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_thread_router.ar b/features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_thread_router.ar
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_ARM/TARGET_CORTEX_M3/libnanostack_armcc_Cortex-M3_thread_router.ar
rename to features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_ARM/TARGET_M3/libnanostack_armcc_Cortex-M3_thread_router.ar
diff --git a/features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_router.a b/features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_router.a
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_GCC/TARGET_CORTEX_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_router.a
rename to features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_GCC/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3_thread_router.a
diff --git a/features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_thread_router.a b/features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_thread_router.a
similarity index 100%
rename from features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_IAR/TARGET_CORTEX_M3/libnanostack_iccarm_Cortex-M3_thread_router.a
rename to features/nanostack/FEATURE_THREAD_ROUTER/TOOLCHAIN_IAR/TARGET_M3/libnanostack_iccarm_Cortex-M3_thread_router.a