diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp
index f0a1889ab6..e9ef11152d 100644
--- a/services/abilitymgr/src/ability_manager_proxy.cpp
+++ b/services/abilitymgr/src/ability_manager_proxy.cpp
@@ -2297,29 +2297,29 @@ sptr<IWantSender> AbilityManagerProxy::GetWantSender(
         return nullptr;
     }
     if (!data.WriteParcelable(&wantSenderInfo)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "writeParcelable fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "writeParcelable fail");
         return nullptr;
     }
     if (callerToken) {
         if (!data.WriteBool(true) || !data.WriteRemoteObject(callerToken)) {
-            TAG_LOGE(AAFwkTag::ABILITYMGR, "flag and callerToken write fail");
+            TAG_LOGE(AAFwkTag::WANTAGENT, "flag and callerToken write fail");
             return nullptr;
         }
     } else {
         if (!data.WriteBool(false)) {
-            TAG_LOGE(AAFwkTag::ABILITYMGR, "flag write fail");
+            TAG_LOGE(AAFwkTag::WANTAGENT, "flag write fail");
             return nullptr;
         }
     }
 
     if (!data.WriteInt32(uid)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "uid write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "uid write fail");
         return nullptr;
     }
 
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_SENDER, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return nullptr;
     }
     sptr<IWantSender> wantSender = iface_cast<IWantSender>(reply.ReadRemoteObject());
@@ -2338,21 +2338,21 @@ int AbilityManagerProxy::SendWantSender(sptr<IWantSender> target, SenderInfo &se
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return INNER_ERR;
     }
     if (!data.WriteParcelable(&senderInfo)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "senderInfo write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "senderInfo write fail");
         return INNER_ERR;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::SEND_PENDING_WANT_SENDER, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return error;
     }
     std::unique_ptr<SenderInfo> completedDataReply(reply.ReadParcelable<SenderInfo>());
     if (!completedDataReply) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "readParcelableInfo fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "readParcelableInfo fail");
         return INNER_ERR;
     }
     senderInfo = *completedDataReply;
@@ -2368,12 +2368,12 @@ int AbilityManagerProxy::SendLocalWantSender(const SenderInfo &senderInfo)
         return INNER_ERR;
     }
     if (!data.WriteParcelable(&senderInfo)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "senderInfo write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "senderInfo write fail");
         return INNER_ERR;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::SEND_LOCAL_PENDING_WANT_SENDER, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return error;
     }
     return reply.ReadInt32();
@@ -2388,12 +2388,12 @@ void AbilityManagerProxy::CancelWantSender(const sptr<IWantSender> &sender)
         return;
     }
     if (sender == nullptr || !data.WriteRemoteObject(sender->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "sender write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "sender write fail");
         return;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::CANCEL_PENDING_WANT_SENDER, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return;
     }
 }
@@ -2407,12 +2407,12 @@ int AbilityManagerProxy::GetPendingWantUid(const sptr<IWantSender> &target)
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return ERR_INVALID_VALUE;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_UID, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return INNER_ERR;
     }
     return reply.ReadInt32();
@@ -2427,12 +2427,12 @@ int AbilityManagerProxy::GetPendingWantUserId(const sptr<IWantSender> &target)
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return ERR_INVALID_VALUE;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_USERID, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return INNER_ERR;
     }
     return reply.ReadInt32();
@@ -2447,12 +2447,12 @@ std::string AbilityManagerProxy::GetPendingWantBundleName(const sptr<IWantSender
         return "";
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return "";
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_BUNDLENAME, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return "";
     }
     return Str16ToStr8(reply.ReadString16());
@@ -2467,12 +2467,12 @@ int AbilityManagerProxy::GetPendingWantCode(const sptr<IWantSender> &target)
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return ERR_INVALID_VALUE;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_CODE, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return INNER_ERR;
     }
     return reply.ReadInt32();
@@ -2487,12 +2487,12 @@ int AbilityManagerProxy::GetPendingWantType(const sptr<IWantSender> &target)
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return ERR_INVALID_VALUE;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_TYPE, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return INNER_ERR;
     }
     return reply.ReadInt32();
