diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2fc41ef..a5b6674 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -1,11 +1,11 @@
-COMMON_PATH := device/samsung/universal7885-common
+COMMON_PATH := device/samsung/universal7904-common
 
 BOARD_VENDOR := samsung
 
 # Platform
 TARGET_BOARD_PLATFORM := exynos5
 TARGET_SOC := exynos7904
-TARGET_BOOTLOADER_BOARD_NAME := universal7885
+TARGET_BOOTLOADER_BOARD_NAME := universal7904
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
 
@@ -57,7 +57,7 @@ BOARD_KERNEL_PAGESIZE := 2048
 BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 --tags_offset 0x00000100
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_HEADER_ARCH := arm64
-TARGET_KERNEL_SOURCE := kernel/samsung/universal7885
+TARGET_KERNEL_SOURCE := kernel/samsung/universal7904
 TARGET_CUSTOM_DTBTOOL := dtbhtoolExynos
 
 # Partitions
diff --git a/extract-files.sh b/extract-files.sh
index 7c76be6..857e49c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -18,7 +18,7 @@
 
 set -e
 
-DEVICE=universal7885-common
+DEVICE=universal7904-common
 VENDOR=samsung
 
 # Load extract_utils and do some sanity checks
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 1c4fc17..5de914d 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -18,7 +18,7 @@
 
 set -e
 
-DEVICE=universal7885-common
+DEVICE=universal7904-common
 VENDOR=samsung
 
 INITIAL_COPYRIGHT_YEAR=2016
diff --git a/universal7885-common.mk b/universal7904-common.mk
similarity index 86%
rename from universal7885-common.mk
rename to universal7904-common.mk
index 255e76f..6629852 100644
--- a/universal7885-common.mk
+++ b/universal7904-common.mk
@@ -1,5 +1,5 @@
 # Call proprietary blob setup
-$(call inherit-product-if-exists, vendor/samsung/universal7885-common/universal7885-common-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/universal7904-common/universal7904-common-vendor.mk)
 
 # Screen density
 PRODUCT_AAPT_CONFIG := normal