diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index a41ec90..b317d89 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -22,7 +22,6 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#define BTM_DEF_LOCAL_NAME "Motorola Edge 20"
 // Disables read remote device feature
 #define MAX_ACL_CONNECTIONS   16
 #define MAX_L2CAP_CHANNELS    16
diff --git a/vendor.prop b/vendor.prop
index c328aa7..63dc0c9 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,3 +1,6 @@
+# Bluetooth
+bluetooth.device.default_name=Motorola Edge 20
+
 # Camera
 persist.vendor.camera.physical.num=4