diff --git a/src/include/cpu/intel/cpu_ids.h b/src/include/cpu/intel/cpu_ids.h
index e89be70..4431350 100644
--- a/src/include/cpu/intel/cpu_ids.h
+++ b/src/include/cpu/intel/cpu_ids.h
@@ -58,11 +58,11 @@
 #define CPUID_SAPPHIRERAPIDS_SP_Ex	0x806f8
 #define CPUID_ELKHARTLAKE_A0		0x90660
 #define CPUID_ELKHARTLAKE_B0		0x90661
-#define CPUID_ALDERLAKE_S_A0		0x90670
-#define CPUID_ALDERLAKE_S_B0		0x90671
-#define CPUID_ALDERLAKE_S_C0		0x90672
-#define CPUID_ALDERLAKE_S_G0		0x90674
-#define CPUID_ALDERLAKE_S_H0		0x90675
+#define CPUID_ALDERLAKE_A0		0x90670
+#define CPUID_ALDERLAKE_B0		0x90671
+#define CPUID_ALDERLAKE_C0		0x90672
+#define CPUID_ALDERLAKE_G0		0x90674
+#define CPUID_ALDERLAKE_H0		0x90675
 #define CPUID_ALDERLAKE_J0		0x906a0
 #define CPUID_ALDERLAKE_Q0		0x906a1
 #define CPUID_ALDERLAKE_K0		0x906a2
@@ -73,11 +73,11 @@
 #define CPUID_METEORLAKE_A0_2		0xa06a1
 #define CPUID_METEORLAKE_B0		0xa06a2
 #define CPUID_METEORLAKE_C0		0xa06a4
-#define CPUID_RAPTORLAKE_S_A0		0xb0670
-#define CPUID_RAPTORLAKE_S_B0		0xb0671
-#define CPUID_RAPTORLAKE_S_C0		0xb06f2
-#define CPUID_RAPTORLAKE_S_H0		0xb06f5
-#define CPUID_RAPTORLAKE_P_J0		0xb06a2
-#define CPUID_RAPTORLAKE_P_Q0		0xb06a3
+#define CPUID_RAPTORLAKE_A0		0xb0670
+#define CPUID_RAPTORLAKE_B0		0xb0671
+#define CPUID_RAPTORLAKE_C0		0xb06f2
+#define CPUID_RAPTORLAKE_H0		0xb06f5
+#define CPUID_RAPTORLAKE_J0		0xb06a2
+#define CPUID_RAPTORLAKE_Q0		0xb06a3
 
 #endif /* CPU_INTEL_CPU_IDS_H */
