diff --git a/device.mk b/device.mk
index ce88686..9e6161d 100644
--- a/device.mk
+++ b/device.mk
@@ -235,7 +235,7 @@ PRODUCT_COPY_FILES += \
 
 # Doze
 PRODUCT_PACKAGES += \
-    OnePlusDoze
+    OplusDoze
 
 # DRM
 PRODUCT_PACKAGES += \
@@ -321,7 +321,7 @@ PRODUCT_PACKAGES += \
 
 # LiveDisplay
 PRODUCT_PACKAGES += \
-    vendor.lineage.livedisplay@2.1-service.oneplus
+    vendor.lineage.livedisplay@2.1-service.oplus
 
 # Media
 PRODUCT_COPY_FILES += \
@@ -385,13 +385,6 @@ PRODUCT_PACKAGES += \
     libOmxQcelp13Enc \
     libstagefrighthw
 
-# OnePlus
-PRODUCT_PACKAGES += \
-    oneplus-fwk
-
-PRODUCT_BOOT_JARS += \
-    oneplus-fwk
-
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power-service-qti \
@@ -442,7 +435,7 @@ PRODUCT_COPY_FILES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
-    hardware/oneplus
+    hardware/oplus
 
 # Telephony
 PRODUCT_PACKAGES += \
@@ -480,7 +473,7 @@ PRODUCT_PACKAGES += \
 
 # Touch
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.oneplus
+    vendor.lineage.touch@1.0-service.oplus
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
diff --git a/lineage.dependencies b/lineage.dependencies
index 18a16e7..ab2b304 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,7 +1,7 @@
 [
   {
-    "repository": "android_hardware_oneplus",
-    "target_path": "hardware/oneplus"
+    "repository": "android_hardware_oplus",
+    "target_path": "hardware/oplus"
   },
   {
     "repository": "android_kernel_oneplus_sm4350",
diff --git a/overlay-lineage/hardware/oneplus/doze/res/values/config.xml b/overlay-lineage/hardware/oplus/doze/res/values/config.xml
similarity index 100%
rename from overlay-lineage/hardware/oneplus/doze/res/values/config.xml
rename to overlay-lineage/hardware/oplus/doze/res/values/config.xml