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