diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d052bad..f62cfeb 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,9 +15,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_gta4xlwifi.mk
+    $(LOCAL_DIR)/gta4xlwifi.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_gta4xlwifi-eng \
-    lineage_gta4xlwifi-user \
-    lineage_gta4xlwifi-userdebug
+    gta4xlwifi-eng \
+    gta4xlwifi-user \
+    gta4xlwifi-userdebug
diff --git a/lineage_gta4xlwifi.mk b/gta4xlwifi.mk
similarity index 91%
rename from lineage_gta4xlwifi.mk
rename to gta4xlwifi.mk
index f045bf1..9eee0ea 100644
--- a/lineage_gta4xlwifi.mk
+++ b/gta4xlwifi.mk
@@ -27,11 +27,11 @@
 TARGET_SCREEN_WIDTH := 1200
 
 ## Inherit some common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk)
+$(call inherit-product, vendor/leaf/config/common_full_tablet_wifionly.mk)
 
 ## Device identifier, this must come after all inclusions
 PRODUCT_DEVICE := gta4xlwifi
-PRODUCT_NAME := lineage_gta4xlwifi
+PRODUCT_NAME := gta4xlwifi
 PRODUCT_BRAND := samsung
 PRODUCT_MODEL := SM-P610
 PRODUCT_MANUFACTURER := samsung
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index a1e8fb9..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-    {
-        "repository": "android_device_samsung_gta4xl-common",
-        "target_path": "device/samsung/gta4xl-common"
-    }
-]