diff --git a/components/bt/host/bluedroid/Kconfig.in b/components/bt/host/bluedroid/Kconfig.in
index 2d8b5efc20..c15013719a 100644
--- a/components/bt/host/bluedroid/Kconfig.in
+++ b/components/bt/host/bluedroid/Kconfig.in
@@ -47,13 +47,12 @@ config BT_CLASSIC_ENABLED
     help
         For now this option needs "SMP_ENABLE" to be set to yes
 
-config BT_BQB_ENABLED
-    bool "BT HOST BQB"
+config BT_CLASSIC_BQB_ENABLED
+    bool "Host Qualitifcation support for Classic Bluetooth"
     depends on BT_CLASSIC_ENABLED
     default n
     help
-        This enables the BQB support.
-        Only for bt BQB test.
+        This enables functionalities of Host qualification for Classic Bluetooth.
 
 config BT_A2DP_ENABLE
     bool "A2DP"
diff --git a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
index 1cf013ba2b..244e3e8596 100644
--- a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
+++ b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
@@ -96,10 +96,10 @@
 #endif
 
 //BQB(BT)
-#ifdef CONFIG_BT_BQB_ENABLED
-#define UC_BT_BQB_ENABLED                   CONFIG_BT_BQB_ENABLED
+#ifdef CONFIG_BT_CLASSIC_BQB_ENABLED
+#define UC_BT_CLASSIC_BQB_ENABLED           CONFIG_BT_CLASSIC_BQB_ENABLED
 #else
-#define UC_BT_BQB_ENABLED                   FALSE
+#define UC_BT_CLASSIC_BQB_ENABLED           FALSE
 #endif
 
 //BLE
diff --git a/components/bt/host/bluedroid/common/include/common/bt_target.h b/components/bt/host/bluedroid/common/include/common/bt_target.h
index ac4bab44a6..1bbe99f20c 100644
--- a/components/bt/host/bluedroid/common/include/common/bt_target.h
+++ b/components/bt/host/bluedroid/common/include/common/bt_target.h
@@ -519,10 +519,10 @@
 #define BTM_BLE_PRIVATE_ADDR_INT UC_BT_BLE_RPA_TIMEOUT
 #endif
 
-#if (UC_BT_BQB_ENABLED == TRUE)
-#define BT_BQB_INCLUDED TRUE
+#if (UC_BT_CLASSIC_BQB_ENABLED == TRUE)
+#define BT_CLASSIC_BQB_INCLUDED TRUE
 #else
-#define BT_BQB_INCLUDED FALSE
+#define BT_CLASSIC_BQB_INCLUDED FALSE
 #endif
 
 /* This feature is used to eanble interleaved scan*/
@@ -1536,6 +1536,12 @@
 #define RFCOMM_INCLUDED             FALSE
 #endif
 
+#if (RFCOMM_INCLUDED == TRUE) && (BT_CLASSIC_BQB_INCLUDED == TRUE)
+#define BT_RFCOMM_BQB_INCLUDED      TRUE
+#else
+#define BT_RFCOMM_BQB_INCLUDED      FALSE
+#endif
+
 #ifndef BTA_JV_RFCOMM_INCLUDED
 #define BTA_JV_RFCOMM_INCLUDED      FALSE
 #endif
diff --git a/components/bt/host/bluedroid/stack/rfcomm/rfc_ts_frames.c b/components/bt/host/bluedroid/stack/rfcomm/rfc_ts_frames.c
index 6da9ff442d..86ba2550a5 100644
--- a/components/bt/host/bluedroid/stack/rfcomm/rfc_ts_frames.c
+++ b/components/bt/host/bluedroid/stack/rfcomm/rfc_ts_frames.c
@@ -500,15 +500,15 @@ void rfc_send_rpn (tRFC_MCB *p_mcb, UINT8 dlci, BOOLEAN is_command,
     rfc_send_buf_uih (p_mcb, RFCOMM_MX_DLCI, p_buf);
 }
 
-#if BT_BQB_INCLUDED
+#if BT_RFCOMM_BQB_INCLUDED
 /*******************************************************************************
 **
-** Function         bqb_rfc_send_msc_cmd
+** Function         rfc_bqb_send_msc_cmd
 **
 ** Description      This function sends msc command for BQB test.
 **
 *******************************************************************************/
-void bqb_rfc_send_msc_cmd(BD_ADDR cert_pts_addr)
+void rfc_bqb_send_msc_cmd(BD_ADDR cert_pts_addr)
 {
     UINT8       i;
     UINT8       dlci;
@@ -543,7 +543,7 @@ void bqb_rfc_send_msc_cmd(BD_ADDR cert_pts_addr)
     }
     osi_free(p_pars);
 }
-#endif /* BT_BQB_INCLUDED */
+#endif /* BT_RFCOMM_BQB_INCLUDED */
 
 /*******************************************************************************
 **