diff --git a/Android.mk b/Android.mk
index 7b824bf..d54b34d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
 # to only building on ARM if they include assembly. Individual makefiles
 # are responsible for having their own logic, for fine-grained control.
 
-ifneq ($(filter enchilada, $(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter enchilada beryllium, $(TARGET_BOARD_PLATFORM)),)
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a1bdf27..3c06926 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -57,11 +57,11 @@
 BOARD_HAVE_BLUETOOTH := true
 
 BOARD_SEPOLICY_DIRS += \
-    device/oneplus/enchilada/sepolicy \
+    device/generic/sdm845/sepolicy \
     system/bt/vendor_libs/linux/sepolicy
 
-DEVICE_MANIFEST_FILE := device/oneplus/enchilada/manifest.xml
-DEVICE_MATRIX_FILE := device/oneplus/enchilada/compatibility_matrix.xml
+DEVICE_MANIFEST_FILE := device/generic/sdm845/manifest.xml
+DEVICE_MATRIX_FILE := device/generic/sdm845/compatibility_matrix.xml
 
 # Enable dex pre-opt to speed up initial boot
 ifeq ($(HOST_OS),linux)
diff --git a/beryllium.mk b/beryllium.mk
index a8d5b9b..8186122 100644
--- a/beryllium.mk
+++ b/beryllium.mk
@@ -2,7 +2,7 @@
 TARGET_KERNEL_USE := mainline
 endif
 
-KERNEL_MODS := $(wildcard device/xiaomi/beryllium/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
+KERNEL_MODS := $(wildcard device/generic/sdm845/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
 
 # Following modules go to vendor partition
 # msm.ko is too big (31M) for ramdisk
@@ -14,8 +14,8 @@
 
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/xiaomi/beryllium/beryllium/device.mk)
-$(call inherit-product, device/xiaomi/beryllium/device-common.mk)
+$(call inherit-product, device/generic/sdm845/beryllium/device.mk)
+$(call inherit-product, device/generic/sdm845/device-common.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
 # Product overrides
diff --git a/beryllium/BoardConfig.mk b/beryllium/BoardConfig.mk
index b43d2bf..b40f9b4 100644
--- a/beryllium/BoardConfig.mk
+++ b/beryllium/BoardConfig.mk
@@ -1,4 +1,4 @@
-include device/xiaomi/beryllium/BoardConfigCommon.mk
+include device/generic/sdm845/BoardConfigCommon.mk
 
 # Copied from https://github.com/LineageOS/android_device_xiaomi_sdm845-common/blob/lineage-16.0/BoardConfigCommon.mk
 # Board Information
diff --git a/beryllium/device.mk b/beryllium/device.mk
index 91329a2..4c899d8 100644
--- a/beryllium/device.mk
+++ b/beryllium/device.mk
@@ -15,7 +15,7 @@
 #
 
 PRODUCT_SOONG_NAMESPACES += \
-    device/xiaomi/beryllium
+    device/generic/sdm845
 
 # copied from crosshatch
 # setup dalvik vm configs
@@ -25,9 +25,9 @@
 PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.beryllium \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beryllium \
-    device/xiaomi/beryllium/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.rc \
-    device/xiaomi/beryllium/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.usb.rc \
-    device/xiaomi/beryllium/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/beryllium.kl
+    device/generic/sdm845/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.rc \
+    device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.usb.rc \
+    device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/beryllium.kl
 
 # Build generic Audio HAL
 PRODUCT_PACKAGES := audio.primary.beryllium
@@ -44,4 +44,4 @@
     tqftpserv
 
 PRODUCT_COPY_FILES += \
-    device/xiaomi/beryllium/qcom/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qcom.rc
+    device/generic/sdm845/qcom/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qcom.rc
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index ff47cc5..74baaf7 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,7 +1,7 @@
 ifneq ($(filter enchilada, $(TARGET_DEVICE)),)
 
-IMAGE_GZ := device/oneplus/enchilada/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/Image.gz
-DTB := device/oneplus/enchilada/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/sdm845-oneplus-enchilada.dtb
+IMAGE_GZ := device/generic/sdm845/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/Image.gz
+DTB := device/generic/sdm845/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/sdm845-oneplus-enchilada.dtb
 
 $(PRODUCT_OUT)/kernel: $(IMAGE_GZ) $(DTB)
 	cat $(IMAGE_GZ) $(DTB) > $@
diff --git a/enchilada.mk b/enchilada.mk
index 3d49f6b..a09057b 100644
--- a/enchilada.mk
+++ b/enchilada.mk
@@ -2,11 +2,11 @@
 TARGET_KERNEL_USE := mainline
 endif
 
-KERNEL_MODS := 
+KERNEL_MODS := $(wildcard device/generic/sdm845/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
 
 # Following modules go to vendor partition
 # msm.ko is too big (31M) for ramdisk
-VENDOR_KERN_MODS := $(wildcard device/oneplus/enchilada/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
+VENDOR_KERN_MODS := 
 BOARD_VENDOR_KERNEL_MODULES := $(filter $(VENDOR_KERN_MODS),$(KERNEL_MODS))
 
 # All other modules go to ramdisk
@@ -14,8 +14,8 @@
 
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/oneplus/enchilada/enchilada/device.mk)
-$(call inherit-product, device/oneplus/enchilada/device-common.mk)
+$(call inherit-product, device/generic/sdm845/enchilada/device.mk)
+$(call inherit-product, device/generic/sdm845/device-common.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
 # Product overrides
diff --git a/enchilada/BoardConfig.mk b/enchilada/BoardConfig.mk
index 87f9f7b..9ed2c6e 100644
--- a/enchilada/BoardConfig.mk
+++ b/enchilada/BoardConfig.mk
@@ -1,4 +1,4 @@
-include device/oneplus/enchilada/BoardConfigCommon.mk
+include device/generic/sdm845/BoardConfigCommon.mk
 
 # Copied from https://github.com/LineageOS/android_device_oneplus_sdm845-common/blob/lineage-16.0/BoardConfigCommon.mk
 # Board Information
diff --git a/enchilada/device.mk b/enchilada/device.mk
index 5df8346..f453cd5 100644
--- a/enchilada/device.mk
+++ b/enchilada/device.mk
@@ -15,7 +15,7 @@
 #
 
 PRODUCT_SOONG_NAMESPACES += \
-    device/oneplus/enchilada
+    device/generic/sdm845
 
 # copied from crosshatch
 # setup dalvik vm configs
@@ -25,9 +25,9 @@
 PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.enchilada \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.enchilada \
-    device/oneplus/enchilada/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.rc \
-    device/oneplus/enchilada/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.usb.rc \
-    device/oneplus/enchilada/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/enchilada.kl
+    device/generic/sdm845/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.rc \
+    device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.usb.rc \
+    device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/enchilada.kl
 
 # Build generic Audio HAL
 PRODUCT_PACKAGES := audio.primary.enchilada
@@ -44,4 +44,4 @@
     tqftpserv
 
 PRODUCT_COPY_FILES += \
-    device/oneplus/enchilada/qcom/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qcom.rc
+    device/generic/sdm845/qcom/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qcom.rc