@@ -2507,16 +2507,16 @@ void AbilityManagerProxy::RegisterCancelListener(const sptr<IWantSender> &sender
         return;
     }
     if (sender == nullptr || !data.WriteRemoteObject(sender->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "sender write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "sender write fail");
         return;
     }
     if (receiver == nullptr || !data.WriteRemoteObject(receiver->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "receiver write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "receiver write fail");
         return;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::REGISTER_CANCEL_LISTENER, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return;
     }
 }
@@ -2530,16 +2530,16 @@ void AbilityManagerProxy::UnregisterCancelListener(const sptr<IWantSender> &send
         return;
     }
     if (sender == nullptr || !data.WriteRemoteObject(sender->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "sender write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "sender write fail");
         return;
     }
     if (receiver == nullptr || !data.WriteRemoteObject(receiver->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "receiver write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "receiver write fail");
         return;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::UNREGISTER_CANCEL_LISTENER, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return;
     }
 }
@@ -2553,21 +2553,21 @@ int AbilityManagerProxy::GetPendingRequestWant(const sptr<IWantSender> &target,
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return INNER_ERR;
     }
     if (want == nullptr || !data.WriteParcelable(want.get())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "want write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "want write fail");
         return INNER_ERR;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_REQUEST_WANT, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return error;
     }
     std::unique_ptr<Want> wantInfo(reply.ReadParcelable<Want>());
     if (!wantInfo) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "readParcelableInfo fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "readParcelableInfo fail");
         return INNER_ERR;
     }
     want = std::move(wantInfo);
@@ -2584,21 +2584,21 @@ int AbilityManagerProxy::GetWantSenderInfo(const sptr<IWantSender> &target, std:
         return INNER_ERR;
     }
     if (target == nullptr || !data.WriteRemoteObject(target->AsObject())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "target write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "target write fail");
         return INNER_ERR;
     }
     if (info == nullptr || !data.WriteParcelable(info.get())) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "info write fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "info write fail");
         return INNER_ERR;
     }
     auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_SENDER_INFO, data, reply, option);
     if (error != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "request error:%{public}d", error);
         return error;
     }
     std::unique_ptr<WantSenderInfo> wantSenderInfo(reply.ReadParcelable<WantSenderInfo>());
     if (!wantSenderInfo) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "readParcelable Info fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "readParcelable Info fail");
         return INNER_ERR;
     }
     info = std::move(wantSenderInfo);
diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index 5633791cbc..64579a6cb3 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -5936,7 +5936,7 @@ int32_t AbilityManagerService::GetUidByCloneBundleInfo(
     if (IN_PROCESS_CALL(bms->GetCloneBundleInfo(
         bundleName, static_cast<int32_t>(AppExecFwk::GetBundleInfoFlag::GET_BUNDLE_INFO_WITH_APPLICATION),
         appIndex, bundleInfo, userId)) != ERR_OK) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "failed get bundle info for %{public}s", bundleName.c_str());
+        TAG_LOGE(AAFwkTag::WANTAGENT, "failed get bundle info for %{public}s", bundleName.c_str());
         return -1;
     }
     return bundleInfo.uid;
@@ -5964,7 +5964,7 @@ sptr<IWantSender> AbilityManagerService::GetWantSenderByUserId(const WantSenderI
         } else if (uid >= 0) {
             if (DelayedSingleton<AppExecFwk::OsAccountManagerWrapper>::GetInstance()->
                 GetOsAccountLocalIdFromUid(callerUid, userId) != 0) {
-                TAG_LOGE(AAFwkTag::ABILITYMGR, "getOsAccountLocalIdFromUid failed uid=%{public}d", callerUid);
+                TAG_LOGE(AAFwkTag::WANTAGENT, "getOsAccountLocalIdFromUid failed uid=%{public}d", callerUid);
                 return nullptr;
             }
             appUid = uid;
@@ -5982,11 +5982,11 @@ sptr<IWantSender> AbilityManagerService::GetWantSenderByUserId(const WantSenderI
     std::shared_ptr<PendingWantManager> pendingWantManager = GetPendingWantManagerByUserId(userId);
     CHECK_POINTER_AND_RETURN(pendingWantManager, nullptr);
     if (!CheckSenderWantInfo(appUid, wantSenderInfo)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "check bundleName failed for appUid: %{public}d", appUid);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "check bundleName failed for appUid: %{public}d", appUid);
         return nullptr;
     }
     const_cast<WantSenderInfo&>(wantSenderInfo).userId = userId;
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "bundleName: %{public}s, appIndex: %{public}d, isSystemApp: %{public}d, "
+    TAG_LOGI(AAFwkTag::WANTAGENT, "bundleName: %{public}s, appIndex: %{public}d, isSystemApp: %{public}d, "
         "isSACall: %{public}d, userId: %{public}d, appUid: %{public}d", bundleName.c_str(), appIndex, isSystemApp,
         isSACall, userId, appUid);
 
