diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d93789db5a5..1ecf6c2bbdd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -71,18 +71,18 @@ config ISA_THUMB2
 	architecture-based processors.
 endmenu
 
-menu "BSP General Configuration"
+menu "Platform General Configuration"
 
 choice
-prompt "Minimum BSP Configuation Selection"
-default BSP_FSL_FRDM_K64F
+prompt "Minimum Platform Configuation Selection"
+default PLATFORM_FSL_FRDM_K64F
 
-config  BSP_FSL_FRDM_K64F
+config  PLATFORM_FSL_FRDM_K64F
 	bool "Minimum Configuration for FSL FRDM K64F"
 	select CPU_CORTEX_M4
 	select K20_UART
 
-config  BSP_TI_LM3S6965
+config  PLATFORM_TI_LM3S6965
 	bool "Minimum Configuration for a TI LM3S6965"
 	select CPU_CORTEX_M3
 	select STELLARIS_UART
@@ -93,11 +93,11 @@ endmenu
 
 source "arch/arm/bsp/CortexM/Kconfig"
 
-if BSP_TI_LM3S6965
+if PLATFORM_TI_LM3S6965
 source "arch/arm/ti_lm3s6965/Kconfig"
 endif
 
-if BSP_FSL_FRDM_K64F
+if PLATFORM_FSL_FRDM_K64F
 source "arch/arm/fsl_frdm_k64f/Kconfig"
 endif
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 8f2510d76e4..d03cbfe3a49 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,5 +1,5 @@
 obj-y = core/
 obj-y += bsp/
 
-obj-$(CONFIG_BSP_FSL_FRDM_K64F) += fsl_frdm_k64f/
-obj-$(CONFIG_BSP_TI_LM3S6965) += ti_lm3s6965/
+obj-$(CONFIG_PLATFORM_FSL_FRDM_K64F) += fsl_frdm_k64f/
+obj-$(CONFIG_PLATFORM_TI_LM3S6965) += ti_lm3s6965/
diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
index a25c82a25e8..da257b51e56 100644
--- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
@@ -77,10 +77,10 @@ CONFIG_ARM=y
 CONFIG_ISA_THUMB2=y
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-CONFIG_BSP_FSL_FRDM_K64F=y
-# CONFIG_BSP_TI_LM3S6965 is not set
+CONFIG_PLATFORM_FSL_FRDM_K64F=y
+# CONFIG_PLATFORM_TI_LM3S6965 is not set
 
 #
 # ARM Cortex CPU options
diff --git a/arch/arm/configs/micro_ti_lm3s6965_defconfig b/arch/arm/configs/micro_ti_lm3s6965_defconfig
index 34bad8e5876..9f2b9b72d62 100644
--- a/arch/arm/configs/micro_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/micro_ti_lm3s6965_defconfig
@@ -77,10 +77,10 @@ CONFIG_ARM=y
 CONFIG_ISA_THUMB2=y
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_FSL_FRDM_K64F is not set
-CONFIG_BSP_TI_LM3S6965=y
+# CONFIG_PLATFORM_FSL_FRDM_K64F is not set
+CONFIG_PLATFORM_TI_LM3S6965=y
 
 #
 # ARM Cortex CPU options
@@ -114,7 +114,7 @@ CONFIG_ARCH_HAS_TASK_ABORT=y
 CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
 CONFIG_PLATFORM="ti_lm3s6965"
 CONFIG_NUM_IRQS=34
-CONFIG_BSP_TI_LM3S6965_QEMU=y
+CONFIG_PLATFORM_TI_LM3S6965_QEMU=y
 
 #
 # Device Drivers
diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
index 81420da32d2..f4905863100 100644
--- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
@@ -56,10 +56,10 @@ CONFIG_ARM=y
 CONFIG_ISA_THUMB2=y
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-CONFIG_BSP_FSL_FRDM_K64F=y
-# CONFIG_BSP_TI_LM3S6965 is not set
+CONFIG_PLATFORM_FSL_FRDM_K64F=y
+# CONFIG_PLATFORM_TI_LM3S6965 is not set
 
 #
 # ARM Cortex CPU options
diff --git a/arch/arm/configs/nano_ti_lm3s6965_defconfig b/arch/arm/configs/nano_ti_lm3s6965_defconfig
index 232b09a6d12..c8bc5f42591 100644
--- a/arch/arm/configs/nano_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/nano_ti_lm3s6965_defconfig
@@ -56,10 +56,10 @@ CONFIG_ARM=y
 CONFIG_ISA_THUMB2=y
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_FSL_FRDM_K64F is not set
-CONFIG_BSP_TI_LM3S6965=y
+# CONFIG_PLATFORM_FSL_FRDM_K64F is not set
+CONFIG_PLATFORM_TI_LM3S6965=y
 
 #
 # ARM Cortex CPU options
