diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0724cd0..7345997 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/device_a7y18lte.mk
+    $(LOCAL_DIR)/lineage_a7y18lte.mk
diff --git a/device_a7y18lte.mk b/device.mk
similarity index 100%
rename from device_a7y18lte.mk
rename to device.mk
diff --git a/cm.mk b/lineage_a7y18lte.mk
similarity index 56%
rename from cm.mk
rename to lineage_a7y18lte.mk
index 2e57c50..8f89650 100644
--- a/cm.mk
+++ b/lineage_a7y18lte.mk
@@ -1,15 +1,15 @@
 # Release name
 PRODUCT_RELEASE_NAME := a7y18lte
 
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
+# Inherit some common LineageOS stuff.
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/samsung/a7y18lte/device_a7y18lte.mk)
+$(call inherit-product, device/samsung/a7y18lte/device.mk)
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := a7y18lte
-PRODUCT_NAME := cm_a7y18lte
+PRODUCT_NAME := lineage_a7y18lte
 PRODUCT_BRAND := samsung
 PRODUCT_MODEL := a7y18lte
 PRODUCT_MANUFACTURER := samsung