diff --git a/boards/x86/rpl_crb/CMakeLists.txt b/boards/x86/intel_rpl/CMakeLists.txt
similarity index 86%
rename from boards/x86/rpl_crb/CMakeLists.txt
rename to boards/x86/intel_rpl/CMakeLists.txt
index 7db36d8d7cc..184ac384c2f 100644
--- a/boards/x86/rpl_crb/CMakeLists.txt
+++ b/boards/x86/intel_rpl/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Create an EFI image
-if(CONFIG_BOARD_RPL_CRB AND CONFIG_BUILD_OUTPUT_EFI)
+if(CONFIG_BOARD_INTEL_RPL_S_CRB AND CONFIG_BUILD_OUTPUT_EFI)
 set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
diff --git a/boards/x86/rpl_crb/Kconfig.board b/boards/x86/intel_rpl/Kconfig.board
similarity index 73%
rename from boards/x86/rpl_crb/Kconfig.board
rename to boards/x86/intel_rpl/Kconfig.board
index 19d4f8b47a0..f806be34a88 100644
--- a/boards/x86/rpl_crb/Kconfig.board
+++ b/boards/x86/intel_rpl/Kconfig.board
@@ -1,8 +1,8 @@
 # Copyright (c) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_RPL_CRB
-	bool "Raptor Lake CRB"
+config BOARD_INTEL_RPL_S_CRB
+	bool "Raptor Lake S CRB"
 	depends on SOC_RAPTOR_LAKE
 	select X86_64
 	select HAS_COVERAGE_SUPPORT
diff --git a/boards/x86/rpl_crb/Kconfig.defconfig b/boards/x86/intel_rpl/Kconfig.defconfig
similarity index 86%
rename from boards/x86/rpl_crb/Kconfig.defconfig
rename to boards/x86/intel_rpl/Kconfig.defconfig
index b8d9d4ba608..ee81baa21f3 100644
--- a/boards/x86/rpl_crb/Kconfig.defconfig
+++ b/boards/x86/intel_rpl/Kconfig.defconfig
@@ -1,10 +1,10 @@
 # Copyright (c) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_RPL_CRB
+if BOARD_INTEL_RPL_S_CRB
 
 config BOARD
-	default "rpl_crb"
+	default "intel_rpl_s_crb"
 
 config BUILD_OUTPUT_STRIPPED
 	default y
@@ -34,4 +34,4 @@ config SHELL_STACK_SIZE
 	default 320000
 endif
 
-endif # BOARD_RPL_CRB
+endif # BOARD_INTEL_RPL_S_CRB
diff --git a/boards/x86/rpl_crb/board.cmake b/boards/x86/intel_rpl/board.cmake
similarity index 100%
rename from boards/x86/rpl_crb/board.cmake
rename to boards/x86/intel_rpl/board.cmake
diff --git a/boards/x86/rpl_crb/doc/index.rst b/boards/x86/intel_rpl/doc/index.rst
similarity index 85%
rename from boards/x86/rpl_crb/doc/index.rst
rename to boards/x86/intel_rpl/doc/index.rst
index c5750b74555..c9db4c0fe3f 100644
--- a/boards/x86/rpl_crb/doc/index.rst
+++ b/boards/x86/intel_rpl/doc/index.rst
@@ -1,7 +1,7 @@
-.. _rpl_crb:
+.. _intel_rpl_s_crb:
 
-Raptor Lake CRB
-################
+Raptor Lake S CRB
+#################
 
 Overview
 ********
@@ -40,11 +40,11 @@ Build Zephyr application
 ========================
 
 #. Build a Zephyr application; for instance, to build the ``hello_world``
-   application on Raptor Lake CRB:
+   application on Raptor Lake S CRB:
 
    .. zephyr-app-commands::
       :zephyr-app: samples/hello_world
-      :board: rpl_crb
+      :board: intel_rpl_s_crb
       :goals: build
 
    .. note::
@@ -52,8 +52,8 @@ Build Zephyr application
       A Zephyr EFI image file named :file:`zephyr.efi` is automatically
       created in the build directory after the application is built.
 