@@ -93,7 +93,7 @@ CONFIG_ARCH_HAS_TASK_ABORT=y
 CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
 CONFIG_PLATFORM="ti_lm3s6965"
 CONFIG_NUM_IRQS=34
-CONFIG_BSP_TI_LM3S6965_QEMU=y
+CONFIG_PLATFORM_TI_LM3S6965_QEMU=y
 
 #
 # Device Drivers
diff --git a/arch/arm/defconfig b/arch/arm/defconfig
index a25c82a25e8..da257b51e56 100644
--- a/arch/arm/defconfig
+++ b/arch/arm/defconfig
@@ -77,10 +77,10 @@ CONFIG_ARM=y
 CONFIG_ISA_THUMB2=y
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-CONFIG_BSP_FSL_FRDM_K64F=y
-# CONFIG_BSP_TI_LM3S6965 is not set
+CONFIG_PLATFORM_FSL_FRDM_K64F=y
+# CONFIG_PLATFORM_TI_LM3S6965 is not set
 
 #
 # ARM Cortex CPU options
diff --git a/arch/arm/ti_lm3s6965/Kconfig b/arch/arm/ti_lm3s6965/Kconfig
index db1521c780f..c5f9c065d61 100644
--- a/arch/arm/ti_lm3s6965/Kconfig
+++ b/arch/arm/ti_lm3s6965/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - TI LM3S6965 BSP configuration options
+# Kconfig - TI LM3S6965 platform configuration options
 
 #
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
@@ -47,9 +47,9 @@ config NUM_IRQS
 	# - include the UART interrupts
 	default 34
 
-config BSP_TI_LM3S6965_QEMU
+config PLATFORM_TI_LM3S6965_QEMU
 	def_bool y
-	# BSP has only been tested on QEMU, not on real hardware, so always
+	# Platform has only been tested on QEMU, not on real hardware, so always
 	# assume it is used for a QEMU target.
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9868b895bae..7a1640d260e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -43,14 +43,14 @@ source "misc/Kconfig"
 
 source "arch/x86/core/Kconfig"
 
-menu "BSP General Configuration"
+menu "Platform General Configuration"
 
 choice
-prompt "BSP Configuration"
-default BSP_PCPENTIUM4
+prompt "Platform Configuration"
+default PLATFORM_PCPENTIUM4
 
-config BSP_ATOM_N28XX
-	bool "Minimum configuration for ATOM N28XX BSP"
+config PLATFORM_ATOM_N28XX
+	bool "Minimum configuration for ATOM N28XX platform"
 	select CPU_ATOM
 	select IOAPIC
 	select LOAPIC
@@ -60,10 +60,10 @@ config BSP_ATOM_N28XX
 	select EXTRA_SERIAL_PORT
 	select SERIAL_INTERRUPT_LEVEL
 	select CUSTOM_RANDOM_GENERATOR
-	select BSP_GENERIC_PC
+	select PLATFORM_GENERIC_PC
 
-config BSP_PCMINUTEIA
-	bool "Minimum configuration for MINUTE IA BSP"
+config PLATFORM_PCMINUTEIA
+	bool "Minimum configuration for MINUTE IA platform"
 	select CPU_MINUTEIA
 	select PIC
 	select PIT
@@ -71,10 +71,10 @@ config BSP_PCMINUTEIA
 	select EOI_HANDLER_SUPPORTED
 	select BOOTLOADER_UNKNOWN
 	select EXTRA_SERIAL_PORT
-	select BSP_GENERIC_PC
+	select PLATFORM_GENERIC_PC
 
-config BSP_PCPENTIUM4
-	bool "Minimum configuration for PENTIUM 4 BSP"
+config PLATFORM_PCPENTIUM4
+	bool "Minimum configuration for PENTIUM 4 platform"
 	select CPU_PENTIUM4
 	select PIC
 	select PIT
@@ -82,10 +82,10 @@ config BSP_PCPENTIUM4
 	select EOI_HANDLER_SUPPORTED
 	select BOOTLOADER_UNKNOWN
 	select EXTRA_SERIAL_PORT
-	select BSP_GENERIC_PC
+	select PLATFORM_GENERIC_PC
 
