diff --git a/device.mk b/device.mk
index 35379fa6..1af6c81a 100644
--- a/device.mk
+++ b/device.mk
@@ -119,7 +119,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.a2dp.source.enabled=true \
 	bluetooth.profile.avrcp.target.enabled=true \
 	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.unicast.server.enabled=true \
+	bluetooth.profile.bap.unicast.client.enabled=true \
 	bluetooth.profile.bas.client.enabled=true \
 	bluetooth.profile.csip.set_coordinator.enabled=true \
 	bluetooth.profile.gatt.enabled=true \
@@ -134,8 +134,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.pan.panu.enabled=true \
 	bluetooth.profile.pbap.server.enabled=true \
 	bluetooth.profile.sap.server.enabled=true \
-	bluetooth.profile.tbs.server.enabled=true \
-	bluetooth.profile.vc.server.enabled=true
+	bluetooth.profile.ccp.server.enabled=true \
+	bluetooth.profile.vcp.controller.enabled=true
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	telephony.active_modems.max_count=2