diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 94f1511..3685a73 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -182,15 +182,14 @@ TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS := false
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
 
-# Display
-TARGET_USES_HWC2 := true
-TARGET_USES_ION := true
-TARGET_DISABLED_UBWC := true
-
 # FM
 BOARD_HAS_QCA_FM_SOC := cherokee
 BOARD_HAVE_QCOM_FM := true
 
+# Media
+TARGET_USES_ION := true
+TARGET_DISABLED_UBWC := true
+
 # RIL
 ENABLE_VENDOR_RIL_SERVICE := true
 
diff --git a/common.mk b/common.mk
index 208e474..5669f72 100644
--- a/common.mk
+++ b/common.mk
@@ -144,8 +144,7 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.display.allocator-service \
     libtinyxml \
     libtinyxml2 \
-    hwcomposer.atoll \
-    gralloc.atoll \
+    hwcomposer.qcom \
     libqdMetaData \
     libdisplayconfig.qti \
     vendor.qti.hardware.display.mapper@1.1.vendor \