-config BSP_QUARK
-	bool "Minimum configuration for QUARK BSP"
+config PLATFORM_QUARK
+	bool "Minimum configuration for QUARK platform"
 	select CPU_MINUTEIA
 	select IOAPIC
 	select HPET_TIMER
@@ -98,7 +98,7 @@ config BSP_QUARK
 
 endchoice
 
-config BSP_GENERIC_PC
+config PLATFORM_GENERIC_PC
 	bool
 	default n
 	select NS16550
@@ -152,8 +152,8 @@ config CPU_MIGHT_SUPPORT_CLFLUSH
 	bool
 	default n
 	help
-	If a BSP uses a processor that possibly implements CLFLUSH, change
-	the default in that BSP's config file.
+	If a platform uses a processor that possibly implements CLFLUSH, change
+	the default in that platform's config file.
 
 #FIXME This options is not being used in the current code base.
 config CLFLUSH_INSTRUCTION_SUPPORTED
@@ -222,7 +222,7 @@ config CACHE_LINE_SIZE
 
 endmenu
 
-menu "Specific BSP Capability Support"
+menu "Specific Platform Capability Support"
 
 config NUM_DYNAMIC_STUBS
 	int "Number of dynamic int stubs"
@@ -367,11 +367,11 @@ config PCI_DEBUG
 
 endmenu
 
-if BSP_GENERIC_PC
+if PLATFORM_GENERIC_PC
 source "arch/x86/generic_pc/Kconfig"
 endif
 
-if BSP_QUARK
+if PLATFORM_QUARK
 source "arch/x86/quark/Kconfig"
 endif
 
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f3402bed54d..e0660d2c7bc 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -9,5 +9,5 @@ obj-$(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) += cache.o
 
 obj-y += core/
 obj-$(CONFIG_MICROKERNEL) += task/
-obj-$(CONFIG_BSP_QUARK) += quark/
-obj-$(CONFIG_BSP_GENERIC_PC) += generic_pc/
+obj-$(CONFIG_PLATFORM_QUARK) += quark/
+obj-$(CONFIG_PLATFORM_GENERIC_PC) += generic_pc/
diff --git a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
index 5f26f40741c..fca1565fc1a 100644
--- a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
+++ b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
@@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-CONFIG_BSP_ATOM_N28XX=y
-# CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+CONFIG_PLATFORM_ATOM_N28XX=y
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 CONFIG_CPU_ATOM=y
 # CONFIG_CPU_MINUTEIA is not set
 # CONFIG_CPU_PENTIUM4 is not set
@@ -123,7 +123,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=64
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/micro_generic_pc_defconfig b/arch/x86/configs/micro_generic_pc_defconfig
index ca8ae1b1b9d..1956d138731 100644
--- a/arch/x86/configs/micro_generic_pc_defconfig
+++ b/arch/x86/configs/micro_generic_pc_defconfig
@@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-CONFIG_BSP_PCPENTIUM4=y
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+CONFIG_PLATFORM_PCPENTIUM4=y
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 # CONFIG_CPU_ATOM is not set
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
@@ -123,7 +123,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=64
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/micro_generic_pc_minuteia_defconfig b/arch/x86/configs/micro_generic_pc_minuteia_defconfig
index 5f783d3122d..b246a3daf79 100644
--- a/arch/x86/configs/micro_generic_pc_minuteia_defconfig
+++ b/arch/x86/configs/micro_generic_pc_minuteia_defconfig
@@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-CONFIG_BSP_PCMINUTEIA=y
-# CONFIG_BSP_PCPENTIUM4 is not set
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+CONFIG_PLATFORM_PCMINUTEIA=y
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 # CONFIG_CPU_ATOM is not set
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
@@ -125,7 +125,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=0
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/micro_generic_pc_pentium4_defconfig b/arch/x86/configs/micro_generic_pc_pentium4_defconfig
index ca8ae1b1b9d..1956d138731 100644
--- a/arch/x86/configs/micro_generic_pc_pentium4_defconfig
+++ b/arch/x86/configs/micro_generic_pc_pentium4_defconfig
@@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-CONFIG_BSP_PCPENTIUM4=y
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+CONFIG_PLATFORM_PCPENTIUM4=y
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 # CONFIG_CPU_ATOM is not set
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
@@ -123,7 +123,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=64
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/micro_quark_defconfig b/arch/x86/configs/micro_quark_defconfig
index 9f3a29b1d48..fed202f15a7 100644
--- a/arch/x86/configs/micro_quark_defconfig
+++ b/arch/x86/configs/micro_quark_defconfig
@@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
-CONFIG_BSP_QUARK=y
-# CONFIG_BSP_GENERIC_PC is not set
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+CONFIG_PLATFORM_QUARK=y
+# CONFIG_PLATFORM_GENERIC_PC is not set
 # CONFIG_CPU_ATOM is not set
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
@@ -125,7 +125,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=0
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
index f1e2f66c3ec..f042827e651 100644
--- a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
+++ b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
@@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-CONFIG_BSP_ATOM_N28XX=y
-# CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+CONFIG_PLATFORM_ATOM_N28XX=y
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 CONFIG_CPU_ATOM=y
 # CONFIG_CPU_MINUTEIA is not set
 # CONFIG_CPU_PENTIUM4 is not set