@@ -5997,7 +5997,7 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
     const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken,
     int32_t uid)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "called");
+    TAG_LOGD(AAFwkTag::WANTAGENT, "called");
     int32_t userId = wantSenderInfo.userId;
     int32_t callerUid = IPCSkeleton::GetCallingUid();
     int32_t callerUserId = callerUid / BASE_USER_RANGE;
@@ -6013,10 +6013,10 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
     int32_t bundleMgrResult = 0;
     if (DelayedSingleton<AppExecFwk::OsAccountManagerWrapper>::GetInstance()->
         GetOsAccountLocalIdFromUid(callerUid, userId) != 0) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "getOsAccountLocalIdFromUid failed uid=%{public}d", callerUid);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "getOsAccountLocalIdFromUid failed uid=%{public}d", callerUid);
         return nullptr;
     }
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "getOsAccountLocalIdFromUid userId: %{public}d", userId);
+    TAG_LOGD(AAFwkTag::WANTAGENT, "getOsAccountLocalIdFromUid userId: %{public}d", userId);
     //sa caller and has uid，no need find from bms.
     bool isSpecifyUidBySa = (uid != -1) && (AAFwk::PermissionVerification::GetInstance()->IsSACall());
 
@@ -6040,29 +6040,29 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
             appIndex = wantSenderInfo.appIndex;
             appUid = uid;
         }
-        TAG_LOGD(AAFwkTag::ABILITYMGR,
+        TAG_LOGD(AAFwkTag::WANTAGENT,
             "bundleName: %{public}s, uid: %{public}d, userId: %{public}d, appIndex: %{public}d", bundleName.c_str(),
             appUid, userId, appIndex);
     }
     if (!CheckSenderWantInfo(callerUid, wantSenderInfo)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "check bundleName failed");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "check bundleName failed");
         return nullptr;
     }
 
     bool isSystemApp = AAFwk::PermissionVerification::GetInstance()->IsSystemAppCall();
 
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s#%{public}d, isSystemApp: %{public}d, "
+    TAG_LOGI(AAFwkTag::WANTAGENT, "%{public}s#%{public}d, isSystemApp: %{public}d, "
         "userId: %{public}d", wantSenderInfo.bundleName.c_str(), appIndex, isSystemApp, userId);
     return pendingWantManager->GetWantSender(callerUid, appUid, isSystemApp, wantSenderInfo, callerToken, appIndex);
 }
 
 int AbilityManagerService::SendWantSender(sptr<IWantSender> target, SenderInfo &senderInfo)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "call");
+    TAG_LOGI(AAFwkTag::WANTAGENT, "call");
     CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE);
     sptr<IRemoteObject> obj = target->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return ERR_INVALID_VALUE;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6083,12 +6083,12 @@ int AbilityManagerService::SendWantSender(sptr<IWantSender> target, SenderInfo &
 
 int AbilityManagerService::SendLocalWantSender(const SenderInfo &senderInfo)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "call");
+    TAG_LOGI(AAFwkTag::WANTAGENT, "call");
     auto pendingWantManager = GetCurrentPendingWantManager();
     CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE);
     if (!PermissionVerification::GetInstance()->VerifyPermissionByTokenId(senderInfo.tokenId,
         PermissionConstants::PERMISSION_TRIGGER_LOCAL_WANTAGENT)) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "no permission to trigger local wantagent");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "no permission to trigger local wantagent");
         return CHECK_PERMISSION_FAILED;
     }
     return pendingWantManager->SendLocalWantSender(senderInfo);
@@ -6096,12 +6096,12 @@ int AbilityManagerService::SendLocalWantSender(const SenderInfo &senderInfo)
 
 void AbilityManagerService::CancelWantSender(const sptr<IWantSender> &sender)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "called");
