diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4b70820..d6b263a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_a52q.mk
+    $(LOCAL_DIR)/aosp_a52q.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_a52q-userdebug \
-    lineage_a52q-user \
-    lineage_a52q-eng
+    aosp_a52q-userdebug \
+    aosp_a52q-user \
+    aosp_a52q-eng
diff --git a/lineage.dependencies b/aosp.dependencies
similarity index 100%
rename from lineage.dependencies
rename to aosp.dependencies
diff --git a/lineage_a52q.mk b/aosp_a52q.mk
similarity index 93%
rename from lineage_a52q.mk
rename to aosp_a52q.mk
index 18789cd..49bc715 100644
--- a/lineage_a52q.mk
+++ b/aosp_a52q.mk
@@ -24,7 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
 # Inherit some common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
 
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
@@ -36,7 +36,7 @@ TARGET_SCREEN_HEIGHT := 2400
 TARGET_SCREEN_WIDTH := 1080
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_a52q
+PRODUCT_NAME := aosp_a52q
 PRODUCT_DEVICE := a52q
 PRODUCT_BRAND := samsung
 PRODUCT_MODEL := SM-A525F