diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1f8de15..595e986 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -37,6 +37,7 @@ TARGET_BOARD_INFO_FILE := device/nintendo/nx/board-info.txt
 DEVICE_MANIFEST_FILE := device/nintendo/nx/manifest.xml
 
 # Bluetooth
+TARGET_VENDOR_PROP += device/nintendo/nx/bluetooth.prop
 ifeq ($(TARGET_TEGRA_BT),bcm)
 BOARD_CUSTOM_BT_CONFIG := device/nintendo/nx/comms/vnd_nx.txt
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/nintendo/nx/comms
diff --git a/bluetooth.prop b/bluetooth.prop
new file mode 100644
index 0000000..6eeee76
--- /dev/null
+++ b/bluetooth.prop
@@ -0,0 +1 @@
+bluetooth.device.default_name=Nintendo Switch