diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 3d1556afa2e..a2fbe97fd94 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -169,56 +169,56 @@ config ICCM_SIZE
 	int "ICCM Size in kB"
 	help
 	This option specifies the size of the ICCM in kB.  It is normally set by
-	the platform's defconfig file and the user should generally avoid modifying
+	the board's defconfig file and the user should generally avoid modifying
 	it via the menu configuration.
 
 config ICCM_BASE_ADDRESS
 	hex "ICCM Base Address"
 	help
-	This option specifies the base address of the ICCM on the platform.  It is
-	normally set by the platform's defconfig file and the user should generally
+	This option specifies the base address of the ICCM on the board.  It is
+	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
 
 config DCCM_SIZE
 	int "DCCM Size in kB"
 	help
 	This option specifies the size of the DCCM in kB.  It is normally set by
-	the platform's defconfig file and the user should generally avoid modifying
+	the board's defconfig file and the user should generally avoid modifying
 	it via the menu configuration.
 
 config DCCM_BASE_ADDRESS
 	hex "DCCM Base Address"
 	help
-	This option specifies the base address of the DCCM on the platform.  It is
-	normally set by the platform's defconfig file and the user should generally
+	This option specifies the base address of the DCCM on the board.  It is
+	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
 
 config SRAM_SIZE
 	int "SRAM Size in kB"
 	help
 	This option specifies the size of the SRAM in kB.  It is normally set by
-	the platform's defconfig file and the user should generally avoid modifying
+	the board's defconfig file and the user should generally avoid modifying
 	it via the menu configuration.
 
 config SRAM_BASE_ADDRESS
 	hex "SRAM Base Address"
 	help
-	This option specifies the base address of the SRAM on the platform.  It is
-	normally set by the platform's defconfig file and the user should generally
+	This option specifies the base address of the SRAM on the board.  It is
+	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
 
 config FLASH_SIZE
 	int "Flash Size in kB"
 	help
 	This option specifies the size of the flash in kB.  It is normally set by
-	the platform's defconfig file and the user should generally avoid modifying
+	the board's defconfig file and the user should generally avoid modifying
 	it via the menu configuration.
 
 config FLASH_BASE_ADDRESS
 	hex "Flash Base Address"
 	help
-	This option specifies the base address of the flash on the platform.  It is
-	normally set by the platform's defconfig file and the user should generally
+	This option specifies the base address of the flash on the board.  It is
+	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
 
 config SW_ISR_TABLE
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b9fa36b9528..034f3bc0b21 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -37,7 +37,7 @@ config ARCH_DEFCONFIG
 
 source "arch/arm/core/Kconfig"
 
-menu "Platform Configuration"
+menu "Board Configuration"
 
 source "arch/arm/soc/*/Kconfig"
 
diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig
index 0c59648adcc..69793431c36 100644
--- a/arch/arm/core/cortex_m/Kconfig
+++ b/arch/arm/core/cortex_m/Kconfig
@@ -79,7 +79,7 @@ config DATA_ENDIANNESS_LITTLE
 	default y
 	help
 	This is driven by the processor implementation, since it is fixed in
-	hardware. The platform should set this value to 'n' if the data is
+	hardware. The board should set this value to 'n' if the data is
 	implemented as big endian.
 
 config STACK_ALIGN_DOUBLE_WORD
@@ -92,12 +92,12 @@ config STACK_ALIGN_DOUBLE_WORD
 
 config NUM_IRQ_PRIO_BITS
 	int
-	#hidden option, implemented by platform
+	#hidden option, implemented by board
 	help
 	Cortex-M chips can implement up to 8 bits of interrupt priorities,
 	for a maximum of 256 priorities. Most chips implement fewer than 8.
 
-	The platform must define the correct value.
+	The board must define the correct value.
 
 config RUNTIME_NMI
 	bool
@@ -132,28 +132,28 @@ config SRAM_SIZE
 	int "SRAM Size in kB"
 	help
 	This option specifies the size of the SRAM in kB.  It is normally set by
-	the platform's defconfig file and the user should generally avoid modifying
+	the board's defconfig file and the user should generally avoid modifying
 	it via the menu configuration.
 
 config SRAM_BASE_ADDRESS
 	hex "SRAM Base Address"
 	help
