diff --git a/src/mainboard/system76/rpl/Kconfig b/src/mainboard/system76/rpl/Kconfig
index 99eb784021..300e96b99c 100644
--- a/src/mainboard/system76/rpl/Kconfig
+++ b/src/mainboard/system76/rpl/Kconfig
@@ -24,23 +24,7 @@ config BOARD_SYSTEM76_RPL_COMMON
 	select SPD_READ_BY_WORD
 	select SYSTEM_TYPE_LAPTOP
 
-config BOARD_SYSTEM76_ADDP3
-	def_bool n
-	select BOARD_SYSTEM76_RPL_COMMON
-	select DRIVERS_GFX_NVIDIA
-	select EC_SYSTEM76_EC_COLOR_KEYBOARD
-	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_P
-
-config BOARD_SYSTEM76_GAZE18_3050
-	def_bool n
-	select BOARD_SYSTEM76_RPL_COMMON
-	select DRIVERS_GFX_NVIDIA
-	select EC_SYSTEM76_EC_COLOR_KEYBOARD
-	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_P
-
-config BOARD_SYSTEM76_GAZE18_40X0
+config BOARD_SYSTEM76_ADDW3
 	def_bool n
 	select BOARD_SYSTEM76_RPL_COMMON
 	select DRIVERS_GFX_NVIDIA
@@ -48,7 +32,23 @@ config BOARD_SYSTEM76_GAZE18_40X0
 	select EC_SYSTEM76_EC_DGPU
 	select SOC_INTEL_ALDERLAKE_PCH_S
 
+config BOARD_SYSTEM76_GAZE18
+	def_bool n
+	select BOARD_SYSTEM76_RPL_COMMON
+	select DRIVERS_GFX_NVIDIA
+	select EC_SYSTEM76_EC_COLOR_KEYBOARD
+	select EC_SYSTEM76_EC_DGPU
+	select SOC_INTEL_ALDERLAKE_PCH_P
+
 config BOARD_SYSTEM76_ORYP11
+	def_bool n
+	select BOARD_SYSTEM76_RPL_COMMON
+	select DRIVERS_GFX_NVIDIA
+	select EC_SYSTEM76_EC_COLOR_KEYBOARD
+	select EC_SYSTEM76_EC_DGPU
+	select SOC_INTEL_ALDERLAKE_PCH_P
+
+config BOARD_SYSTEM76_SERW13
 	def_bool n
 	select BOARD_SYSTEM76_RPL_COMMON
 	select DRIVERS_GFX_NVIDIA
@@ -62,30 +62,31 @@ config MAINBOARD_DIR
 	default "system76/rpl"
 
 config VARIANT_DIR
-	default "addp3" if BOARD_SYSTEM76_ADDP3
-	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
-	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
+	default "addw3" if BOARD_SYSTEM76_ADDP3
+	default "gaze18" if BOARD_SYSTEM76_GAZE18
 	default "oryp11" if BOARD_SYSTEM76_ORYP11
+	default "serw13" if BOARD_SYSTEM76_SERW13
 
 config OVERRIDE_DEVICETREE
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
 config MAINBOARD_PART_NUMBER
-	default "addp3" if BOARD_SYSTEM76_ADDP3
-	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
-	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
+	default "addw3" if BOARD_SYSTEM76_ADDP3
+	default "gaze18" if BOARD_SYSTEM76_GAZE18
 	default "oryp11" if BOARD_SYSTEM76_ORYP11
+	default "serw13" if BOARD_SYSTEM76_SERW13
 
 config MAINBOARD_SMBIOS_PRODUCT_NAME
-	default "Adder Pro" if BOARD_SYSTEM76_ADDP3
-	default "Gazelle" if BOARD_SYSTEM76_GAZE18_3050 || BOARD_SYSTEM76_GAZE18_40X0
+	default "Adder WS" if BOARD_SYSTEM76_ADDP3
+	default "Gazelle" if BOARD_SYSTEM76_GAZE18
 	default "Oryx Pro" if BOARD_SYSTEM76_ORYP11
+	default "Serval WS" if BOARD_SYSTEM76_SERW13
 
 config MAINBOARD_VERSION
-	default "addp3" if BOARD_SYSTEM76_ADDP3
-	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
-	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
+	default "addw3" if BOARD_SYSTEM76_ADDP3
+	default "gaze18" if BOARD_SYSTEM76_GAZE18
 	default "oryp11" if BOARD_SYSTEM76_ORYP11
+	default "serw13" if BOARD_SYSTEM76_SERW13
 
 config CBFS_SIZE
 	default 0x1000000
diff --git a/src/mainboard/system76/rpl/Kconfig.name b/src/mainboard/system76/rpl/Kconfig.name
index 58fe7aff03..2661ae7725 100644
--- a/src/mainboard/system76/rpl/Kconfig.name
+++ b/src/mainboard/system76/rpl/Kconfig.name
@@ -1,11 +1,11 @@
-config BOARD_SYSTEM76_ADDP3
-	bool "addp3"
+config BOARD_SYSTEM76_ADDW3
+	bool "addw3"
 
-config BOARD_SYSTEM76_GAZE18_3050
-	bool "gaze18-3050"
-
-config BOARD_SYSTEM76_GAZE18_40X0
-	bool "gaze18-40x0"
+config BOARD_SYSTEM76_GAZE18
+	bool "gaze18"
 
 config BOARD_SYSTEM76_ORYP11
 	bool "oryp11"
+
+config BOARD_SYSTEM76_SERW13
+	bool "serw13"
diff --git a/src/mainboard/system76/rpl/variants/addw3/board_info.txt b/src/mainboard/system76/rpl/variants/addw3/board_info.txt
index 2e9df77055..9b04ef3032 100644
--- a/src/mainboard/system76/rpl/variants/addw3/board_info.txt
+++ b/src/mainboard/system76/rpl/variants/addw3/board_info.txt
@@ -1,2 +1,2 @@
-Board name: gaze18-40x0
+Board name: addw3
 Release year: 2023
diff --git a/src/mainboard/system76/rpl/variants/gaze18/board_info.txt b/src/mainboard/system76/rpl/variants/gaze18/board_info.txt
index 4b73d9720e..c8e58d6fb2 100644
--- a/src/mainboard/system76/rpl/variants/gaze18/board_info.txt
+++ b/src/mainboard/system76/rpl/variants/gaze18/board_info.txt
@@ -1,2 +1,2 @@
-Board name: gaze18-3050
+Board name: gaze18
 Release year: 2023
diff --git a/src/mainboard/system76/rpl/variants/oryp11/board_info.txt b/src/mainboard/system76/rpl/variants/oryp11/board_info.txt
index 84b206488a..37f71e1fa6 100644
--- a/src/mainboard/system76/rpl/variants/oryp11/board_info.txt
+++ b/src/mainboard/system76/rpl/variants/oryp11/board_info.txt
@@ -1,2 +1,2 @@
-Board name: addp3
+Board name: oryp11
 Release year: 2023
diff --git a/src/mainboard/system76/rpl/variants/serw13/board_info.txt b/src/mainboard/system76/rpl/variants/serw13/board_info.txt
index 37f71e1fa6..1cd6059d4d 100644
--- a/src/mainboard/system76/rpl/variants/serw13/board_info.txt
+++ b/src/mainboard/system76/rpl/variants/serw13/board_info.txt
@@ -1,2 +1,2 @@
-Board name: oryp11
+Board name: serw13
 Release year: 2023