+    TAG_LOGD(AAFwkTag::WANTAGENT, "called");
     CHECK_POINTER(sender);
 
     sptr<IRemoteObject> obj = sender->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6118,7 +6118,7 @@ void AbilityManagerService::CancelWantSender(const sptr<IWantSender> &sender)
         pendingWantManager = GetCurrentPendingWantManager();
     }
     CHECK_POINTER(pendingWantManager);
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "getOsAccountLocalIdFromUid userId: %{public}d", userId);
+    TAG_LOGD(AAFwkTag::WANTAGENT, "getOsAccountLocalIdFromUid userId: %{public}d", userId);
     bool isSystemAppCall = AAFwk::PermissionVerification::GetInstance()->IsSystemAppCall();
 
     pendingWantManager->CancelWantSender(isSystemAppCall, sender);
@@ -6126,11 +6126,11 @@ void AbilityManagerService::CancelWantSender(const sptr<IWantSender> &sender)
 
 void AbilityManagerService::CancelWantSenderByFlags(const sptr<IWantSender> &sender, uint32_t flags)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "called");
+    TAG_LOGD(AAFwkTag::WANTAGENT, "called");
     CHECK_POINTER(sender);
     sptr<IRemoteObject> obj = sender->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6151,12 +6151,12 @@ void AbilityManagerService::CancelWantSenderByFlags(const sptr<IWantSender> &sen
     CHECK_POINTER(bms);
     if (flags != 0 && record->GetKey() != nullptr &&
         (static_cast<uint32_t>(record->GetKey()->GetFlags()) & flags) == 0) {
-        TAG_LOGI(AAFwkTag::ABILITYMGR, "flags=%{public}u not match wantAgent flags=%{public}d",
+        TAG_LOGI(AAFwkTag::WANTAGENT, "flags=%{public}u not match wantAgent flags=%{public}d",
                 flags, record->GetKey()->GetFlags());
         return;
     }
 
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "code=%{public}d cancel by flags=%{public}u",
+    TAG_LOGI(AAFwkTag::WANTAGENT, "code=%{public}d cancel by flags=%{public}u",
         record->GetKey() != nullptr ? record->GetKey()->GetCode() : -1, flags);
     bool isSystemAppCall = AAFwk::PermissionVerification::GetInstance()->IsSystemAppCall();
     pendingWantManager->CancelWantSender(isSystemAppCall, sender);
@@ -6164,14 +6164,14 @@ void AbilityManagerService::CancelWantSenderByFlags(const sptr<IWantSender> &sen
 
 int AbilityManagerService::GetPendingWantUid(const sptr<IWantSender> &target)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin", __func__);
+    TAG_LOGI(AAFwkTag::WANTAGENT, "%{public}s:begin", __func__);
     if (target == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target null", __func__);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "%s, target null", __func__);
         return -1;
     }
     sptr<IRemoteObject> obj = target->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return -1;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6193,11 +6193,11 @@ int AbilityManagerService::GetPendingWantUid(const sptr<IWantSender> &target)
 
 int AbilityManagerService::GetPendingWantUserId(const sptr<IWantSender> &target)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin", __func__);
+    TAG_LOGI(AAFwkTag::WANTAGENT, "%{public}s:begin", __func__);
     auto pendingWantManager = GetCurrentPendingWantManager();
     CHECK_POINTER_AND_RETURN(pendingWantManager, -1);
     if (target == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target null", __func__);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "%s, target null", __func__);
         return -1;
     }
     return pendingWantManager->GetPendingWantUserId(target);
@@ -6205,13 +6205,13 @@ int AbilityManagerService::GetPendingWantUserId(const sptr<IWantSender> &target)
 
 std::string AbilityManagerService::GetPendingWantBundleName(const sptr<IWantSender> &target)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "call");
+    TAG_LOGD(AAFwkTag::WANTAGENT, "call");
     XCOLLIE_TIMER_DEFAULT(__PRETTY_FUNCTION__);
     CHECK_POINTER_AND_RETURN(target, "");
 
     sptr<IRemoteObject> obj = target->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return "";
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6233,14 +6233,14 @@ std::string AbilityManagerService::GetPendingWantBundleName(const sptr<IWantSend
 
 int AbilityManagerService::GetPendingWantCode(const sptr<IWantSender> &target)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin", __func__);
+    TAG_LOGI(AAFwkTag::WANTAGENT, "%{public}s:begin", __func__);
     if (target == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target null", __func__);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "%s, target null", __func__);
         return -1;
     }
     sptr<IRemoteObject> obj = target->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return -1;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6262,15 +6262,15 @@ int AbilityManagerService::GetPendingWantCode(const sptr<IWantSender> &target)
 
 int AbilityManagerService::GetPendingWantType(const sptr<IWantSender> &target)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "call");
+    TAG_LOGD(AAFwkTag::WANTAGENT, "call");
     XCOLLIE_TIMER_DEFAULT(__PRETTY_FUNCTION__);
     if (target == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target null", __func__);
+        TAG_LOGE(AAFwkTag::WANTAGENT, "%s, target null", __func__);
         return -1;
     }
     sptr<IRemoteObject> obj = target->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return -1;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -6293,7 +6293,7 @@ int AbilityManagerService::GetPendingWantType(const sptr<IWantSender> &target)
 void AbilityManagerService::RegisterCancelListener(const sptr<IWantSender> &sender,
     const sptr<IWantReceiver> &receiver)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "register cancel listener");
+    TAG_LOGI(AAFwkTag::WANTAGENT, "register cancel listener");
     auto pendingWantManager = GetCurrentPendingWantManager();
     CHECK_POINTER(pendingWantManager);
     CHECK_POINTER(sender);
@@ -6304,7 +6304,7 @@ void AbilityManagerService::RegisterCancelListener(const sptr<IWantSender> &send
 void AbilityManagerService::UnregisterCancelListener(
     const sptr<IWantSender> &sender, const sptr<IWantReceiver> &receiver)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "unregister cancel listener");
+    TAG_LOGI(AAFwkTag::WANTAGENT, "unregister cancel listener");
     auto pendingWantManager = GetCurrentPendingWantManager();
     CHECK_POINTER(pendingWantManager);
     CHECK_POINTER(sender);
@@ -6315,13 +6315,13 @@ void AbilityManagerService::UnregisterCancelListener(
 int AbilityManagerService::GetPendingRequestWant(const sptr<IWantSender> &target, std::shared_ptr<Want> &want)
 {
     HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "Get pending request want.");
+    TAG_LOGD(AAFwkTag::WANTAGENT, "Get pending request want.");
     XCOLLIE_TIMER_DEFAULT(__PRETTY_FUNCTION__);
     CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE);
     CHECK_POINTER_AND_RETURN(want, ERR_INVALID_VALUE);
     sptr<IRemoteObject> obj = target->AsObject();
     if (!obj || obj->IsProxyObject()) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "obj null or proxy obj");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "obj null or proxy obj");
         return -1;
     }
     sptr<PendingWantRecord> record = iface_cast<PendingWantRecord>(obj);
