diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 38eed06..e88c74b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,9 +15,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_avicii.mk
+    $(LOCAL_DIR)/droidx_avicii.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_avicii-eng \
-    lineage_avicii-user \
-    lineage_avicii-userdebug
+    droidx_avicii-eng \
+    droidx_avicii-user \
+    droidx_avicii-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 502cca0..680d0f3 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/lineage/config/device_framework_matrix.xml
+    vendor/droidx/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/crdroid.dependencies b/droidx.dependencies
similarity index 100%
rename from crdroid.dependencies
rename to droidx.dependencies
diff --git a/lineage_avicii.mk b/droidx_avicii.mk
similarity index 78%
rename from lineage_avicii.mk
rename to droidx_avicii.mk
index 79c1f54..96971ed 100644
--- a/lineage_avicii.mk
+++ b/droidx_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 Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common droidx stuff.
+$(call inherit-product, vendor/droidx/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_avicii
+# Droidx specific build flags
+DROIDX_GAPPS := true
+DROIDX_BUILD_TYPE := UNOFFICIAL
+TARGET_BOOT_ANIMATION_RES := 1080
+
+PRODUCT_NAME := droidx_avicii
 PRODUCT_DEVICE := avicii
 PRODUCT_MANUFACTURER := OnePlus
 PRODUCT_BRAND := OnePlus
diff --git a/overlay-lineage/frameworks/base/packages/SettingsLib/res/values/config.xml b/overlay-droidx/frameworks/base/packages/SettingsLib/res/values/config.xml
similarity index 100%
rename from overlay-lineage/frameworks/base/packages/SettingsLib/res/values/config.xml
rename to overlay-droidx/frameworks/base/packages/SettingsLib/res/values/config.xml
diff --git a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay-droidx/frameworks/base/packages/SystemUI/res/values/config.xml
similarity index 100%
rename from overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml
rename to overlay-droidx/frameworks/base/packages/SystemUI/res/values/config.xml
diff --git a/overlay-lineage/hardware/oplus/doze/res/values/config.xml b/overlay-droidx/hardware/oplus/doze/res/values/config.xml
similarity index 100%
rename from overlay-lineage/hardware/oplus/doze/res/values/config.xml
rename to overlay-droidx/hardware/oplus/doze/res/values/config.xml
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-droidx/lineage-sdk/lineage/res/res/values/config.xml
similarity index 100%
rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
rename to overlay-droidx/lineage-sdk/lineage/res/res/values/config.xml
diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-droidx/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
similarity index 100%
rename from overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
rename to overlay-droidx/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
diff --git a/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml b/overlay-droidx/packages/apps/Aperture/app/src/main/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
rename to overlay-droidx/packages/apps/Aperture/app/src/main/res/values/config.xml
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-droidx/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
rename to overlay-droidx/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-droidx/packages/apps/Settings/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Settings/res/values/config.xml
rename to overlay-droidx/packages/apps/Settings/res/values/config.xml
diff --git a/overlay/OPlusFrameworksResTarget/res/values/config.xml b/overlay/OPlusFrameworksResTarget/res/values/config.xml
index d90bac2..2bb462d 100644
--- a/overlay/OPlusFrameworksResTarget/res/values/config.xml
+++ b/overlay/OPlusFrameworksResTarget/res/values/config.xml
@@ -5,12 +5,6 @@
 -->
 <resources>
 
-     <!-- Whether device has warp charging support -->
-     <bool name="config_hasWarpCharger">true</bool>
-
-     <!-- Path to warp charging status file -->
-     <string name="config_oemFastChargerStatusPath">/sys/class/power_supply/battery/fastcharger</string>
-
     <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>
diff --git a/system.prop b/system.prop
new file mode 100644
index 0000000..df51665
--- /dev/null
+++ b/system.prop
@@ -0,0 +1 @@
+ro.droidx.maintainer=PSavarMattas
\ No newline at end of file