diff --git a/services/devicemanagerservice/include/softbus/softbus_session.h b/services/devicemanagerservice/include/softbus/softbus_session.h
index 71b699376db872670fe003c95bb13ab7272bf6a9..03610be2cbcb6df81248044d040f0448a3dc98b4 100644
--- a/services/devicemanagerservice/include/softbus/softbus_session.h
+++ b/services/devicemanagerservice/include/softbus/softbus_session.h
@@ -43,8 +43,8 @@ private:
 private:
     int32_t SendData(int32_t sessionId, const void *data, int32_t len);
 private:
-    const char *PKG_NAME = "com.huawei.devicemanager";
-    const char *SESSION_NAME = "com.huawei.devicemanager.resident";
+    const char *PKG_NAME = "ohos.distributedhardware.devicemanager";
+    const char *SESSION_NAME = "ohos.distributedhardware.devicemanager.resident";
     std::set<int32_t> sessionIdSet_;
     std::vector<std::string> messages_ {};
 };
diff --git a/services/devicemanagerservice/src/auth/hichain_connector.cpp b/services/devicemanagerservice/src/auth/hichain_connector.cpp
index fdc68e179200c567a98755996cd8a7cf3cf70d5e..88516aebdefde1f38cde431a52a2540780384802 100644
--- a/services/devicemanagerservice/src/auth/hichain_connector.cpp
+++ b/services/devicemanagerservice/src/auth/hichain_connector.cpp
@@ -46,7 +46,7 @@ const std::string BR_MAC = "BR_MAC";
 const std::string BLE_MAC = "BLE_MAC";
 const std::string ETH_IP = "ETH_IP";
 const std::string ETH_PORT = "ETH_PORT";
-const std::string DEVICE_MANAGER_APP = "com.huawei.devicemanager";
+const std::string DEVICE_MANAGER_APP = "ohos.distributedhardware.devicemanager";
 const std::string DEVICE_MANAGER_GROUPNAME = "DMPeerToPeerGroup";
 
 const int64_t MIN_REQUEST_ID = 1000000000;
diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp
index f58a361fce4208200a230d02ba6fac285e1e0eee..d902d86fa4eb0e836dc9e9e7e9357bf81db8f3fc 100644
--- a/services/devicemanagerservice/src/message/msg_request_auth.cpp
+++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp
@@ -16,7 +16,6 @@
 #include <sstream>
 #include <iomanip>
 
-#include "msg_request_auth.h"
 #include "device_manager_log.h"
 #include "constants.h"
 #include "encrypt_utils.h"
@@ -26,6 +25,8 @@
 #include "msg_request_auth.h"
 #include "parameter.h"
 #include "softbus_session.h"
+#include "softbus_bus_center.h"
+#include "msg_request_auth.h"
 
 namespace OHOS {
 namespace DistributedHardware {
@@ -47,9 +48,16 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std:
     mAuthType_ = jsonObject.contains(AUTH_TYPE) ? (int32_t)jsonObject[AUTH_TYPE] : AUTH_TYPE_QR;
     mHead_ = std::make_shared<MsgHead>((mAuthType_ == AUTH_TYPE_QR) ? (DmMsgType::MSG_TYPE_REQ_AUTH) :
         (DmMsgType::MSG_TYPE_AUTH_BY_PIN));
+    std::string deviceManagerPkgName = "ohos.distributedhardware.devicemanager";
+    NodeBasicInfo localBasicInfo;
+    int32_t ret = GetLocalNodeDeviceInfo(deviceManagerPkgName.c_str(), &localBasicInfo);
+    if (ret != 0) {
+        DMLOG(DM_LOG_ERROR, "GetLocalNodeDeviceInfo err: %d", ret);
+        return;
+    }
+    mDeviceName_ = localBasicInfo.deviceName;
     char localDeviceId[DEVICE_UUID_LENGTH] = {0};
     GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH);
-    mDeviceName_ = devReqInfo.deviceName;
     mDeviceId_ = localDeviceId;
     mToken_ = token;
     mHostPkg_ = hostPkgName;
@@ -60,7 +68,7 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std:
     mImageInfo_ = imageInfo;
     mThumbnailSize_ = mImageInfo_.GetAppThumbnailLen();
     mAppIconSize_ = mImageInfo_.GetAppIconLen();
-    mDeviceType_ = ToHexString(devReqInfo.deviceTypeId);
+    mDeviceType_ = ToHexString(localBasicInfo.deviceTypeId);
     DMLOG(DM_LOG_INFO, "MsgRequestAuth construction completed");
 }
 
diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp
index 4db2ad2091fabbc8e27dce627afd0e54cdf21137..f5da3a1a375d1c6a39a69256b5c4378a28455c5e 100644
--- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp
+++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp
@@ -37,7 +37,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace {
-const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.huawei.devicemanager";
+const std::string DEVICE_MANAGER_PACKAGE_NAME = "ohos.distributedhardware.devicemanager";
 const char *DM_CAPABILITY_OSD = "osdCapability";
 const int32_t CHECK_INTERVAL = 100000; // 100ms
 const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16;