diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 30f259e..5a2543b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_j8y18lte.mk
+    $(LOCAL_DIR)/aosp_j8y18lte.mk
 
 
 COMMON_LUNCH_CHOICES := \
-     lineage_j8y18lte-userdebug \
-     lineage_j8y18lte-eng \
-     lineage_j8y18lte-user
\ No newline at end of file
+     aosp_j8y18lte-userdebug \
+     aosp_j8y18lte-eng \
+     aosp_j8y18lte-user
diff --git a/lineage.dependencies b/aosp.dependencies
similarity index 100%
rename from lineage.dependencies
rename to aosp.dependencies
diff --git a/lineage_j8y18lte.mk b/aosp_j8y18lte.mk
similarity index 83%
rename from lineage_j8y18lte.mk
rename to aosp_j8y18lte.mk
index 193d23c..7d48395 100644
--- a/lineage_j8y18lte.mk
+++ b/aosp_j8y18lte.mk
@@ -19,11 +19,18 @@ $(call inherit-product, $(LOCAL_PATH)/device.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o_mr1.mk)
 
-# Inherit common Lineage phone.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit common AOSP phone.
+$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
+
+# Bootanimation
+TARGET_BOOT_ANIMATION_RES := 1080
+
+# Gapps
+TARGET_GAPPS_ARCH := arm
+IS_PHONE := true
 
 # Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := lineage_j8y18lte
+PRODUCT_NAME := aosp_j8y18lte
 PRODUCT_DEVICE := j8y18lte
 PRODUCT_MODEL := SM-J810G
 PRODUCT_BRAND := samsung