diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index 874495e..5a8106d 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -3,9 +3,9 @@ COMMON_PATH := device/samsung/universal7885-common
 BOARD_VENDOR := samsung
 
 # Platform
-TARGET_BOARD_PLATFORM := universal7885
+TARGET_BOARD_PLATFORM := universal7884B
 TARGET_SOC := exynos7884B
-TARGET_BOOTLOADER_BOARD_NAME := universal7885
+TARGET_BOOTLOADER_BOARD_NAME := universal7884B
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
 
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index d5303f6..3997c7a 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -261,9 +261,6 @@ PRODUCT_COPY_FILES += \
     prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so \
     prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so
 
-# VNDK
-PRODUCT_EXTRA_VNDK_VERSIONS := 30
-
 # Wifi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \