diff --git a/bundle.json b/bundle.json
index a3f36c80..f6e2a9a1 100644
--- a/bundle.json
+++ b/bundle.json
@@ -26,7 +26,11 @@
         "device_auth_p2p_standard_protocol_enabled",
         "device_auth_p2p_lite_protocol_legacy_enabled",
         "device_auth_account_lite_protocol_enabled",
-        "device_auth_account_standard_protocol_enabled"
+        "device_auth_account_standard_protocol_enabled",
+        "device_auth_storage_path",
+        "device_auth_hichain_thread_stack_size",
+        "device_auth_enable_posix_interface",
+        "device_auth_enable_soft_bus_channel"
       ],
       "hisysevent_config": [
           "//base/security/device_auth/hisysevent.yaml"
diff --git a/default_config/mini/config.gni b/default_config/mini/config.gni
index 5c9c5648..58d6d604 100644
--- a/default_config/mini/config.gni
+++ b/default_config/mini/config.gni
@@ -16,7 +16,7 @@ declare_args() {
   enable_session_v1 = true
   enable_extend_plugin = false
   enable_account = false
-  enable_posix_interface = false
+  device_auth_enable_posix_interface = false
   enable_pseudonym = false
 
   enable_p2p_bind_lite_protocol = true
@@ -35,5 +35,5 @@ declare_args() {
   enable_key_agree_pake_ec_prime_x25519 = true
 
   max_auth_session_count = 10
-  deviceauth_hichain_thread_stack_size = 8192
+  device_auth_hichain_thread_stack_size = 8192
 }
diff --git a/default_config/small/config.gni b/default_config/small/config.gni
index 406c7115..4ca161a0 100644
--- a/default_config/small/config.gni
+++ b/default_config/small/config.gni
@@ -34,5 +34,5 @@ declare_args() {
   enable_key_agree_pake_ec_prime_x25519 = true
 
   max_auth_session_count = 10
-  deviceauth_hichain_thread_stack_size = 102400
+  device_auth_hichain_thread_stack_size = 102400
 }
diff --git a/default_config/standard/config.gni b/default_config/standard/config.gni
index 81873772..751b7375 100644
--- a/default_config/standard/config.gni
+++ b/default_config/standard/config.gni
@@ -34,5 +34,5 @@ declare_args() {
   enable_key_agree_pake_ec_prime_x25519 = true
 
   max_auth_session_count = 10
-  deviceauth_hichain_thread_stack_size = 102400
+  device_auth_hichain_thread_stack_size = 102400
 }
diff --git a/deps_adapter/BUILD.gn b/deps_adapter/BUILD.gn
index 592ce7a4..13f001c9 100644
--- a/deps_adapter/BUILD.gn
+++ b/deps_adapter/BUILD.gn
@@ -44,14 +44,14 @@ if (defined(ohos_lite)) {
         "${os_adapter_path}/impl/src/liteos/mini/hc_init_protection.c",
       ]
 
-      if (enable_posix_interface) {
+      if (device_auth_enable_posix_interface) {
         sources += [ "${os_adapter_path}/impl/src/liteos/mini/hc_file_posix.c" ]
       } else {
         sources += [ "${os_adapter_path}/impl/src/liteos/mini/hc_file.c" ]
       }
 
       cflags = [ "-DHILOG_ENABLE" ]
-      cflags += [ "-DAUTH_STORAGE_PATH=\"${deviceauth_storage_path}\"" ]
+      cflags += [ "-DAUTH_STORAGE_PATH=\"${device_auth_storage_path}\"" ]
       if (board_toolchain_type == "iccarm") {
         cflags += [
           "--diag_suppress",
diff --git a/deps_adapter/deviceauth_hals.gni b/deps_adapter/deviceauth_hals.gni
index eded31e2..b6d471b6 100644
--- a/deps_adapter/deviceauth_hals.gni
+++ b/deps_adapter/deviceauth_hals.gni
@@ -14,7 +14,7 @@
 import("//base/security/device_auth/deviceauth_env.gni")
 
 declare_args() {
-  deviceauth_storage_path = ""
+  device_auth_storage_path = ""
 }
 
 if (target_os == "liteos" ||
diff --git a/deviceauth_env.gni b/deviceauth_env.gni
index af2501aa..d5ea94a3 100644
--- a/deviceauth_env.gni
+++ b/deviceauth_env.gni
@@ -24,7 +24,7 @@ services_path = "${deviceauth_path}/services"
 
 declare_args() {
   deviceauth_feature_config = "//base/security/device_auth/default_config"
-  enable_soft_bus_channel = true
+  device_auth_enable_soft_bus_channel = true
 }
 
 build_flags = [
@@ -49,7 +49,7 @@ if (defined(ohos_lite)) {
   } else {
     import("${deviceauth_feature_config}/small/config.gni")
   }
-  enable_soft_bus_channel = false
+  device_auth_enable_soft_bus_channel = false
 } else {
   import("${deviceauth_feature_config}/standard/config.gni")
 }
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 4f732e36..7115ba74 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -43,7 +43,7 @@ if (os_level == "mini" || os_level == "small") {
       "//build/lite/config/component/cJSON:cjson_shared",
       "//commonlibrary/utils_lite:utils",
     ]
-    if (enable_soft_bus_channel) {
+    if (device_auth_enable_soft_bus_channel) {
       deps += [ "//foundation/communication/dsoftbus/sdk:softbus_client" ]
     }
     if (enable_extend_plugin) {
@@ -69,7 +69,7 @@ if (os_level == "mini" || os_level == "small") {
       cflags = build_flags
     }
     cflags += [
-      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
       "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
     ]
     if (ohos_kernel_type == "linux" || ohos_kernel_type == "liteos_a") {
@@ -187,7 +187,7 @@ if (os_level == "mini" || os_level == "small") {
     defines += [ "DEV_AUTH_HIVIEW_ENABLE" ]
     cflags = build_flags
     cflags += [
-      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
       "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
     ]
     if (target_cpu == "arm") {
diff --git a/services/deviceauth.gni b/services/deviceauth.gni
index bebf3387..f94e54f2 100644
--- a/services/deviceauth.gni
+++ b/services/deviceauth.gni
@@ -389,7 +389,7 @@ if (enable_extend_plugin) {
   deviceauth_files += account_auth_plugin_mock_files
 }
 
-if (enable_soft_bus_channel == true) {
+if (device_auth_enable_soft_bus_channel == true) {
   deviceauth_files += soft_bus_channel_files
 } else {
   deviceauth_files += soft_bus_channel_mock_files
diff --git a/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn b/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn
index 53f70f2b..c7b0ab67 100644
--- a/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn
+++ b/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn
@@ -57,7 +57,7 @@ ohos_fuzztest("IsoAuthTaskFuzzTest") {
   ]
   cflags += build_flags
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
   if (target_cpu == "arm") {
diff --git a/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn b/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn
index 43778461..78028bcb 100644
--- a/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn
+++ b/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("StandardExchangeTaskFuzzTest") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
   deps = [ "${deps_adapter_path}:${hal_module_name}" ]
diff --git a/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn b/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn
index 592caef5..9d47748c 100644
--- a/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn
@@ -75,7 +75,7 @@ ohos_fuzztest("CredsManagerFuzzTest") {
   ]
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
diff --git a/test/fuzztest/devauth_fuzzer/BUILD.gn b/test/fuzztest/devauth_fuzzer/BUILD.gn
index 2d0d443a..753fe93c 100644
--- a/test/fuzztest/devauth_fuzzer/BUILD.gn
+++ b/test/fuzztest/devauth_fuzzer/BUILD.gn
@@ -60,7 +60,7 @@ ohos_fuzztest("DevAuthFuzzTest") {
   ]
   cflags += build_flags
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
   sanitize = {
diff --git a/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn
index 45802d63..4d4a2230 100644
--- a/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServAddMemberToGroupFuzzTest") {
   sources = [ "devauthservaddmembertogroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn
index 627239b8..cab647ee 100644
--- a/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServAddMultiMembersToGroupFuzzTest") {
   sources = [ "devauthservaddmultimemberstogroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn
index 88bf4b95..f085f5f9 100644
--- a/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServAuthDeviceFuzzTest") {
   sources = [ "devauthservauthdevice_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn
index 79b41547..735383f5 100644
--- a/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCancelAuthRequestFuzzTest") {
   sources = [ "devauthservcancelauthrequest_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn
index 459ffe04..ea9ea54a 100644
--- a/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCancelBindRequestFuzzTest") {
   sources = [ "devauthservcancelbindrequest_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn
index ebc1917e..6a0e7b49 100644
--- a/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCheckAccessToGroupFuzzTest") {
   sources = [ "devauthservcheckaccesstogroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn
index f8318bf0..8b22160f 100644
--- a/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCreateGroupFuzzTest") {
   sources = [ "devauthservcreategroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn
index 9a765859..b34eb183 100644
--- a/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServDeleteGroupFuzzTest") {
   sources = [ "devauthservdeletegroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn
index cd4e7554..25e27d63 100644
--- a/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServDeleteMemberFromGroupFuzzTest") {
   sources = [ "devauthservdeletememberfromgroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn
index d9baf580..798daf1e 100644
--- a/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServDeleteMultiMembersFromGroupFuzzTest") {
   sources = [ "devauthservdeletemultimembersfromgroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn
index a18639d1..de67945f 100644
--- a/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetDeviceInfoByIdFuzzTest") {
   sources = [ "devauthservgetdeviceinfobyid_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn
index df786ad9..d505dc9c 100644
--- a/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetGroupInfoFuzzTest") {
   sources = [ "devauthservgetgroupinfo_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn
index f849b4cc..1451ff85 100644
--- a/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetGroupInfoByIdFuzzTest") {
   sources = [ "devauthservgetgroupinfobyid_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn
index 7f529be3..8088b63c 100644
--- a/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetJoinedGroupsFuzzTest") {
   sources = [ "devauthservgetjoinedgroups_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn
index aeabf46b..7d3eb300 100644
--- a/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetPkInfoListFuzzTest") {
   sources = [ "devauthservgetpkinfolist_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn
index 20dd905e..480f1cd6 100644
--- a/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetRegisterInfoFuzzTest") {
   sources = [ "devauthservgetregisterinfo_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn
index be60fdc7..5b057ffc 100644
--- a/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetRelatedGroupsFuzzTest") {
   sources = [ "devauthservgetrelatedgroups_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn
index 8c96fe0e..9c713815 100644
--- a/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetTrustedDevicesFuzzTest") {
   sources = [ "devauthservgettrusteddevices_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn
index 397cc523..43bfd632 100644
--- a/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServIsDeviceInGroupFuzzTest") {
   sources = [ "devauthservisdeviceingroup_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn
index 4a64cce5..e45b5f84 100644
--- a/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServProcessAuthDataFuzzTest") {
   sources = [ "devauthservprocessauthdata_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn
index 4e56d076..b87a8cd9 100644
--- a/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServProcessBindDataFuzzTest") {
   sources = [ "devauthservprocessbinddata_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn
index 17cb4d00..aacaad8b 100644
--- a/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServRegCallbackFuzzTest") {
   sources = [ "devauthservregcallback_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn
index 5fa11459..85624d56 100644
--- a/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServRegDataChangeListenerFuzzTest") {
   sources = [ "devauthservregdatachangelistener_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn
index 2e3ac827..64d4c41c 100644
--- a/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServUnregCallbackFuzzTest") {
   sources = [ "devauthservunregcallback_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn
index c012b807..c1715f8e 100644
--- a/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn
+++ b/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServUnregDataChangeListenerFuzzTest") {
   sources = [ "devauthservunregdatachangelistener_fuzzer.cpp" ]
   sources += deviceauth_files
   sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
     sources -= soft_bus_channel_files
     sources += soft_bus_channel_mock_files
   }
diff --git a/test/fuzztest/group_auth/account_related/accountrelatedgroupauth_fuzzer/BUILD.gn b/test/fuzztest/group_auth/account_related/accountrelatedgroupauth_fuzzer/BUILD.gn
index 55aef259..adec9d81 100644
--- a/test/fuzztest/group_auth/account_related/accountrelatedgroupauth_fuzzer/BUILD.gn
+++ b/test/fuzztest/group_auth/account_related/accountrelatedgroupauth_fuzzer/BUILD.gn
@@ -110,7 +110,7 @@ ohos_fuzztest("AccountRelatedGroupAuthFuzzTest") {
 
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE = ${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE = ${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT = ${max_auth_session_count}",
   ]
 
diff --git a/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn b/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn
index bf2179dd..94b91638 100644
--- a/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn
+++ b/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn
@@ -68,7 +68,7 @@ ohos_fuzztest("GroupOperationCommonFuzzTest") {
   ]
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
diff --git a/test/unittest/deviceauth/BUILD.gn b/test/unittest/deviceauth/BUILD.gn
index 6a6c5f22..3bd9a73e 100644
--- a/test/unittest/deviceauth/BUILD.gn
+++ b/test/unittest/deviceauth/BUILD.gn
@@ -120,7 +120,7 @@ ohos_unittest("deviceauth_llt") {
 
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
@@ -248,7 +248,7 @@ ohos_unittest("device_auth_func_test") {
 
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
@@ -366,7 +366,7 @@ ohos_unittest("device_auth_interface_test") {
 
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
@@ -483,7 +483,7 @@ ohos_unittest("deviceauth_unit_test") {
 
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
diff --git a/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn b/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn
index c73a0b5b..3f1e94c3 100644
--- a/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn
+++ b/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn
@@ -65,7 +65,7 @@ ohos_unittest("creds_manager_test") {
 
   cflags = [ "-DHILOG_ENABLE" ]
   cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
     "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
   ]
 
diff --git a/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn b/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn
index d16704f5..374d8937 100644
--- a/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn
+++ b/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn
@@ -58,7 +58,7 @@ if (support_os_account) {
 
     cflags = [ "-DHILOG_ENABLE" ]
     cflags += [
-      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
       "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
     ]
     if (target_cpu == "arm") {