diff --git a/Makefile b/Makefile
index 87eb0c932..86580067b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 undefine PLATFORM
 
 ifndef BOARD
-$(error BOARD must be set (apl-mrb, apl-nuc, cb2_dnv, nuc6cayh)
+$(error BOARD must be set (apl-mrb, apl-nuc, dnv-cb2, nuc6cayh)
 endif
 
 ifeq ($(BOARD),apl-nuc)
diff --git a/hypervisor/arch/x86/configs/cb2_dnv.config b/hypervisor/arch/x86/configs/dnv_cb2.config
similarity index 88%
rename from hypervisor/arch/x86/configs/cb2_dnv.config
rename to hypervisor/arch/x86/configs/dnv_cb2.config
index b07c81764..5450d1880 100644
--- a/hypervisor/arch/x86/configs/cb2_dnv.config
+++ b/hypervisor/arch/x86/configs/dnv_cb2.config
@@ -1,6 +1,6 @@
 # Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)
 CONFIG_PARTITION_MODE=y
-CONFIG_BOARD="cb2_dnv"
+CONFIG_BOARD="dnv_cb2"
 CONFIG_SERIAL_LEGACY=y
 CONFIG_SERIAL_PIO_BASE=0x1000
 CONFIG_DMAR_PARSE_ENABLED=y
diff --git a/hypervisor/partition/cb2_dnv/vm_description.c b/hypervisor/partition/dnv_cb2/vm_description.c
similarity index 100%
rename from hypervisor/partition/cb2_dnv/vm_description.c
rename to hypervisor/partition/dnv_cb2/vm_description.c