@@ -8826,7 +8826,7 @@ void AbilityManagerService::ConnectServices()
 
 int AbilityManagerService::GetWantSenderInfo(const sptr<IWantSender> &target, std::shared_ptr<WantSenderInfo> &info)
 {
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "get pending request info");
+    TAG_LOGI(AAFwkTag::WANTAGENT, "get pending request info");
     auto pendingWantManager = GetCurrentPendingWantManager();
     CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE);
     CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE);
@@ -13540,11 +13540,11 @@ bool AbilityManagerService::CheckSenderWantInfo(int32_t callerUid, const WantSen
 
         std::string bundleName;
         if (IN_PROCESS_CALL(bms->GetNameForUid(callerUid, bundleName)) != ERR_OK) {
-            TAG_LOGE(AAFwkTag::ABILITYMGR, "get bundle name failed");
+            TAG_LOGE(AAFwkTag::WANTAGENT, "get bundle name failed");
             return false;
         }
         if (wantSenderInfo.bundleName != bundleName) {
-            TAG_LOGE(AAFwkTag::ABILITYMGR, "wantSender bundleName check failed");
+            TAG_LOGE(AAFwkTag::WANTAGENT, "wantSender bundleName check failed");
             return false;
         }
     }
diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp
index 1f7ceed4f0..dc1cd4d5f5 100644
--- a/services/abilitymgr/src/ability_manager_stub.cpp
+++ b/services/abilitymgr/src/ability_manager_stub.cpp
@@ -1997,7 +1997,7 @@ int AbilityManagerStub::GetWantSenderInner(MessageParcel &data, MessageParcel &r
 {
     std::unique_ptr<WantSenderInfo> wantSenderInfo(data.ReadParcelable<WantSenderInfo>());
     if (wantSenderInfo == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "wantSenderInfo null");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "wantSenderInfo null");
         return ERR_INVALID_VALUE;
     }
     sptr<IRemoteObject> callerToken = nullptr;
