diff --git a/Android.mk b/Android.mk
old mode 100644
new mode 100755
index c0f7dae..723ce91
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),gts3lwifi)
+ifeq ($(TARGET_DEVICE),gts3llte)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
old mode 100644
new mode 100755
index 5169d37..25619b0
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_gts3lwifi.mk
+    $(LOCAL_DIR)/full_gts3llte.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
old mode 100644
new mode 100755
index 26ed257..aea9086
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -16,16 +16,16 @@
 # inherit from common msm8996-common
 -include device/samsung/msm8996-common/BoardConfigCommon.mk
 
-DEVICE_PATH := device/samsung/gts3lwifi
+DEVICE_PATH := device/samsung/gts3llte
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := gts3lwifi
+TARGET_OTA_ASSERT_DEVICE := gts3llte
 
 # Kernel
-TARGET_KERNEL_CONFIG := lineage_gts3lwifi_defconfig
+TARGET_KERNEL_CONFIG := lineage_gts3llte_defconfig
 
 # Properties
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 
 # inherit from the proprietary version
--include vendor/samsung/gts3lwifi/BoardConfigVendor.mk
+-include vendor/samsung/gts3llte/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
old mode 100644
new mode 100755
index 92e4d2a..a7011b7
--- a/device.mk
+++ b/device.mk
@@ -15,7 +15,7 @@
 #
 
 # call the proprietary setup
-$(call inherit-product-if-exists, vendor/samsung/gts3lwifi/gts3lwifi-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/gts3llte/gts3llte-vendor.mk)
 
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
diff --git a/extract-files.sh b/extract-files.sh
index 2fff22a..d73a351 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -18,7 +18,7 @@
 set -e
 
 # Required!
-export DEVICE=gts3lwifi
+export DEVICE=gts3llte
 export DEVICE_COMMON=msm8976-common
 export VENDOR=samsung
 
diff --git a/full_gts3lwifi.mk b/full_gts3llte.mk
old mode 100644
new mode 100755
similarity index 83%
rename from full_gts3lwifi.mk
rename to full_gts3llte.mk
index 8cf7b90..93c32f9
--- a/full_gts3lwifi.mk
+++ b/full_gts3llte.mk
@@ -18,12 +18,12 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
-# Inherit from gts3lwifi device
-$(call inherit-product, device/samsung/gts3lwifi/device.mk)
+# Inherit from gts3llte device
+$(call inherit-product, device/samsung/gts3llte/device.mk)
 
 # Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := gts3lwifi
-PRODUCT_NAME := full_gts3lwifi
+PRODUCT_DEVICE := gts3llte
+PRODUCT_NAME := full_gts3llte
 PRODUCT_BRAND := samsung
-PRODUCT_MODEL := gts3lwifi
+PRODUCT_MODEL := gts3llte
 PRODUCT_MANUFACTURER := samsung
diff --git a/lineage.mk b/lineage.mk
old mode 100644
new mode 100755
index 30efea6..a3ffe03
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,18 +1,18 @@
-$(call inherit-product, device/samsung/gts3lwifi/full_gts3lwifi.mk)
+$(call inherit-product, device/samsung/gts3llte/full_gts3llte.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/cm/config/common_full_tablet_wifionly.mk)
 
-PRODUCT_NAME := lineage_gts3lwifi
+PRODUCT_NAME := lineage_gts3llte
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
-PRODUCT_DEVICE := gts3lwifi
-PRODUCT_MODEL := SM-T820
+PRODUCT_DEVICE := gts3llte
+PRODUCT_MODEL := SM-T825
 TARGET_VENDOR := Samsung
 PRODUCT_GMS_CLIENTID_BASE := android-samsung
 
 # Use the latest approved GMS identifiers
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=gts3lwifixx \
-    BUILD_FINGERPRINT=samsung/gts3lwifixx/gts3lwifi:7.0/NRD90M/T820XXU1AQI2:user/release-keys \
-    PRIVATE_BUILD_DESC="gts3lwifixx-user 7.0 NRD90M T820XXU1AQI2 release-keys"
+    PRODUCT_NAME=gts3lltexx \
+    BUILD_FINGERPRINT=samsung/gts3lltexx/gts3llte:7.0/NRD90M/T820XXU1AQI2:user/release-keys \
+    PRIVATE_BUILD_DESC="gts3lltexx-user 7.0 NRD90M T825XXU1AQI2 release-keys"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 79fa563..d3c333e 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -18,7 +18,7 @@
 set -e
 
 # Required!
-export DEVICE=gts3lwifi
+export DEVICE=gts3llte
 export DEVICE_COMMON=msm8996-common
 export VENDOR=samsung