diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 87a8437..0dfcb3a 100755
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -18,8 +18,6 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#define BTM_DEF_LOCAL_NAME   "Samsung Galaxy Tab Pro 8.4"
-
 /* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */
 #define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE
 
diff --git a/system.prop b/system.prop
index e36deda..dd0efe3 100755
--- a/system.prop
+++ b/system.prop
@@ -21,6 +21,7 @@ vendor.voice.path.for.pcm.voip=false
 ro.kernel.ebpf.supported=false
 
 # Bluetooth
+bluetooth.device.default_name=Samsung Galaxy Tab Pro 8.4
 vendor.qcom.bluetooth.soc=smd
 ro.bluetooth.a2dp_offload.supported=false
 ro.bt.bdaddr_path=/efs/bluetooth/bt_addr