-	This option specifies the base address of the SRAM on the platform.  It is
-	normally set by the platform's defconfig file and the user should generally
+	This option specifies the base address of the SRAM on the board.  It is
+	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
 
 config FLASH_SIZE
 	int "Flash Size in kB"
 	help
 	This option specifies the size of the flash in kB.  It is normally set by
-	the platform's defconfig file and the user should generally avoid modifying
+	the board's defconfig file and the user should generally avoid modifying
 	it via the menu configuration.
 
 config FLASH_BASE_ADDRESS
 	hex "Flash Base Address"
 	help
-	This option specifies the base address of the flash on the platform.  It is
-	normally set by the platform's defconfig file and the user should generally
+	This option specifies the base address of the flash on the board.  It is
+	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
 endmenu
 
@@ -197,7 +197,7 @@ config IRQ_VECTOR_TABLE_CUSTOM
 	depends on !SW_ISR_TABLE
 	default n
 	help
-	Projects, not the platform, provide the IRQ part of the vector table.
+	Projects, not the board, provide the IRQ part of the vector table.
 
 	This is the table of interrupt handlers with the best potential
 	performance, but is the less flexible.
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index bba4057657e..4fd4745eeaa 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -113,7 +113,7 @@ config GP_ALL_DATA
 	bool "All data global pointer references"
 	help
 	Use GP relative access for all data in the program, not just
-	small data. Use this if your platform has 64K or less of RAM.
+	small data. Use this if your board has 64K or less of RAM.
 
 endchoice
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7c567c86e21..fdd3ab88052 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -236,7 +236,7 @@ config CACHE_FLUSHING
 	runtime.
 endmenu
 
-menu "Platform Capabilities"
+menu "Board Capabilities"
 config NUM_DYNAMIC_STUBS
 	int "Number of dynamic int stubs"
 	default 0
diff --git a/arch/x86/core/Kconfig b/arch/x86/core/Kconfig
index e059d4a6e28..6e5e8f58ee4 100644
--- a/arch/x86/core/Kconfig
+++ b/arch/x86/core/Kconfig
@@ -81,7 +81,7 @@ config RAM_SIZE
 	sections.  When not running an XIP kernel, it must be large enough to
 	contain the full image.
 
-	The default value is specified by the platform.
+	The default value is specified by the board.
 
 config ROM_SIZE
 	int "Amount of ROM given to the kernel (in kB)" if XIP
@@ -90,7 +90,7 @@ config ROM_SIZE
 	not exceed the amount available on the target.  It must also be large
 	enough to contain the full image.
 
-	The default value is specified by the platform.
+	The default value is specified by the board.
 
 config SET_GDT
 	bool
diff --git a/drivers/gpio/Kconfig.qmsi b/drivers/gpio/Kconfig.qmsi
index 1b65944af69..5dc3c93ccbc 100644
--- a/drivers/gpio/Kconfig.qmsi
+++ b/drivers/gpio/Kconfig.qmsi
@@ -22,7 +22,7 @@ menuconfig GPIO_QMSI
 	default n
 	help
 	  Enable the GPIO driver found on Intel Microcontroller
-	  platforms, using the QMSI library.
+	  boards, using the QMSI library.
 
 if GPIO_QMSI
 
diff --git a/drivers/gpio/Kconfig.sch b/drivers/gpio/Kconfig.sch
index 68396555f84..d080b4086ed 100644
--- a/drivers/gpio/Kconfig.sch
+++ b/drivers/gpio/Kconfig.sch
@@ -21,7 +21,7 @@ menuconfig GPIO_SCH
 	depends on GPIO
 	default n
 	help
-	  Enable the SCH GPIO driver found on Intel platforms
+	  Enable the SCH GPIO driver found on Intel boards
 
 if GPIO_SCH
 
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 7c7a98ce66a..4f221908fb6 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -33,7 +33,7 @@ config I2C_DW
 	depends on I2C
 	default n
 	help
-	Enable Design Ware I2C support on the selected platform
+	Enable Design Ware I2C support on the selected board
 
 config I2C_QUARK_SE_SS
 	bool "I2C Driver for Quark SE Sensor Subsystem (SS)"
diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig
index f8f47b2ac3a..19def009e12 100644
--- a/drivers/pinmux/Kconfig
+++ b/drivers/pinmux/Kconfig
@@ -20,7 +20,7 @@
 # PinMux options
 #
 menuconfig PINMUX
-	bool "Enable platform pinmux driver"
+	bool "Enable board pinmux driver"
 	default n
 
 if PINMUX
diff --git a/drivers/pinmux/dev/Kconfig b/drivers/pinmux/dev/Kconfig
index 2084b59e992..a19d420415c 100644
--- a/drivers/pinmux/dev/Kconfig
+++ b/drivers/pinmux/dev/Kconfig
@@ -66,7 +66,7 @@ config PINMUX_DEV_QMSI
 	bool "Enable QMSI pinmux dev driver"
 	depends on PINMUX_DEV && QMSI
 	help
-	Enables the pinmux dev driver for QMSI supported platforms.
+	Enables the pinmux dev driver for QMSI supported boards.
 	default n
 
 config PINMUX_DEV_STM32
diff --git a/drivers/random/Kconfig b/drivers/random/Kconfig
index 20d39617c95..9921f623b6a 100644
--- a/drivers/random/Kconfig
+++ b/drivers/random/Kconfig
@@ -44,7 +44,7 @@ config X86_TSC_RANDOM_GENERATOR
 	default y
 	help
 	  This options enables number generator based on timestamp counter
-	  of x86 platform, obtained with rdtsc instruction.
+	  of x86 boards, obtained with rdtsc instruction.
 
 config TIMER_RANDOM_GENERATOR
 	bool
diff --git a/drivers/serial/Kconfig.k20 b/drivers/serial/Kconfig.k20
index 9d213651f00..34302fd95db 100644
--- a/drivers/serial/Kconfig.k20
+++ b/drivers/serial/Kconfig.k20
@@ -5,7 +5,7 @@ menuconfig UART_K20
 	help
 	This option enables the K20 serial driver.
 	This specific driver can be used for the serial hardware
-	available at the Freescale FRDM K64F platform.
+	available at the Freescale FRDM K64F board.
 
 # ---------- Port 0 ----------
 
diff --git a/drivers/serial/Kconfig.ns16550 b/drivers/serial/Kconfig.ns16550
index b06992fceb7..6aa839b1986 100644
--- a/drivers/serial/Kconfig.ns16550
+++ b/drivers/serial/Kconfig.ns16550
@@ -5,7 +5,7 @@ menuconfig UART_NS16550
 	help
 	  This option enables the NS16550 serial driver.
 	  This driver can be used for the serial hardware
-	  available on x86 platforms.
+	  available on x86 boards.
 
 config UART_NS16550_PCI
 	bool "Enable PCI Support"
diff --git a/drivers/serial/Kconfig.stellaris b/drivers/serial/Kconfig.stellaris
index 9f74f2a96c4..ad4cd123aec 100644
--- a/drivers/serial/Kconfig.stellaris
+++ b/drivers/serial/Kconfig.stellaris
@@ -5,7 +5,7 @@ menuconfig UART_STELLARIS
 	help
 	This option enables the Stellaris serial driver.
 	This specific driver can be used for the serial hardware
-	available at the Texas Instrument LM3S6965 platform.
+	available at the Texas Instrument LM3S6965 board.
 
 # ---------- Port 0 ----------
 