@@ -102,7 +102,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=64
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/nano_generic_pc_defconfig b/arch/x86/configs/nano_generic_pc_defconfig
index 2a5eb1caeb5..57d7f7dae44 100644
--- a/arch/x86/configs/nano_generic_pc_defconfig
+++ b/arch/x86/configs/nano_generic_pc_defconfig
@@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-CONFIG_BSP_PCPENTIUM4=y
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+CONFIG_PLATFORM_PCPENTIUM4=y
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 # CONFIG_CPU_ATOM is not set
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
@@ -102,7 +102,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=64
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/nano_generic_pc_minuteia_defconfig b/arch/x86/configs/nano_generic_pc_minuteia_defconfig
index 545eb114b2b..ef266a699ad 100644
--- a/arch/x86/configs/nano_generic_pc_minuteia_defconfig
+++ b/arch/x86/configs/nano_generic_pc_minuteia_defconfig
@@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-CONFIG_BSP_PCMINUTEIA=y
-# CONFIG_BSP_PCPENTIUM4 is not set
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+CONFIG_PLATFORM_PCMINUTEIA=y
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 # CONFIG_CPU_ATOM is not set
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
@@ -104,7 +104,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=0
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/nano_generic_pc_pentium4_defconfig b/arch/x86/configs/nano_generic_pc_pentium4_defconfig
index 2a5eb1caeb5..57d7f7dae44 100644
--- a/arch/x86/configs/nano_generic_pc_pentium4_defconfig
+++ b/arch/x86/configs/nano_generic_pc_pentium4_defconfig
@@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-CONFIG_BSP_PCPENTIUM4=y
-# CONFIG_BSP_QUARK is not set
-CONFIG_BSP_GENERIC_PC=y
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+CONFIG_PLATFORM_PCPENTIUM4=y
+# CONFIG_PLATFORM_QUARK is not set
+CONFIG_PLATFORM_GENERIC_PC=y
 # CONFIG_CPU_ATOM is not set
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
@@ -102,7 +102,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=64
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/configs/nano_quark_defconfig b/arch/x86/configs/nano_quark_defconfig
index 1f46baa2f2b..d479d7aeb31 100644
--- a/arch/x86/configs/nano_quark_defconfig
+++ b/arch/x86/configs/nano_quark_defconfig
@@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
-CONFIG_BSP_QUARK=y
-# CONFIG_BSP_GENERIC_PC is not set
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+CONFIG_PLATFORM_QUARK=y
+# CONFIG_PLATFORM_GENERIC_PC is not set
 # CONFIG_CPU_ATOM is not set
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
@@ -104,7 +104,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=0
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/defconfig b/arch/x86/defconfig
index 9f3a29b1d48..fed202f15a7 100644
--- a/arch/x86/defconfig
+++ b/arch/x86/defconfig
@@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
 #
-# BSP General Configuration
+# Platform General Configuration
 #
-# CONFIG_BSP_ATOM_N28XX is not set
-# CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
-CONFIG_BSP_QUARK=y
-# CONFIG_BSP_GENERIC_PC is not set
+# CONFIG_PLATFORM_ATOM_N28XX is not set
+# CONFIG_PLATFORM_PCMINUTEIA is not set
+# CONFIG_PLATFORM_PCPENTIUM4 is not set
+CONFIG_PLATFORM_QUARK=y
+# CONFIG_PLATFORM_GENERIC_PC is not set
 # CONFIG_CPU_ATOM is not set
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
@@ -125,7 +125,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
 CONFIG_CACHE_LINE_SIZE=0
 
 #
