diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
index 42efd4a925..e3b2ebd1f9 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_HEWLETT_PACKARD_HP_COMPAQ_8200_ELITE_SFF_PC
+if BOARD_HP_COMPAQ_8200_ELITE_SFF_PC
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig.name b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig.name
index 8de7363875..fad77d0d35 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig.name
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_HEWLETT_PACKARD_HP_COMPAQ_8200_ELITE_SFF_PC
+config BOARD_HP_COMPAQ_8200_ELITE_SFF_PC
 	bool "Compaq 8200 Elite SFF"
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig b/src/mainboard/hp/z220_sff_workstation/Kconfig
index 649cbb136b..dc288d6940 100644
--- a/src/mainboard/hp/z220_sff_workstation/Kconfig
+++ b/src/mainboard/hp/z220_sff_workstation/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_HP_COMPAQ_8200_ELITE_SFF_PC
+if BOARD_HP_Z220_SFF_WORKSTATION
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig.name b/src/mainboard/hp/z220_sff_workstation/Kconfig.name
index b6cfda6e9a..037ebc0694 100644
--- a/src/mainboard/hp/z220_sff_workstation/Kconfig.name
+++ b/src/mainboard/hp/z220_sff_workstation/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_HP_COMPAQ_8200_ELITE_SFF_PC
+config BOARD_HP_Z220_SFF_WORKSTATION
 	bool "Z220 SFF Workstation"