diff --git a/Android.mk b/Android.mk
index 8e2173b..0af19c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2021 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter a3y17lte j5y17lte j6lte j7velte j7xelte j7y17lte on7xelte, $(TARGET_DEVICE)),)
+ifneq ($(filter j4lte, $(TARGET_DEVICE)),)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 include $(CLEAR_VARS)
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b7c1bc0..e297f89 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2021 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := device/samsung/universal7870-common
+LOCAL_PATH := device/samsung/universal7570-common
 
 # Include path
 TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
@@ -25,9 +25,9 @@ TARGET_NO_RADIOIMAGE := true
 
 # Platform
 BOARD_VENDOR := samsung
-TARGET_BOOTLOADER_BOARD_NAME := universal7870
+TARGET_BOOTLOADER_BOARD_NAME := universal7570
 TARGET_BOARD_PLATFORM := exynos5
-TARGET_SOC := exynos7870
+TARGET_SOC := exynos7570
 
 # Architecture
 TARGET_ARCH := arm64
@@ -67,7 +67,7 @@ TARGET_KERNEL_HEADER_ARCH := arm64
 TARGET_LINUX_KERNEL_VERSION := 3.18
 
 # Kernel config
-TARGET_KERNEL_SOURCE := kernel/samsung/exynos7870
+TARGET_KERNEL_SOURCE := kernel/samsung/exynos7570
 
 # HIDL
 DEVICE_MATRIX_FILE := $(LOCAL_PATH)/configs/compatibility_matrix.xml
diff --git a/device-common.mk b/device-common.mk
index e27423e..17def66 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2021 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := device/samsung/universal7870-common
+LOCAL_PATH := device/samsung/universal7570-common
 
 # Boot animation
 TARGET_BOOTANIMATION_PRELOAD := true
@@ -214,10 +214,10 @@ PRODUCT_PACKAGES += \
 
 # Ramdisk
 PRODUCT_PACKAGES += \
-    fstab.samsungexynos7870 \
+    fstab.samsungexynos7570 \
     init.baseband.rc \
-    init.samsungexynos7870.rc \
-    init.samsungexynos7870.usb.rc \
+    init.samsungexynos7570.rc \
+    init.samsungexynos7570.usb.rc \
     init.vendor.rilchip.rc \
     init.vendor.rilcommon.rc \
     wifi.rc \
@@ -293,4 +293,4 @@ PRODUCT_PACKAGES += \
 -include $(LOCAL_PATH)/vendor_prop.mk
 
 # call the proprietary setup
-$(call inherit-product, vendor/samsung/universal7870-common/universal7870-common-vendor.mk)
+$(call inherit-product, vendor/samsung/universal7570-common/universal7570-common-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index bd70ee6..9ec9f6b 100644
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 set -e
 
 VENDOR=samsung
-DEVICE_COMMON=universal7870-common
+DEVICE_COMMON=universal7570-common
 
 # Load extract_utils and do some sanity checks
 MY_DIR="${BASH_SOURCE%/*}"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 7c91f72..bab7f97 100644
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 set -e
 
 VENDOR=samsung
-DEVICE=universal7870-common
+DEVICE=universal7570-common
 
 export INITIAL_COPYRIGHT_YEAR=2017
 
@@ -39,7 +39,7 @@ source "${HELPER}"
 setup_vendor "${DEVICE}" "${VENDOR}" "${AOSP_ROOT}"
 
 # Copyright headers and guards
-write_headers "universal7870-common"
+write_headers "universal7570-common"
 
 # The standard blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true