@@ -2008,7 +2008,7 @@ int AbilityManagerStub::GetWantSenderInner(MessageParcel &data, MessageParcel &r
     int32_t uid = data.ReadInt32();
     sptr<IWantSender> wantSender = GetWantSender(*wantSenderInfo, callerToken, uid);
     if (!reply.WriteRemoteObject(((wantSender == nullptr) ? nullptr : wantSender->AsObject()))) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "failed reply wantSender to client, for write parcel error");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "failed reply wantSender to client, for write parcel error");
         return ERR_INVALID_VALUE;
     }
     return NO_ERROR;
@@ -2018,12 +2018,12 @@ int AbilityManagerStub::SendWantSenderInner(MessageParcel &data, MessageParcel &
 {
     sptr<IWantSender> wantSender = iface_cast<IWantSender>(data.ReadRemoteObject());
     if (wantSender == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "wantSender null");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "wantSender null");
         return ERR_INVALID_VALUE;
     }
     std::unique_ptr<SenderInfo> senderInfo(data.ReadParcelable<SenderInfo>());
     if (senderInfo == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "senderInfo null");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "senderInfo null");
         return ERR_INVALID_VALUE;
     }
     int32_t result = SendWantSender(wantSender, *senderInfo);
@@ -2189,14 +2189,14 @@ int AbilityManagerStub::GetWantSenderInfoInner(MessageParcel &data, MessageParce
 {
     sptr<IWantSender> wantSender = iface_cast<IWantSender>(data.ReadRemoteObject());
     if (wantSender == nullptr) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "wantSender null");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "wantSender null");
         return ERR_INVALID_VALUE;
     }
 
     std::shared_ptr<WantSenderInfo> info(data.ReadParcelable<WantSenderInfo>());
     int32_t result = GetWantSenderInfo(wantSender, info);
     if (result != NO_ERROR) {
-        TAG_LOGE(AAFwkTag::ABILITYMGR, "getWantSenderInfo fail");
+        TAG_LOGE(AAFwkTag::WANTAGENT, "getWantSenderInfo fail");
         return ERR_INVALID_VALUE;
     }
     reply.WriteParcelable(info.get());
diff --git a/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp b/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp
index 442f65ae17..aa549c6de0 100644
--- a/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp
+++ b/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp
@@ -27,20 +27,20 @@ PreLoadUIExtStateObserver::PreLoadUIExtStateObserver(
 void PreLoadUIExtStateObserver::OnProcessDied(const AppExecFwk::ProcessData &processData)
 {
     auto diedProcessName = processData.processName;
-    TAG_LOGI(AAFwkTag::ABILITYMGR, "pname:%{public}s", diedProcessName.c_str());
+    TAG_LOGD(AAFwkTag::UI_EXT, "pname:%{public}s", diedProcessName.c_str());
     auto extensionRecord = extensionRecord_.lock();
     if (extensionRecord != nullptr) {
         auto hostPid = extensionRecord->hostPid_;
         int32_t diedPid = processData.pid;
-        TAG_LOGD(AAFwkTag::ABILITYMGR, "Host pid is %{public}d, died pid is %{public}d.", hostPid, diedPid);
+        TAG_LOGD(AAFwkTag::UI_EXT, "Host pid is %{public}d, died pid is %{public}d.", hostPid, diedPid);
         if (static_cast<int32_t>(hostPid) != diedPid) {
-            TAG_LOGD(AAFwkTag::ABILITYMGR, "Host pid is not equals to died pid.");
+            TAG_LOGD(AAFwkTag::UI_EXT, "Host pid is not equals to died pid.");
             return;
         }
         extensionRecord->UnloadUIExtensionAbility();
         AbilityManagerClient::GetInstance()->UnRegisterPreloadUIExtensionHostClient(diedPid);
     } else {
-        TAG_LOGW(AAFwkTag::ABILITYMGR, "extensionRecord null");
+        TAG_LOGW(AAFwkTag::UI_EXT, "extensionRecord null");
     }
 }