diff --git a/include/ipm.h b/include/ipm.h
index 5f35e7ec13a..584b3e08b78 100644
--- a/include/ipm.h
+++ b/include/ipm.h
@@ -123,7 +123,7 @@ struct ipm_driver_api {
  * @param ipmdev Driver instance
  * @param wait Time to busy-wait for remote to consume the message.
  * @param id Message identifier. Values are constrained by
- *        @a ipm_max_data_size_get since many platforms only allow for a
+ *        @a ipm_max_data_size_get since many boards only allow for a
  *        subset of bits in a 32-bit register to store the ID.
  * @param data Pointer to the data sent in the message.
  * @param size Size of the data.
diff --git a/include/misc/kernel_event_logger.h b/include/misc/kernel_event_logger.h
index 76159a61391..13ed66b6df3 100644
--- a/include/misc/kernel_event_logger.h
+++ b/include/misc/kernel_event_logger.h
@@ -86,7 +86,7 @@ static inline uint32_t _sys_k_get_time(void)
  * @details Calling this function permits to set the function
  * to be called by kernel event logger for setting the event
  * timestamp. By default, kernel event logger is using the
- * system timer. But on some platforms where the timer driver
+ * system timer. But on some boards where the timer driver
  * maintains the system timer cycle accumulator in software,
  * such as ones using the LOAPIC timer, the system timer behavior
  * leads to timestamp errors. For example, the timer interrupt is
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 8987691b264..14af5db7edd 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -41,7 +41,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int "System clock's h/w timer frequency"
 	help
 	This option specifies the frequency of the hardware timer used for the
-	system clock (in Hz). This option is set by the platform's Kconfig file
+	system clock (in Hz). This option is set by the board's Kconfig file
 	and the user should generally avoid modifying it via the menu configuration.
 
 config SYS_CLOCK_EXISTS
@@ -68,7 +68,7 @@ config XIP
 	prompt "Execute in place"
 	help
 	  This option allows the kernel to operate with its text and read-only
-	  sections residing in ROM (or similar read-only memory). Not all platforms
+	  sections residing in ROM (or similar read-only memory). Not all boards
 	  support this option so it must be used with care; you must also
 	  supply a linker command file when building your image. Enabling this
 	  option increases both the code and data footprint of the image.
@@ -215,7 +215,7 @@ config SYS_POWER_MANAGEMENT
 	prompt "Power management"
 	default n
 	help
-	This option enables the platform to implement extra power management
+	This option enables the board to implement extra power management
 	policies whenever the kernel becomes idle. The kernel informs the
 	power management subsystem of the number of ticks until the next kernel
 	timer is due to expire.
diff --git a/kernel/nanokernel/Kconfig b/kernel/nanokernel/Kconfig
index 4562aa1d0d1..c2ab31cbbd5 100644
--- a/kernel/nanokernel/Kconfig
+++ b/kernel/nanokernel/Kconfig
@@ -41,7 +41,7 @@ config INT_LATENCY_BENCHMARK
 	depends on ARCH="x86"
 	help
 	This option enables the tracking of interrupt latency metrics;
-	the exact set of metrics being tracked is platform-dependent.
+	the exact set of metrics being tracked is board-dependent.
 	Tracking begins when int_latency_init() is invoked by an application.
 	The metrics are displayed (and a new sampling interval is started)
 	each time int_latency_show() is called thereafter.
diff --git a/misc/Kconfig b/misc/Kconfig
index 0aa78984987..ab87a2abe9f 100644
--- a/misc/Kconfig
+++ b/misc/Kconfig
@@ -37,7 +37,7 @@ config CUSTOM_LINKER_SCRIPT
 	depends on HAVE_CUSTOM_LINKER_SCRIPT
 	help
 	Path to the linker script to be used instead of the one define by the
-	platform.
+	board.
 
 	The linker script must be based on a version provided by Zephyr since
 	the kernel can expect a certain layout/certain regions.
@@ -381,7 +381,7 @@ config BOOTLOADER_UNKNOWN
 	This option signifies that the target has a generic bootloader
 	or that it supports multiple ways of booting and it isn't clear
 	at build time which method is to be used. When this option is enabled
-	the platform may have to do extra work to ensure a proper startup.
+	the board may have to do extra work to ensure a proper startup.
 
 config REBOOT
 	bool "Reboot functionality"
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index a361b0567b1..b3f36f01b4c 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -307,7 +307,7 @@ config BLUETOOTH_DEBUG_MONITOR
 	  on the host side that can decode this protocol. Currently
 	  the 'btmon' tool from BlueZ is capable of doing this.
 
-	  If the target platform has two or more external UARTs it is
+	  If the target board has two or more external UARTs it is
 	  possible to keep using UART_CONSOLE together with this option,
 	  however if there is only a single external UART then
 	  UART_CONSOLE needs to be disabled (in which case printk/printf