-Booting the Raptor Lake CRB Board using UEFI
-============================================
+Booting the Raptor Lake S CRB Board using UEFI
+==============================================
 
 .. include:: ../../common/efi_boot.rst
 
diff --git a/boards/x86/rpl_crb/rpl_crb.dts b/boards/x86/intel_rpl/intel_rpl_s_crb.dts
similarity index 93%
rename from boards/x86/rpl_crb/rpl_crb.dts
rename to boards/x86/intel_rpl/intel_rpl_s_crb.dts
index 23b27f7baaa..5301b373022 100644
--- a/boards/x86/rpl_crb/rpl_crb.dts
+++ b/boards/x86/intel_rpl/intel_rpl_s_crb.dts
@@ -12,7 +12,7 @@
 #include <intel/raptor_lake.dtsi>
 
 / {
-	model = "rpl_crb";
+	model = "intel_rpl_s_crb";
 	compatible = "intel,raptor-lake-crb";
 
 	chosen {
diff --git a/boards/x86/rpl_crb/rpl_crb.yaml b/boards/x86/intel_rpl/intel_rpl_s_crb.yaml
similarity index 75%
rename from boards/x86/rpl_crb/rpl_crb.yaml
rename to boards/x86/intel_rpl/intel_rpl_s_crb.yaml
index d46c99e487e..ad4c413cdeb 100644
--- a/boards/x86/rpl_crb/rpl_crb.yaml
+++ b/boards/x86/intel_rpl/intel_rpl_s_crb.yaml
@@ -1,5 +1,5 @@
-identifier: rpl_crb
-name: Raptor Lake CRB
+identifier: intel_rpl_s_crb
+name: Raptor Lake S CRB
 type: mcu
 arch: x86
 toolchain:
diff --git a/boards/x86/rpl_crb/rpl_crb_defconfig b/boards/x86/intel_rpl/intel_rpl_s_crb_defconfig
similarity index 92%
rename from boards/x86/rpl_crb/rpl_crb_defconfig
rename to boards/x86/intel_rpl/intel_rpl_s_crb_defconfig
index 0a720a83ce8..1fe227ba4a6 100644
--- a/boards/x86/rpl_crb/rpl_crb_defconfig
+++ b/boards/x86/intel_rpl/intel_rpl_s_crb_defconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_SOC_RAPTOR_LAKE=y
-CONFIG_BOARD_RPL_CRB=y
+CONFIG_BOARD_INTEL_RPL_S_CRB=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y
diff --git a/samples/drivers/smbus/sample.yaml b/samples/drivers/smbus/sample.yaml
index 151cf8b74a6..802bb64e7f0 100644
--- a/samples/drivers/smbus/sample.yaml
+++ b/samples/drivers/smbus/sample.yaml
@@ -5,7 +5,7 @@ common:
   platform_allow:
     - qemu_x86_64
     - ehl_crb
-    - rpl_crb
+    - intel_rpl_s_crb
   harness: console
   harness_config:
     type: one_line
diff --git a/samples/drivers/watchdog/boards/rpl_crb.overlay b/samples/drivers/watchdog/boards/intel_rpl_s_crb.overlay
similarity index 100%
rename from samples/drivers/watchdog/boards/rpl_crb.overlay
rename to samples/drivers/watchdog/boards/intel_rpl_s_crb.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/rpl_crb.conf b/tests/drivers/spi/spi_loopback/boards/intel_rpl_s_crb.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/rpl_crb.conf
rename to tests/drivers/spi/spi_loopback/boards/intel_rpl_s_crb.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/rpl_crb.overlay b/tests/drivers/spi/spi_loopback/boards/intel_rpl_s_crb.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/rpl_crb.overlay
rename to tests/drivers/spi/spi_loopback/boards/intel_rpl_s_crb.overlay
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/rpl_crb.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/intel_rpl_s_crb.overlay
similarity index 100%
rename from tests/drivers/watchdog/wdt_basic_api/boards/rpl_crb.overlay
rename to tests/drivers/watchdog/wdt_basic_api/boards/intel_rpl_s_crb.overlay