diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn b/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn
index 5cb2b29aa76ede016b5ec5aae771fcd1c28bbefe..5ca422ef3d94d5f5d59823c39489114ddec15a21 100755
--- a/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn
+++ b/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn
@@ -41,7 +41,7 @@ ohos_unittest("DistributedKvDataManagerTest") {
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
@@ -62,7 +62,7 @@ ohos_unittest("DistributedKvDataManagerEncryptTest") {
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
@@ -87,7 +87,7 @@ ohos_unittest("KvStoreClientTest") {
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
@@ -108,7 +108,7 @@ ohos_unittest("KvStoreSnapshotClientTest") {
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
@@ -129,7 +129,7 @@ ohos_unittest("LocalSubscribeStoreTest") {
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
diff --git a/interfaces/innerkits/distributeddata/BUILD.gn b/interfaces/innerkits/distributeddata/BUILD.gn
index 255be15903cde2f95df640d45cc795ee69cb75cf..d434691a8967993c9dc5771bffd5d0d9bf1397ce 100755
--- a/interfaces/innerkits/distributeddata/BUILD.gn
+++ b/interfaces/innerkits/distributeddata/BUILD.gn
@@ -72,13 +72,13 @@ ohos_shared_library("distributeddata_inner") {
   configs = [ ":distributeddatafwk_config" ]
 
   deps = [
-    "//utils/native/base:utils",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
+    "//utils/native/base:utils",
   ]
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 
   public_configs = [ ":distributeddatafwk_public_config" ]
diff --git a/services/distributeddataservice/adapter/permission/BUILD.gn b/services/distributeddataservice/adapter/permission/BUILD.gn
index aa017d31964e24b4dde5fc83cdf2579571f1685c..128525f24ca069761ecb2c65517a8d8d60b079bf 100755
--- a/services/distributeddataservice/adapter/permission/BUILD.gn
+++ b/services/distributeddataservice/adapter/permission/BUILD.gn
@@ -34,10 +34,10 @@ ohos_static_library("distributeddata_permission_static") {
   }
   ldflags = [ "-Wl,--exclude-libs,ALL" ]
   deps = [
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "../utils:distributeddata_utils_static",
-    "//utils/native/base:utils",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//third_party/openssl:libcrypto_static",
+    "//utils/native/base:utils",
   ]
 
   external_deps = [
@@ -47,6 +47,6 @@ ohos_static_library("distributeddata_permission_static") {
     "appexecfwk_standard:appexecfwk_core",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
   ]
 }
diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn
index a25a7a046f96808dc1b6880ac4b2ccff889f5dc5..67753c29872b527202ed1b6875975568bc56c8a7 100755
--- a/services/distributeddataservice/app/BUILD.gn
+++ b/services/distributeddataservice/app/BUILD.gn
@@ -16,17 +16,11 @@ import("//build/ohos_var.gni")
 group("build_module") {
   deps = [ ":distributeddataservice" ]
   if (build_public_version) {
-    deps += [
-      ":distributeddata_profile",
-    ]
-        if (use_musl) {
-        deps += [
-          ":distributed_data.cfg",
-        ]
+    deps += [ ":distributeddata_profile" ]
+    if (use_musl) {
+      deps += [ ":distributed_data.cfg" ]
     } else {
-        deps += [
-          ":distributed_data.rc",
-        ]
+      deps += [ ":distributed_data.rc" ]
     }
   }
 }
@@ -103,32 +97,31 @@ ohos_shared_library("distributeddataservice") {
   ldflags = [ "-Wl,--exclude-libs,libcrypto_static.a" ]
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//utils/native/base:utils",
   ]
 
   external_deps = [
+    "aafwk_standard:base",
+    "aafwk_standard:intent",
     "appexecfwk_standard:appexecfwk_base",
     "appexecfwk_standard:appexecfwk_core",
-
     "battery_manager_native:batterysrv_client",
-    "aafwk_standard:base",
-    "aafwk_standard:intent",
     "hiviewdfx_hilog_native:libhilog",
+    "huks_standard:libhukssdk",
     "ipc:ipc_core",
+    "permission_standard:libpermissionsdk_standard",
     "power_manager_native:powermgr_client",
     "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
+    "samgr_standard:samgr_proxy",
     "startup_l2:syspara",
-    "permission_standard:libpermissionsdk_standard",
-    "huks_standard:libhukssdk",
   ]
 
   subsystem_name = "distributeddatamgr"
diff --git a/services/distributeddataservice/app/src/uninstaller/BUILD.gn b/services/distributeddataservice/app/src/uninstaller/BUILD.gn
index 4194572e35b22e80c8626797f37eb3b0ef87af73..696f979b00e7851c87a09e9a48ecf01eb58461eb 100755
--- a/services/distributeddataservice/app/src/uninstaller/BUILD.gn
+++ b/services/distributeddataservice/app/src/uninstaller/BUILD.gn
@@ -36,7 +36,7 @@ ohos_static_library("distributeddata_uninstaller_static") {
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//utils/native/base:utils",
- ]
+  ]
 
   external_deps = [
     "appexecfwk_standard:appexecfwk_base",
@@ -44,10 +44,10 @@ ohos_static_library("distributeddata_uninstaller_static") {
     # "ces:libcommonevent",
     "aafwk_standard:want",
     "ces_standard:cesfwk_innerkits",
+    "dmsfwk_standard:zuri",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
-    "dmsfwk_standard:zuri"
+    "samgr_standard:samgr_proxy",
   ]
 }
diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn
index e4563408d006887e31b0b8d94e40fe036eead68e..3c36cc90d3a4fd713fedaa585b41be9fb1767729 100755
--- a/services/distributeddataservice/app/test/BUILD.gn
+++ b/services/distributeddataservice/app/test/BUILD.gn
@@ -66,24 +66,24 @@ ohos_unittest("KvStoreImplLogicalIsolationTest") {
 
   external_deps = [
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -119,24 +119,24 @@ ohos_unittest("KvStoreImplPhysicalIsolationTest") {
 
   external_deps = [
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -172,24 +172,24 @@ ohos_unittest("KvStoreDataServiceTest") {
 
   external_deps = [
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -225,24 +225,24 @@ ohos_unittest("KvStoreBackupTest") {
 
   external_deps = [
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -260,18 +260,18 @@ ohos_unittest("KvStoreFlowCtrlManagerTest") {
 
   external_deps = [
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -306,24 +306,24 @@ ohos_unittest("KvStoreSyncManagerTest") {
 
   external_deps = [
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -359,13 +359,13 @@ ohos_unittest("KvStoreUninstallerTest") {
 
   deps = [
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/account:distributeddata_account_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/broadcaster:distributeddata_broadcaster_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/permission:distributeddata_permission_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/utils:distributeddata_utils_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/flowctrl_manager:distributeddata_flowctrl_static",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app/src/uninstaller:distributeddata_uninstaller_static",
-    "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:distributeddb",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -375,13 +375,13 @@ ohos_unittest("KvStoreUninstallerTest") {
     "aafwk_standard:base",
     "aafwk_standard:intent",
     "battery_manager_native:batterysrv_client",
-    "power_manager_native:powermgr_client",
     "hiviewdfx_hilog_native:libhilog",
     "huks_standard:libhukssdk",
     "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_L2:samgr_proxy",
     "permission_standard:libpermissionsdk_standard",
+    "power_manager_native:powermgr_client",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
   ]
 }