diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 1a51143..45c6928 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -23,7 +23,7 @@
 # *not* include it on all devices, so it is safe even with hardware-specific
 # components.
 
-ifneq ($(filter gts210vewifi,$(TARGET_DEVICE)),)
+ifneq ($(filter gts28vewifi,$(TARGET_DEVICE)),)
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 658d377..90c4934 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/omni_gts210vewifi.mk
+    $(LOCAL_DIR)/omni_gts28vewifi.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c6a619f..f3559cc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -51,11 +51,11 @@ TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a53
 
 # Kernel Prebuilt
-TARGET_PREBUILT_KERNEL := device/samsung/gts210vewifi/kernel
-BOARD_CUSTOM_BOOTIMG_MK := device/samsung/gts210vewifi/mkbootimg.mk
+TARGET_PREBUILT_KERNEL := device/samsung/gts28vewifi/kernel
+BOARD_CUSTOM_BOOTIMG_MK := device/samsung/gts28vewifi/mkbootimg.mk
 BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.selinux=permissive
 BOARD_KERNEL_PAGESIZE := 2048
-BOARD_MKBOOTIMG_ARGS := --base 0x80000000 --ramdisk_offset 0x02000000 --tags_offset 0x01E00000 --board FPRPG21W000KU --dt device/samsung/gts210vewifi/dt.img
+BOARD_MKBOOTIMG_ARGS := --base 0x80000000 --ramdisk_offset 0x02000000 --tags_offset 0x01E00000 --board FPRPG21W000KU --dt device/samsung/gts28vewifi/dt.img
 
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
diff --git a/README.md b/README.md
index fc4ae73..f749083 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# TWRP tree for gts210vewifi
+# TWRP tree for gts28vewifi
 
 Kernel source:
 https://github.com/LineageOS/android_kernel_samsung_msm8976/tree/84d7ffb7301f64f87459f714b3897de1833d2890
diff --git a/cm.mk b/cm.mk
index 2fb8c6d..b2d60aa 100644
--- a/cm.mk
+++ b/cm.mk
@@ -20,7 +20,7 @@
 # Inherit from the common Open Source product configuration
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
-PRODUCT_NAME := cm_gts210vewifi
-PRODUCT_DEVICE := gts210vewifi
+PRODUCT_NAME := cm_gts28vewifi
+PRODUCT_DEVICE := gts28vewifi
 PRODUCT_BRAND := Samsung
 PRODUCT_MANUFACTURER := Samsung
diff --git a/omni_gts210vewifi.mk b/omni_gts28vewifi.mk
similarity index 93%
rename from omni_gts210vewifi.mk
rename to omni_gts28vewifi.mk
index 28b866c..12ec877 100644
--- a/omni_gts210vewifi.mk
+++ b/omni_gts28vewifi.mk
@@ -20,7 +20,7 @@
 # Inherit from the common Open Source product configuration
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
-PRODUCT_NAME := omni_gts210vewifi
-PRODUCT_DEVICE := gts210vewifi
+PRODUCT_NAME := omni_gts28vewifi
+PRODUCT_DEVICE := gts28vewifi
 PRODUCT_BRAND := Samsung
 PRODUCT_MANUFACTURER := Samsung