-# Specific BSP Capability Support
+# Specific Platform Capability Support
 #
 CONFIG_NUM_DYNAMIC_STUBS=0
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
diff --git a/arch/x86/generic_pc/Kconfig b/arch/x86/generic_pc/Kconfig
index 437c347e157..dedeee9d42b 100644
--- a/arch/x86/generic_pc/Kconfig
+++ b/arch/x86/generic_pc/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - generic PC BSP configuration options
+# Kconfig - generic PC platform configuration options
 
 #
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
@@ -42,10 +42,10 @@ config PHYS_LOAD_ADDR
 
 config LOAPIC_TIMER_FREQ
 	default 150000000
-	depends on BSP_ATOM_N28XX
+	depends on PLATFORM_ATOM_N28XX
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 1193180   if BSP_PCPENTIUM4
-	default 150000000 if BSP_ATOM_N28XX
-	default 1193180   if BSP_PCMINUTEIA
+	default 1193180   if PLATFORM_PCPENTIUM4
+	default 150000000 if PLATFORM_ATOM_N28XX
+	default 1193180   if PLATFORM_PCMINUTEIA
 
diff --git a/include/arch/arm/CortexM/nvic.h b/include/arch/arm/CortexM/nvic.h
index 7d9c8f40ad9..aa7d028975c 100644
--- a/include/arch/arm/CortexM/nvic.h
+++ b/include/arch/arm/CortexM/nvic.h
@@ -224,7 +224,7 @@ static inline uint32_t _NvicIrqPrioGet(unsigned int irq /* IRQ number */
 static inline void _NvicSwInterruptTrigger(unsigned int irq /* IRQ number */
 					   )
 {
-#if defined(CONFIG_BSP_TI_LM3S6965_QEMU)
+#if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU)
 	/* the QEMU does not simulate the STIR register: this is a workaround */
 	_NvicIrqPend(irq);
 #else
diff --git a/samples/microkernel/test/test_tickless/src/test_tickless.c b/samples/microkernel/test/test_tickless/src/test_tickless.c
index 520d08a17f1..65d216583b9 100644
--- a/samples/microkernel/test/test_tickless/src/test_tickless.c
+++ b/samples/microkernel/test/test_tickless/src/test_tickless.c
@@ -66,7 +66,7 @@ typedef uint64_t _timer_res_t;
 
 #elif defined(CONFIG_ARM)
 
-#  if defined(CONFIG_BSP_TI_LM3S6965_QEMU)
+#  if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU)
 /* A bug in the QEMU ARMv7-M sysTick timer prevents tickless idle support */
 #error "This QEMU target does not support tickless idle!"
 #  endif
diff --git a/samples/microkernel/test/test_tickless/src/timestamps.c b/samples/microkernel/test/test_tickless/src/timestamps.c
index 297d3d93af3..d00a3c6d40e 100644
--- a/samples/microkernel/test/test_tickless/src/timestamps.c
+++ b/samples/microkernel/test/test_tickless/src/timestamps.c
@@ -38,7 +38,7 @@ BSP-specific timestamp support for the tickless idle test.
 #include <tc_util.h>
 #include <stddef.h>
 
-#if defined(CONFIG_BSP_TI_LM3S6965_QEMU)
+#if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU)
 /*
  * @brief Use a General Purpose Timer in
  * 32-bit periodic timer mode (down-counter)
@@ -161,7 +161,7 @@ void _TimestampClose(void)
 	_CLKGATECTRL &= ~_CLKGATECTRL_TIMESTAMP_EN;
 }
 
-#elif defined(CONFIG_BSP_FSL_FRDM_K64F)
+#elif defined(CONFIG_PLATFORM_FSL_FRDM_K64F)
 /* Freescale FRDM-K64F target - use RTC (prescale value) */
 
 #define _COUNTDOWN_TIMER false
diff --git a/scripts/Makefile.x86.preparch b/scripts/Makefile.x86.preparch
index 032c7609b96..10883feecdb 100644
--- a/scripts/Makefile.x86.preparch
+++ b/scripts/Makefile.x86.preparch
@@ -6,7 +6,7 @@ PERF_OPT=$(if $(filter -Os,$(DEFAULTFLAGS)),,y)
 PERF_OPT_FLAG = $(PERF_OPT_FLAG-$(PERF_OPT))
 ALIGN_STACK_FLAG = $(ALIGN_STACK_FLAG-$(PERF_OPT))
 LTO_FLAG = $(LTO_FLAG-$(CONFIG_LTO))
-ifneq ($(CONFIG_BSP_QUARK),y)
+ifneq ($(CONFIG_PLATFORM_QUARK),y)
 iSSE_FP_MATH_ ?= -mno-sse
 iSSE_FP_MATH  ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}}
 endif