diff --git a/src/mainboard/intel/adlrvp/mainboard.c b/src/mainboard/intel/adlrvp/mainboard.c
index c1cbb31..d761e87 100644
--- a/src/mainboard/intel/adlrvp/mainboard.c
+++ b/src/mainboard/intel/adlrvp/mainboard.c
@@ -79,7 +79,7 @@
 	switch (sku_id) {
 	case ADL_P_LP5_1:
 	case ADL_P_LP5_2:
-		if (cpu_id == CPUID_RAPTORLAKE_P_J0)
+		if (cpu_id == CPUID_RAPTORLAKE_J0)
 			return "vbt_adlrvp_rpl_lp5.bin";
 		return "vbt_adlrvp_lp5.bin";
 	case ADL_M_LP5:
diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c
index 9cc2c17..938c8eb 100644
--- a/src/soc/intel/alderlake/bootblock/report_platform.c
+++ b/src/soc/intel/alderlake/bootblock/report_platform.c
@@ -29,17 +29,17 @@
 	{ CPUID_ALDERLAKE_Q0, "Alderlake Q0 Platform" },
 	{ CPUID_ALDERLAKE_R0, "Alderlake R0 Platform" },
 	{ CPUID_ALDERLAKE_N_A0, "Alderlake-N Platform" },
-	{ CPUID_ALDERLAKE_S_A0, "Alderlake-S A0 Platform" },
-	{ CPUID_ALDERLAKE_S_B0, "Alderlake-S B0 Platform" },
-	{ CPUID_ALDERLAKE_S_C0, "Alderlake-S C0 Platform" },
-	{ CPUID_ALDERLAKE_S_G0, "Alderlake-S G0 Platform" },
-	{ CPUID_ALDERLAKE_S_H0, "Alderlake-S H0 Platform" },
-	{ CPUID_RAPTORLAKE_S_A0, "Raptorlake-S A0 Platform" },
-	{ CPUID_RAPTORLAKE_S_B0, "Raptorlake-S B0 Platform" },
-	{ CPUID_RAPTORLAKE_S_C0, "Raptorlake-S C0 Platform" },
-	{ CPUID_RAPTORLAKE_S_H0, "Raptorlake-S H0 Platform" },
-	{ CPUID_RAPTORLAKE_P_J0, "Raptorlake-P J0 Platform" },
-	{ CPUID_RAPTORLAKE_P_Q0, "Raptorlake-P Q0 Platform" },
+	{ CPUID_ALDERLAKE_A0, "Alderlake A0 Platform" },
+	{ CPUID_ALDERLAKE_B0, "Alderlake B0 Platform" },
+	{ CPUID_ALDERLAKE_C0, "Alderlake C0 Platform" },
+	{ CPUID_ALDERLAKE_G0, "Alderlake G0 Platform" },
+	{ CPUID_ALDERLAKE_H0, "Alderlake H0 Platform" },
+	{ CPUID_RAPTORLAKE_A0, "Raptorlake A0 Platform" },
+	{ CPUID_RAPTORLAKE_B0, "Raptorlake B0 Platform" },
+	{ CPUID_RAPTORLAKE_C0, "Raptorlake C0 Platform" },
+	{ CPUID_RAPTORLAKE_H0, "Raptorlake H0 Platform" },
+	{ CPUID_RAPTORLAKE_J0, "Raptorlake J0 Platform" },
+	{ CPUID_RAPTORLAKE_Q0, "Raptorlake Q0 Platform" },
 };
 
 static struct {
diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c
index e8cde5a..214a700 100644
--- a/src/soc/intel/alderlake/fsp_params.c
+++ b/src/soc/intel/alderlake/fsp_params.c
@@ -1015,12 +1015,12 @@
 	s_cfg->VrPowerDeliveryDesign = config->vr_power_delivery_design;
 
 	/* FIXME: Disable package C state demotion on Raptorlake as a W/A for S0ix issues */
-	if ((cpu_id == CPUID_RAPTORLAKE_P_J0) || (cpu_id == CPUID_RAPTORLAKE_P_Q0))
+	if ((cpu_id == CPUID_RAPTORLAKE_J0) || (cpu_id == CPUID_RAPTORLAKE_Q0))
 		s_cfg->PkgCStateDemotion = 0;
 	else
 		s_cfg->PkgCStateDemotion = !config->disable_package_c_state_demotion;
 
-	if (cpu_id == CPUID_RAPTORLAKE_P_J0 || cpu_id == CPUID_RAPTORLAKE_P_Q0)
+	if (cpu_id == CPUID_RAPTORLAKE_J0 || cpu_id == CPUID_RAPTORLAKE_Q0)
 		s_cfg->C1e = 0;
 	else
 		s_cfg->C1e = 1;
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 3d6d606..f38db87 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -74,19 +74,19 @@
 	{ X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_A0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_B0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_A0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_J0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_K0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_L0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_Q0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_R0, CPUID_EXACT_MATCH_MASK },
 	{ X86_VENDOR_INTEL, CPUID_ALDERLAKE_N_A0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_J0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_P_Q0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_A0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_B0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_C0, CPUID_EXACT_MATCH_MASK },
-	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_S_H0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_J0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_Q0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_A0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_B0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_C0, CPUID_EXACT_MATCH_MASK },
+	{ X86_VENDOR_INTEL, CPUID_RAPTORLAKE_H0, CPUID_EXACT_MATCH_MASK },
 	CPU_TABLE_END
 };