diff --git a/BoardConfig.mk b/BoardConfig.mk
index 588ead9..1209d88 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -8,8 +8,8 @@ ALLOW_MISSING_DEPENDENCIES := true
 TARGET_OTA_ASSERT_DEVICE := on5xeltexx,on5xelteks,on5xelte
 
 # Kernel
-TARGET_KERNEL_CONFIG := on5xelte_00_defconfig
-TARGET_KERNEL_CUSTOM_TOOLCHAIN := /home/nick/android/lineage/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
+TARGET_KERNEL_CONFIG := exynos7570-on5xelte_mea_defconfig
+TARGET_KERNEL_CUSTOM_TOOLCHAIN := prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Bluetooth
@@ -17,4 +17,4 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 
 # Inherit common board flags
 include device/samsung/universal7570-common/BoardConfigCommon.mk
-include vendor/samsung/BoardConfigVendor.mk
+include vendor/samsung/universal7570-common/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 0d808f4..dcf4f96 100644
--- a/device.mk
+++ b/device.mk
@@ -7,4 +7,5 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 -include $(LOCAL_PATH)/system_prop.mk
 
 # Inherit common device configuration
-$(call inherit-product, device/samsung/universal7570-common/universal7570-common.mk)
+$(call inherit-product, device/samsung/universal7570-common/device-common.mk)
+$(call inherit-product, vendor/samsung/universal7570-common/universal7570-common-vendor.mk)
diff --git a/lineage.mk b/lineage.mk
index 32c620c..0815213 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 
-$(call inherit-product, device/samsung/on5xelte/full_on5xelte.mk)
+$(call inherit-product, device/samsung/on5xelte/on5xelte.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
diff --git a/full_on5xelte.mk b/on5xelte.mk
similarity index 91%
rename from full_on5xelte.mk
rename to on5xelte.mk
index 9e177af..3c5d479 100644
--- a/full_on5xelte.mk
+++ b/on5xelte.mk
@@ -11,8 +11,8 @@ $(call inherit-product, device/samsung/on5xelte/device.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := on5xelte
-PRODUCT_NAME := full_on5xelte
-PRODUCT_MODEL := SM-G570F
+PRODUCT_NAME := on5xelte
+PRODUCT_MODEL := SM-G570M
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_GMS_CLIENTID_BASE := android-samsung