diff --git a/BUILD.gn b/BUILD.gn
index 0010f77e..13f478c6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -26,7 +26,7 @@ if (defined(ohos_lite)) {
       deps = []
     }
   } else {
-    lite_component("device_manager_base") {
+    lite_component("device_manager") {
       features = [
         "utils:devicemanagerutils",
         "services/devicemanagerservice:devicemanagerservice",
@@ -40,7 +40,7 @@ if (defined(ohos_lite)) {
     }
   }
 } else {
-  group("device_manager_base") {
+  group("device_manager") {
     deps = [
       "ext:ext_modules",
       "interfaces/inner_kits/native_cpp:devicemanagersdk",
diff --git a/README.md b/README.md
index fc2e5ec8..8e8472da 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The figure below shows the architecture and dependencies of DeviceManager:
 ## Directory Structure
 
 ```
-foundation/distributedhardware/devicemanager
+foundation/distributedhardware/device_manager
 ├── common                        # Header files of common capabilities
 │   └── include
 │       └── ipc
@@ -215,7 +215,7 @@ This FA is called **DeviceManager_UI.hap**, which is preset as a system applicat
 
 - Compilation and running
 
-  Import the **devicemanager/display** project to DevEco Studio 2.2 Beta1. Copy the **@ohos.distributedHardware.deviceManager.d.ts** file in the **display** directory to the **Sdk\js\2.2.0.1\api\common** directory for compilation, building, and debugging.
+  Import the **device_manager/display** project to DevEco Studio 2.2 Beta1. Copy the **@ohos.distributedHardware.deviceManager.d.ts** file in the **display** directory to the **Sdk\js\2.2.0.1\api\common** directory for compilation, building, and debugging.
 
 - Compilation environment: IDE 2.2 SDK6
 
diff --git a/README_zh.md b/README_zh.md
index 86b85887..20e209e3 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -11,7 +11,7 @@ DeviceManager组件在OpenHarmony上提供账号无关的分布式设备的认
 ## 目录
 
 ```
-foundation/distributedhardware/devicemanager
+foundation/distributedhardware/device_manager
 ├── common                        #公共能力头文件存放目录
 │   └── include
 │       └── ipc
diff --git a/bundle.json b/bundle.json
index 737eff67..082cdd9c 100644
--- a/bundle.json
+++ b/bundle.json
@@ -1,20 +1,20 @@
 {
-    "name": "@ohos/device_manager_base",
+    "name": "@ohos/device_manager",
     "description": "device manager service",
     "version": "3.1",
     "license": "Apache License 2.0",
     "repository": "https://gitee.com/openharmony/device_manager",
     "publishAs": "code-segment",
     "segment": {
-        "destPath": "foundation/distributedhardware/devicemanager"
+        "destPath": "foundation/distributedhardware/device_manager"
     },
     "dirs": {},
     "scripts": {},
     "component": {
-        "name": "device_manager_base",
+        "name": "device_manager",
         "subsystem": "distributedhardware",
         "syscap":[ "SystemCapability.DistributedHardware.DeviceManager" ],
-        "features":["device_manager_base_no_interaction_auth"],
+        "features":["device_manager_no_interaction_auth"],
         "adapted_system_type": [ "standard", "small" ],
         "rom": "2M",
         "ram": "16M",
@@ -42,12 +42,12 @@
         },
         "build": {
             "sub_component": [
-                "//foundation/distributedhardware/devicemanager:device_manager_base"
+                "//foundation/distributedhardware/device_manager:device_manager"
             ],
             "inner_kits": [
                 {
                 "type": "so",
-                "name": "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+                "name": "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
                 "header": {
                     "header_files": [
                         "device_manager.h",
@@ -55,12 +55,12 @@
                         "dm_device_info.h",
                         "dm_subscribe_info.h"
                     ],
-                    "header_base": "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include"
+                    "header_base": "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include"
                 }
                 }
             ],
             "test": [
-                "//foundation/distributedhardware/devicemanager:device_manager_test"
+                "//foundation/distributedhardware/device_manager:device_manager_test"
             ]
         }
     }
diff --git a/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn b/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn
index 471fb441..31139130 100644
--- a/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn
+++ b/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn
@@ -12,11 +12,11 @@
 # limitations under the License.
 
 import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 gen_sa_dialog_js("dialog_js_files_etc") {
-  project_path = "//foundation/distributedhardware/devicemanager/common/include/show_confirm_dialog/dialog_ui/js"
+  project_path = "//foundation/distributedhardware/device_manager/common/include/show_confirm_dialog/dialog_ui/js"
   dialog_name = "config_dialog_service"
-  part_name = "device_manager_base"
+  part_name = "device_manager"
   subsystem_name = "distributedhardware"
 }
diff --git a/devicemanager.gni b/device_manager.gni
similarity index 92%
rename from devicemanager.gni
rename to device_manager.gni
index 8159311c..450accdf 100644
--- a/devicemanager.gni
+++ b/device_manager.gni
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 #------------------------device manager------------------------------#
-devicemanager_path = "//foundation/distributedhardware/devicemanager"
+devicemanager_path = "//foundation/distributedhardware/device_manager"
 
 common_path = "${devicemanager_path}/common"
 utils_path = "${devicemanager_path}/utils"
@@ -29,7 +29,7 @@ aaservices_path = "//foundation/ability/ability_runtime/services"
 #----------------------compilation options--------------------------#
 dm_ldflags = [ "-lpthread" ]
 declare_args() {
-  device_manager_base_no_interaction_auth = false
+  device_manager_no_interaction_auth = false
 
   if (!defined(global_parts_info) ||
       defined(global_parts_info.account_os_account)) {
diff --git a/ext/BUILD.gn b/ext/BUILD.gn
index 99bdeaa3..0b93c79d 100644
--- a/ext/BUILD.gn
+++ b/ext/BUILD.gn
@@ -12,13 +12,13 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 group("ext_modules") {
   deps = []
   if (support_jsapi) {
     deps += [ "./profile:devicemanagerext_profile" ]
-    if (device_manager_base_no_interaction_auth) {
+    if (device_manager_no_interaction_auth) {
       deps += [ "./no_interaction_auth:devicemanagerext_no_interaction_auth" ]
     } else {
       deps += [ "./pin_auth:devicemanagerext_pin_auth" ]
diff --git a/ext/no_interaction_auth/BUILD.gn b/ext/no_interaction_auth/BUILD.gn
index 76d847f9..1ef6a856 100644
--- a/ext/no_interaction_auth/BUILD.gn
+++ b/ext/no_interaction_auth/BUILD.gn
@@ -17,7 +17,7 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 }
 
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 if (defined(ohos_lite)) {
 } else {
@@ -70,7 +70,7 @@ if (defined(ohos_lite)) {
       "${innerkits_path}/native_cpp:devicemanagersdk",
       "${utils_path}:devicemanagerutils",
       "//base/security/deviceauth/services:deviceauth_sdk",
-      "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+      "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
       "//utils/native/base:utils",
     ]
 
@@ -97,6 +97,6 @@ if (defined(ohos_lite)) {
 
     subsystem_name = "distributedhardware"
 
-    part_name = "device_manager_base"
+    part_name = "device_manager"
   }
 }
diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn
index 90d93114..886c3323 100644
--- a/ext/pin_auth/BUILD.gn
+++ b/ext/pin_auth/BUILD.gn
@@ -16,7 +16,7 @@ if (defined(ohos_lite)) {
 } else {
   import("//build/ohos.gni")
 }
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 if (defined(ohos_lite)) {
   shared_library("devicemanagerext_pin_auth") {
@@ -142,7 +142,7 @@ if (defined(ohos_lite)) {
       "${utils_path}:devicemanagerutils",
       "//base/security/deviceauth/services:deviceauth_sdk",
       "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr",
-      "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+      "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
       "//utils/native/base:utils",
     ]
 
@@ -169,6 +169,6 @@ if (defined(ohos_lite)) {
 
     subsystem_name = "distributedhardware"
 
-    part_name = "device_manager_base"
+    part_name = "device_manager"
   }
 }
diff --git a/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn b/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn
index 72be3dd8..7f06ec23 100644
--- a/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn
+++ b/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn
@@ -12,11 +12,11 @@
 # limitations under the License.
 
 import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 gen_sa_dialog_js("dialog_js_files_etc") {
-  project_path = "//foundation/distributedhardware/devicemanager/ext/pin_auth/input_pin_dialog/dialog_ui/js"
+  project_path = "//foundation/distributedhardware/device_manager/ext/pin_auth/input_pin_dialog/dialog_ui/js"
   dialog_name = "input_pin_service"
-  part_name = "device_manager_base"
+  part_name = "device_manager"
   subsystem_name = "distributedhardware"
 }
diff --git a/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn b/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn
index 2fe9a1de..844e58a7 100644
--- a/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn
+++ b/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn
@@ -12,13 +12,13 @@
 # limitations under the License.
 
 import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 gen_sa_dialog_js("dialog_js_files_etc") {
-  if (!device_manager_base_no_interaction_auth) {
-    project_path = "//foundation/distributedhardware/devicemanager/ext/pin_auth/show_pin_dialog/dialog_ui/js"
+  if (!device_manager_no_interaction_auth) {
+    project_path = "//foundation/distributedhardware/device_manager/ext/pin_auth/show_pin_dialog/dialog_ui/js"
   }
   dialog_name = "show_pin_service"
-  part_name = "device_manager_base"
+  part_name = "device_manager"
   subsystem_name = "distributedhardware"
 }
diff --git a/ext/profile/BUILD.gn b/ext/profile/BUILD.gn
index 23c9e686..f33fa1ff 100644
--- a/ext/profile/BUILD.gn
+++ b/ext/profile/BUILD.gn
@@ -17,7 +17,7 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 }
 
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 if (defined(ohos_lite)) {
 } else {
@@ -70,6 +70,6 @@ if (defined(ohos_lite)) {
 
     subsystem_name = "distributedhardware"
 
-    part_name = "device_manager_base"
+    part_name = "device_manager"
   }
 }
diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn
index 593cd582..aa5dbcd0 100644
--- a/interfaces/inner_kits/native_cpp/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/BUILD.gn
@@ -16,7 +16,7 @@ if (defined(ohos_lite)) {
 } else {
   import("//build/ohos.gni")
 }
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 if (defined(ohos_lite)) {
   if (ohos_kernel_type == "liteos_m") {
@@ -152,6 +152,6 @@ if (defined(ohos_lite)) {
 
     subsystem_name = "distributedhardware"
 
-    part_name = "device_manager_base"
+    part_name = "device_manager"
   }
 }
diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
index d787aa0f..2133cbe3 100644
--- a/interfaces/kits/js/BUILD.gn
+++ b/interfaces/kits/js/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ohos_shared_library("devicemanager") {
   include_dirs = [
@@ -38,7 +38,7 @@ ohos_shared_library("devicemanager") {
   deps = [
     "${utils_path}:devicemanagerutils",
     "//foundation/arkui/napi:ace_napi",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//utils/native/base:utils",
   ]
 
@@ -59,5 +59,5 @@ ohos_shared_library("devicemanager") {
 
   subsystem_name = "distributedhardware"
   relative_install_dir = "module/distributedhardware"
-  part_name = "device_manager_base"
+  part_name = "device_manager"
 }
diff --git a/interfaces/kits/js_mini/BUILD.gn b/interfaces/kits/js_mini/BUILD.gn
index 9f23c769..339fc35c 100644
--- a/interfaces/kits/js_mini/BUILD.gn
+++ b/interfaces/kits/js_mini/BUILD.gn
@@ -17,7 +17,7 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 }
 
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 innerkits_path_mini = "${devicemanager_path}/interfaces/inner_kits"
 kits_path = "${devicemanager_path}/interfaces/kits"
 
diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index 6edcf99e..b411dc2d 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -16,5 +16,5 @@ import("//build/ohos/sa_profile/sa_profile.gni")
 ohos_sa_profile("dm_sa_profile") {
   sources = [ "4802.xml" ]
 
-  part_name = "device_manager_base"
+  part_name = "device_manager"
 }
diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn
index 1c748cc3..2be7fed6 100755
--- a/services/devicemanagerservice/BUILD.gn
+++ b/services/devicemanagerservice/BUILD.gn
@@ -17,7 +17,7 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 }
 
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 if (defined(ohos_lite)) {
   if (ohos_kernel_type == "liteos_m") {
@@ -68,7 +68,7 @@ if (defined(ohos_lite)) {
         "//foundation/communication/dsoftbus/interfaces/kits/discovery",
         "//foundation/communication/dsoftbus/interfaces/kits/transport",
         "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-        "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/include/dependency/multipleuser",
+        "//foundation/distributedhardware/device_manager/services/devicemanagerservice/include/dependency/multipleuser",
         "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
         "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
       ]
@@ -311,7 +311,7 @@ if (defined(ohos_lite)) {
       deps += [ "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits" ]
     }
 
-    if (!device_manager_base_no_interaction_auth) {
+    if (!device_manager_no_interaction_auth) {
       deps += [
         "${common_path}/include/show_confirm_dialog/dialog_ui/js:dialog_js_files_etc",
         "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr",
@@ -338,6 +338,6 @@ if (defined(ohos_lite)) {
 
     subsystem_name = "distributedhardware"
 
-    part_name = "device_manager_base"
+    part_name = "device_manager"
   }
 }
diff --git a/test/benchmarktest/BUILD.gn b/test/benchmarktest/BUILD.gn
index 4897663f..1c1a3b44 100644
--- a/test/benchmarktest/BUILD.gn
+++ b/test/benchmarktest/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 group("benchmarktest") {
   testonly = true
diff --git a/test/benchmarktest/device_manager_fa_test/BUILD.gn b/test/benchmarktest/device_manager_fa_test/BUILD.gn
index 23b987c3..3015cdbf 100644
--- a/test/benchmarktest/device_manager_fa_test/BUILD.gn
+++ b/test/benchmarktest/device_manager_fa_test/BUILD.gn
@@ -12,9 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
-module_output_path = "device_manager_base/devicemanager"
+module_output_path = "device_manager/devicemanager"
 
 ohos_benchmarktest("DeviceManagerFaTest") {
   module_out_path = module_output_path
@@ -45,8 +45,8 @@ ohos_benchmarktest("DeviceManagerFaTest") {
     "//base/security/deviceauth/services:deviceauth_sdk",
     "//foundation/arkui/napi:ace_napi",
     "//foundation/communication/dsoftbus/sdk:softbus_client",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
     "//third_party/benchmark:benchmark",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/googletest:gtest_main",
diff --git a/test/benchmarktest/device_manager_test/BUILD.gn b/test/benchmarktest/device_manager_test/BUILD.gn
index 27fd9ddd..96d81bc7 100644
--- a/test/benchmarktest/device_manager_test/BUILD.gn
+++ b/test/benchmarktest/device_manager_test/BUILD.gn
@@ -12,9 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
-module_output_path = "device_manager_base/devicemanager"
+module_output_path = "device_manager/devicemanager"
 
 ohos_benchmarktest("DeviceManagerTest") {
   module_out_path = module_output_path
@@ -31,7 +31,7 @@ ohos_benchmarktest("DeviceManagerTest") {
     "${utils_path}:devicemanagerutils",
     "${utils_path}:devicemanagerutils",
     "//foundation/arkui/napi:ace_napi",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//third_party/benchmark:benchmark",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/googletest:gtest_main",
diff --git a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn
index 6e5b0485..d55ccc4d 100644
--- a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn
+++ b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn
@@ -14,12 +14,12 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("DeviceManagerImplFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/devicemanagerimpl_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/devicemanagerimpl_fuzzer"
 
   include_dirs = [
     "${utils_path}/include",
@@ -55,12 +55,12 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -76,7 +76,7 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") {
     "//third_party/jsframework/runtime/main/extend/systemplugin",
     "//third_party/node/benchmark",
     "//third_party/libuv/include",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js/include",
     "//third_party/node/src",
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
@@ -93,7 +93,7 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") {
   deps = [
     "${utils_path}:devicemanagerutils",
     "//foundation/arkui/napi:ace_napi",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//utils/native/base:utils",
   ]
 
diff --git a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn
index 2ae2955a..92a33f9c 100644
--- a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn
+++ b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn
@@ -14,12 +14,12 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("DeviceManagerNotifyFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/devicemanagernotify_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/devicemanagernotify_fuzzer"
 
   include_dirs = [
     "//utils/native/base/include",
@@ -53,12 +53,12 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -72,8 +72,8 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") {
   sources = [ "device_manager_notify_fuzzer.cpp" ]
 
   deps = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
diff --git a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn
index f2a434ff..64f686ee 100644
--- a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn
@@ -14,12 +14,12 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("DeviceManagerServiceFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/devicemanagerservice_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/devicemanagerservice_fuzzer"
 
   include_dirs = [
     "//utils/native/base/include",
@@ -53,12 +53,12 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -72,8 +72,8 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") {
   sources = [ "device_manager_service_fuzzer.cpp" ]
 
   deps = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn
index 1721e436..3c6f6aaa 100644
--- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn
@@ -14,16 +14,16 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("IpcClientManagerFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/ipcclientmanager_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/ipcclientmanager_fuzzer"
 
   include_dirs = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js/include",
     "//third_party/node/src",
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
@@ -54,12 +54,12 @@ ohos_fuzztest("IpcClientManagerFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -93,8 +93,8 @@ ohos_fuzztest("IpcClientManagerFuzzTest") {
     "${utils_path}:devicemanagerutils",
     "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits",
     "//base/security/deviceauth/services:deviceauth_sdk",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
@@ -124,7 +124,7 @@ ohos_fuzztest("IpcClientManagerFuzzTest") {
     "${innerkits_path}/native_cpp:devicemanagersdk",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn
index e8b189b6..88a737f2 100644
--- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn
@@ -14,16 +14,16 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("IpcCmdRegisterFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/ipccmdregister_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/ipccmdregister_fuzzer"
 
   include_dirs = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js/include",
     "//third_party/node/src",
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
@@ -54,12 +54,12 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -77,7 +77,7 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") {
     "//third_party/jsframework/runtime/main/extend/systemplugin",
     "//third_party/node/benchmark",
     "//third_party/libuv/include",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/include/ipc/lite",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice/include/ipc/lite",
   ]
   cflags = [
     "-g",
@@ -94,8 +94,8 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") {
     "${utils_path}:devicemanagerutils",
     "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits",
     "//base/security/deviceauth/services:deviceauth_sdk",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
@@ -125,7 +125,7 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") {
     "${innerkits_path}/native_cpp:devicemanagersdk",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn
index e34f0969..0bdd44de 100644
--- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn
@@ -14,16 +14,16 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("IpcServerClientProxyFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/ipcserverclientproxy_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/ipcserverclientproxy_fuzzer"
 
   include_dirs = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js/include",
     "//third_party/node/src",
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
@@ -54,12 +54,12 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -93,8 +93,8 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") {
     "${utils_path}:devicemanagerutils",
     "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits",
     "//base/security/deviceauth/services:deviceauth_sdk",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
@@ -124,7 +124,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") {
     "${innerkits_path}/native_cpp:devicemanagersdk",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn
index 47052b68..978b0a07 100644
--- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn
@@ -14,16 +14,16 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("IpcServerListenerFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/ipcserverlistener_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/ipcserverlistener_fuzzer"
 
   include_dirs = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js/include",
     "//third_party/node/src",
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
@@ -54,12 +54,12 @@ ohos_fuzztest("IpcServerListenerFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -93,8 +93,8 @@ ohos_fuzztest("IpcServerListenerFuzzTest") {
     "${utils_path}:devicemanagerutils",
     "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits",
     "//base/security/deviceauth/services:deviceauth_sdk",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
@@ -124,7 +124,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") {
     "${innerkits_path}/native_cpp:devicemanagersdk",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn
index 7fa5a7e3..3a1a18d1 100644
--- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn
@@ -14,16 +14,16 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("IpcServerStubFuzzTest") {
-  module_out_path = "device_manager_base/devicemanager"
-  fuzz_config_file = "//foundation/distributedhardware/devicemanager/test/fuzztest/ipcserverstub_fuzzer"
+  module_out_path = "device_manager/devicemanager"
+  fuzz_config_file = "//foundation/distributedhardware/device_manager/test/fuzztest/ipcserverstub_fuzzer"
 
   include_dirs = [
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js/include",
     "//third_party/node/src",
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
@@ -54,12 +54,12 @@ ohos_fuzztest("IpcServerStubFuzzTest") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -93,8 +93,8 @@ ohos_fuzztest("IpcServerStubFuzzTest") {
     "${utils_path}:devicemanagerutils",
     "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits",
     "//base/security/deviceauth/services:deviceauth_sdk",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice",
+    "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice",
   ]
 
   defines = [
@@ -124,7 +124,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") {
     "${innerkits_path}/native_cpp:devicemanagersdk",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index 1efeecb7..8fd97f00 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
-module_out_path = "device_manager_base/component_loader_test"
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
+module_out_path = "device_manager/component_loader_test"
 
 group("unittest") {
   testonly = true
@@ -152,8 +152,8 @@ ohos_unittest("UTTest_softbus_connector") {
     "${services_path}/src/device_manager_service_listener.cpp",
     "${services_path}/src/devicestate/dm_device_state_manager.cpp",
     "${services_path}/src/discovery/dm_discovery_manager.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/ipc_server_listener.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/ipc_server_listener.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/parameter.cpp",
     "UTTest_softbus_connector.cpp",
   ]
 
@@ -353,8 +353,8 @@ ohos_unittest("UTTest_dm_device_state_manager") {
     "${services_path}/src/device_manager_service_listener.cpp",
     "${services_path}/src/devicestate/dm_device_state_manager.cpp",
     "${services_path}/src/discovery/dm_discovery_manager.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/ipc_server_listener.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/ipc_server_listener.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/parameter.cpp",
     "UTTest_dm_device_state_manager.cpp",
   ]
 
@@ -369,7 +369,7 @@ ohos_unittest("UTTest_device_manager_service_listener") {
 
   sources = [
     "${services_path}/src/device_manager_service_listener.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/ipc_server_listener.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/ipc_server_listener.cpp",
     "UTTest_device_manager_service_listener.cpp",
   ]
 
@@ -442,8 +442,8 @@ ohos_unittest("UTTest_dm_discovery_manager") {
     "${services_path}/src/dependency/timer/dm_timer.cpp",
     "${services_path}/src/device_manager_service_listener.cpp",
     "${services_path}/src/discovery/dm_discovery_manager.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/ipc_server_listener.cpp",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/ipc_server_listener.cpp",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/parameter.cpp",
     "UTTest_dm_discovery_manager.cpp",
   ]
 
@@ -486,12 +486,12 @@ config("device_manager_test_common_public_config") {
     "//foundation/communication/dsoftbus/interfaces/kits/common",
     "//foundation/communication/dsoftbus/interfaces/kits/discovery",
     "//foundation/communication/dsoftbus/interfaces/inner_kits/transport",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch",
-    "//foundation/distributedhardware/devicemanager/ext/profile/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/services/devicemanagerservice/include/dispatch",
+    "//foundation/distributedhardware/device_manager/ext/profile/include",
     "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-    "//foundation/distributedhardware/devicemanager/ext/mini/common/include",
+    "//foundation/distributedhardware/device_manager/ext/mini/common/include",
     "//base/security/deviceauth/interfaces/innerkits",
     "${services_path}/include/ability",
     "${services_path}/include/config",
@@ -524,8 +524,8 @@ ohos_static_library("device_manager_test_common") {
     "${services_path}:devicemanagerservice",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/ext/profile:devicemanagerext_profile",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/ext/profile:devicemanagerext_profile",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
@@ -562,7 +562,7 @@ config("device_manager_test_common_public") {
     "${services_path}/include/discovery",
     "${services_path}/include/deviceinfo/",
     "${services_path}/include/devicestate",
-    "//foundation/distributedhardware/devicemanager/test/unittest/mock/",
+    "//foundation/distributedhardware/device_manager/test/unittest/mock/",
     "${services_path}/include/ability",
     "${services_path}/include/config",
     "//foundation/communication/dsoftbus/interfaces/kits/bus_center",
@@ -612,7 +612,7 @@ ohos_static_library("device_manager_test") {
     "${innerkits_path}/native_cpp:devicemanagersdk",
     "${utils_path}:devicemanagerutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
-    "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager",
+    "//foundation/distributedhardware/device_manager/interfaces/kits/js:devicemanager",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest",
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index ff1b4842..760eb0b6 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -17,7 +17,7 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 }
 
-import("//foundation/distributedhardware/devicemanager/devicemanager.gni")
+import("//foundation/distributedhardware/device_manager/device_manager.gni")
 
 if (defined(ohos_lite)) {
   if (ohos_kernel_type == "liteos_m") {
@@ -174,6 +174,6 @@ if (defined(ohos_lite)) {
 
     subsystem_name = "distributedhardware"
 
-    part_name = "device_manager_base"
+    part_name = "device_manager"
   }
 }