diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ace9754..f51fa37 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,9 +15,8 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/aosp_avicii.mk
+    $(LOCAL_DIR)/cherish_avicii.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_avicii-eng \
-    aosp_avicii-user \
-    aosp_avicii-userdebug
+    cherish_avicii-user \
+    cherish_avicii-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0ca441f..bfea975 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -89,7 +89,7 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/oplus:libudfps_extension.oplus
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     $(DEVICE_PATH)/device_framework_matrix.xml \
     hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
-    vendor/aosp/config/device_framework_matrix.xml
+    vendor/cherish/config/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
 ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml
diff --git a/aosp_avicii.mk b/cherish_avicii.mk
similarity index 69%
rename from aosp_avicii.mk
rename to cherish_avicii.mk
index 8f146fc..1ef11a6 100644
--- a/aosp_avicii.mk
+++ b/cherish_avicii.mk
@@ -11,10 +11,15 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from avicii device
 $(call inherit-product, device/oneplus/avicii/device.mk)
 
-# Inherit some common PixelExperience stuff.
-$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
+# Inherit some common CherishOS stuff.
+$(call inherit-product, vendor/cherish/config/common_full_phone.mk)
 
-PRODUCT_NAME := aosp_avicii
+#CHERISH PROPERTIES
+EXTRA_UDFPS_ANIMATIONS := true
+TARGET_ENABLE_BLUR := true
+
+
+PRODUCT_NAME := cherish_avicii
 PRODUCT_DEVICE := avicii
 PRODUCT_MANUFACTURER := OnePlus
 PRODUCT_BRAND := OnePlus
@@ -26,6 +31,11 @@ PRODUCT_SYSTEM_DEVICE := Nord
 
 PRODUCT_GMS_CLIENTID_BASE := android-oneplus
 
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    ro.cherish.maintainer=Snippetguy
+
+CHERISH_BUILD_TYPE := OFFICIAL
+
 PRODUCT_BUILD_PROP_OVERRIDES += \
     TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
     TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)