diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index 5ae567d326..72906d7d3e 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8 || BOARD_INTEL_COMETLAKE_RVP
+if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8 || BOARD_INTEL_COMETLAKE_RVPU
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_GENERIC
 	select SOC_INTEL_CANNONLAKE_PCH_H if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB if !BOARD_INTEL_COFFEELAKE_RVPU
-	select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COMETLAKE_RVP
+	select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COMETLAKE_RVPU
 	select MAINBOARD_USES_IFD_EC_REGION
 	select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
 
@@ -27,18 +27,18 @@ config VARIANT_DIR
 	default "cfl_h" if BOARD_INTEL_COFFEELAKE_RVP11
 	default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP
 	default "cfl_s" if BOARD_INTEL_COFFEELAKE_RVP8
-	default "cml_u" if BOARD_INTEL_COMETLAKE_RVP
+	default "cml_u" if BOARD_INTEL_COMETLAKE_RVPU
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP
-	default "cmlrvp" if BOARD_INTEL_COMETLAKE_RVP
+	default "cmlrvp" if BOARD_INTEL_COMETLAKE_RVPU
 	default "cflrvp"
 
 config MAINBOARD_FAMILY
 	string
 	default "Intel_whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP
-	default "Intel_cmlrvp" if BOARD_INTEL_COMETLAKE_RVP
+	default "Intel_cmlrvp" if BOARD_INTEL_COMETLAKE_RVPU
 	default "Intel_cflrvp"
 
 config CHROMEOS
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig.name b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
index 35c0f0ff4a..519cd50dc1 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -12,6 +12,6 @@ config BOARD_INTEL_WHISKEYLAKE_RVP
 config BOARD_INTEL_COFFEELAKE_RVP8
 	bool "-> Coffeelake S U-DIMM DDR4 RVP8"
 	select SOC_INTEL_COFFEELAKE
-config BOARD_INTEL_COMETLAKE_RVP
+config BOARD_INTEL_COMETLAKE_RVPU
 	bool "-> Cometlake U DDR4 RVP"
 	select SOC_INTEL_COMETLAKE
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
index ec8f58ba16..709249e918 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
@@ -264,7 +264,7 @@ static const struct pad_config gpio_table[] = {
 	/* H21 : GPPC_H_21 */
 	/* H22 : GPPC_H_22 */
 	PAD_CFG_GPI(GPP_H22, NONE, DEEP),
-#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVP)
+#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVPU)
 	PAD_CFG_GPO(GPP_H22, 1, PLTRST),
 #else
 	PAD_CFG_GPI(GPP_H22, NONE, DEEP),