diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index 8edd183..921ba7a 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -88,10 +88,17 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)
 ENABLE_VENDOR_RIL_SERVICE := true
 
 # Sepolicy
-include device/lineage/sepolicy/exynos/sepolicy.mk
-include device/samsung_slsi/sepolicy/sepolicy.mk
-BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
+BOARD_PLAT_PUBLIC_SEPOLICY_DIR += \
+    $(COMMON_PATH)/sepolicy/samsung_slsi/tee/public \
+    $(COMMON_PATH)/sepolicy/samsung_slsi/public
+    
+BOARD_VENDOR_SEPOLICY_DIRS += \
+    $(COMMON_PATH)/sepolicy/samsung_slsi/tee/vendor \
+    $(COMMON_PATH)/sepolicy/vendor
 
+BOARD_PLAT_PRIVATE_SEPOLICY_DIRS += \
+    $(COMMON_PATH)/sepolicy/samsung_slsi/private
+    
 # Vendor
 TARGET_COPY_OUT_VENDOR := vendor
 
diff --git a/universal7885-common/bluetooth/bdroid_buildcfg.h b/universal7885-common/bluetooth/bdroid_buildcfg.h
index fa22c6f..8577c44 100644
--- a/universal7885-common/bluetooth/bdroid_buildcfg.h
+++ b/universal7885-common/bluetooth/bdroid_buildcfg.h
@@ -1,6 +1,28 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
+#pragma push_macro("PROPERTY_VALUE_MAX")
+
+#include <cutils/properties.h>
+#include <string.h>
+
+static inline const char* BtmGetDefaultName()
+{
+    char product_device[PROPERTY_VALUE_MAX];
+    property_get("ro.product.device", product_device, "");
+
+
+    if (strstr(product_device, "a20e"))
+        return "Galaxy A20e";
+    if (strstr(product_device, "a20"))
+        return "Galaxy A20";
+
+    // Fallback to Moto SDM Generic
+    return "Samsung Galaxy";
+}
+
+#define BTM_DEF_LOCAL_NAME BtmGetDefaultName()
 #define BTM_ESCO_TRANSPORT_UNIT_SIZE_PCM16
 
+#pragma pop_macro("PROPERTY_VALUE_MAX")
 #endif