diff --git a/bundle.json b/bundle.json
index 17ebcf99463fb2d3ed137bc618d513135a8ef1a9..29c816e3c706a2afde50511f776d944e10684adc 100644
--- a/bundle.json
+++ b/bundle.json
@@ -694,6 +694,13 @@
               "header_files": []
             },
             "name": "//foundation/ability/ability_runtime/frameworks/native/appkit:appkit_delegator"
+          },
+          {
+            "header": {
+              "header_base": "//foundation/ability/ability_runtime/services/common/include",
+              "header_files": []
+            },
+            "name": "//foundation/ability/ability_runtime/services/common:task_handler_wrap"
           }
         ],
         "test": [
diff --git a/services/dataobsmgr/include/data_ability_observer_proxy.h b/interfaces/inner_api/dataobs_manager/include/data_ability_observer_proxy.h
similarity index 100%
rename from services/dataobsmgr/include/data_ability_observer_proxy.h
rename to interfaces/inner_api/dataobs_manager/include/data_ability_observer_proxy.h
diff --git a/services/dataobsmgr/include/datashare_log.h b/services/dataobsmgr/include/dataobs_log.h
similarity index 100%
rename from services/dataobsmgr/include/datashare_log.h
rename to services/dataobsmgr/include/dataobs_log.h
diff --git a/services/dataobsmgr/src/dataobs_mgr_changeinfo.cpp b/services/dataobsmgr/src/dataobs_mgr_changeinfo.cpp
index 457f0d779aad6445cd62cc12f184eda8fc49c6ce..a54d272c8716845902112d84dcdd1b8c729071d8 100644
--- a/services/dataobsmgr/src/dataobs_mgr_changeinfo.cpp
+++ b/services/dataobsmgr/src/dataobs_mgr_changeinfo.cpp
@@ -15,7 +15,7 @@
 #include <limits>
 #include "dataobs_mgr_changeinfo.h"
 #include "dataobs_utils.h"
-#include "datashare_log.h"
+#include "dataobs_log.h"
 #include "securec.h"
 
 namespace OHOS {
diff --git a/services/dataobsmgr/src/dataobs_mgr_client.cpp b/services/dataobsmgr/src/dataobs_mgr_client.cpp
index eddaf7b63db8973235a2799625ffded546f7af19..2f6017904e12cd549e990be4a8c4067a8e7cd5bb 100644
--- a/services/dataobsmgr/src/dataobs_mgr_client.cpp
+++ b/services/dataobsmgr/src/dataobs_mgr_client.cpp
@@ -17,7 +17,7 @@
 #include "dataobs_mgr_client.h"
 
 #include "common_utils.h"
-#include "datashare_log.h"
+#include "dataobs_log.h"
 #include "hilog_tag_wrapper.h"
 #include "if_system_ability_manager.h"
 #include "iservice_registry.h"
@@ -84,20 +84,20 @@ DataObsMgrClient::~DataObsMgrClient()
  *
  * @return Returns ERR_OK on success, others on failure.
  */
-ErrCode DataObsMgrClient::RegisterObserver(const Uri &uri, sptr<IDataAbilityObserver> dataObserver, int userId,
-    DataObsOption opt)
+ErrCode DataObsMgrClient::RegisterObserver(const Uri &uri, sptr<IDataAbilityObserver> dataObserver, int userId,
+    DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
         LOG_ERROR("Failed to get ObsMgr, errCode: %{public}d.", errCode);
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    auto status = dataObsManger->RegisterObserver(uri, dataObserver, userId, opt);
+    auto status = dataObsManger->RegisterObserver(uri, dataObserver, userId, opt);
     if (status != NO_ERROR) {
         return status;
     }
-    observers_.Compute(dataObserver, [&uri, userId](const auto &key, auto &value) {
-        value.emplace_back(uri, userId);
+    observers_.Compute(dataObserver, [&uri, userId](const auto &key, auto &value) {
+        value.emplace_back(uri, userId);
         return true;
     });
     return status;
@@ -111,20 +111,20 @@ ErrCode DataObsMgrClient::RegisterObserver(const Uri &uri, sptr<IDataAbilityObse
  *
  * @return Returns ERR_OK on success, others on failure.
  */
-ErrCode DataObsMgrClient::UnregisterObserver(const Uri &uri, sptr<IDataAbilityObserver> dataObserver, int userId,
-    DataObsOption opt)
+ErrCode DataObsMgrClient::UnregisterObserver(const Uri &uri, sptr<IDataAbilityObserver> dataObserver, int userId,
+    DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    auto status = dataObsManger->UnregisterObserver(uri, dataObserver, userId, opt);
+    auto status = dataObsManger->UnregisterObserver(uri, dataObserver, userId, opt);
     if (status != NO_ERROR) {
         return status;
     }
-    observers_.Compute(dataObserver, [&uri, userId](const auto &key, auto &value) {
-        value.remove_if([&uri, userId](const auto &val) {
-            return uri == val.uri && userId == val.userId;
+    observers_.Compute(dataObserver, [&uri, userId](const auto &key, auto &value) {
+        value.remove_if([&uri, userId](const auto &val) {
+            return uri == val.uri && userId == val.userId;
         });
         return !value.empty();
     });
@@ -138,13 +138,13 @@ ErrCode DataObsMgrClient::UnregisterObserver(const Uri &uri, sptr<IDataAbilityOb
  *
  * @return Returns ERR_OK on success, others on failure.
  */
-ErrCode DataObsMgrClient::NotifyChange(const Uri &uri, int userId, DataObsOption opt)
+ErrCode DataObsMgrClient::NotifyChange(const Uri &uri, int userId, DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    return dataObsManger->NotifyChange(uri, userId, opt);
+    return dataObsManger->NotifyChange(uri, userId, opt);
 }
 
 /**
@@ -185,13 +185,13 @@ __attribute__ ((no_sanitize("cfi"))) std::pair<Status, sptr<IDataObsMgr>> DataOb
 }
 
 Status DataObsMgrClient::RegisterObserverExt(const Uri &uri, sptr<IDataAbilityObserver> dataObserver,
-    bool isDescendants, DataObsOption opt)
+    bool isDescendants, DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    auto status = dataObsManger->RegisterObserverExt(uri, dataObserver, isDescendants, opt);
+    auto status = dataObsManger->RegisterObserverExt(uri, dataObserver, isDescendants, opt);
     if (status != SUCCESS) {
         return status;
     }
@@ -202,8 +202,8 @@ Status DataObsMgrClient::RegisterObserverExt(const Uri &uri, sptr<IDataAbilityOb
     return status;
 }
 
-Status DataObsMgrClient::UnregisterObserverExt(const Uri &uri, sptr<IDataAbilityObserver> dataObserver,
-    DataObsOption opt)
+Status DataObsMgrClient::UnregisterObserverExt(const Uri &uri, sptr<IDataAbilityObserver> dataObserver,
+    DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
@@ -222,13 +222,13 @@ Status DataObsMgrClient::UnregisterObserverExt(const Uri &uri, sptr<IDataAbility
     return status;
 }
 
-Status DataObsMgrClient::UnregisterObserverExt(sptr<IDataAbilityObserver> dataObserver, DataObsOption opt)
+Status DataObsMgrClient::UnregisterObserverExt(sptr<IDataAbilityObserver> dataObserver, DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    auto status = dataObsManger->UnregisterObserverExt(dataObserver, opt);
+    auto status = dataObsManger->UnregisterObserverExt(dataObserver, opt);
     if (status != SUCCESS) {
         return status;
     }
@@ -236,17 +236,17 @@ Status DataObsMgrClient::UnregisterObserverExt(sptr<IDataAbilityObserver> dataOb
     return status;
 }
 
-Status DataObsMgrClient::NotifyChangeExt(const ChangeInfo &changeInfo, DataObsOption opt)
+Status DataObsMgrClient::NotifyChangeExt(const ChangeInfo &changeInfo, DataObsOption opt)
 {
     auto [errCode, dataObsManger] = GetObsMgr();
     if (errCode != SUCCESS) {
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    return dataObsManger->NotifyChangeExt(changeInfo, opt);
+    return dataObsManger->NotifyChangeExt(changeInfo, opt);
 }
 
-Status DataObsMgrClient::NotifyProcessObserver(const std::string &key, const sptr<IRemoteObject> &observer,
-    DataObsOption opt)
+Status DataObsMgrClient::NotifyProcessObserver(const std::string &key, const sptr<IRemoteObject> &observer,
+    DataObsOption opt)
 {
     if (key.empty() || observer == nullptr) {
         TAG_LOGE(AAFwkTag::DBOBSMGR, "Null observer, key:%{public}s", key.c_str());
@@ -256,7 +256,7 @@ Status DataObsMgrClient::NotifyProcessObserver(const std::string &key, const spt
     if (errCode != SUCCESS) {
         return DATAOBS_SERVICE_NOT_CONNECTED;
     }
-    return dataObsManger->NotifyProcessObserver(key, observer, opt);
+    return dataObsManger->NotifyProcessObserver(key, observer, opt);
 }
 
 void DataObsMgrClient::ResetService()
@@ -287,11 +287,11 @@ void DataObsMgrClient::ReRegister()
     decltype(observers_) observers(std::move(observers_));
     observers_.Clear();
     observers.ForEach([this](const auto &key, const auto &value) {
-        for (const auto &val : value) {
-            auto ret = RegisterObserver(val.uri, key, val.userId);
+        for (const auto &val : value) {
+            auto ret = RegisterObserver(val.uri, key, val.userId);
             if (ret != SUCCESS) {
                 LOG_ERROR("RegisterObserver failed, uri:%{public}s, ret:%{public}d",
-                    CommonUtils::Anonymous(val.uri.ToString()).c_str(), ret);
+                    CommonUtils::Anonymous(val.uri.ToString()).c_str(), ret);
             }
         }
         return false;
diff --git a/services/dataobsmgr/src/dataobs_mgr_stub.cpp b/services/dataobsmgr/src/dataobs_mgr_stub.cpp
index 1877e2d10b17409a6a582de80c2002834d43eea6..ab951825a793ef5c98ad28955c086ac04d013b56 100644
--- a/services/dataobsmgr/src/dataobs_mgr_stub.cpp
+++ b/services/dataobsmgr/src/dataobs_mgr_stub.cpp
@@ -15,12 +15,12 @@
 
 #include "dataobs_mgr_stub.h"
 
-#include "dataobs_mgr_interface.h"
+#include "dataobs_mgr_interface.h"
 #include "string_ex.h"
 
 #include "data_ability_observer_proxy.h"
 #include "dataobs_mgr_errors.h"
-#include "datashare_log.h"
+#include "dataobs_log.h"
 #include "ipc_skeleton.h"
 #include "common_utils.h"
 #include "hilog_tag_wrapper.h"
@@ -76,9 +76,9 @@ int DataObsManagerStub::RegisterObserverInner(MessageParcel &data, MessageParcel
 
     auto remote = data.ReadRemoteObject();
     auto observer = remote == nullptr ? nullptr : iface_cast<IDataAbilityObserver>(remote);
-    int32_t userId = data.ReadInt32();
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    int32_t result = RegisterObserver(uri, observer, userId, opt);
+    int32_t userId = data.ReadInt32();
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    int32_t result = RegisterObserver(uri, observer, userId, opt);
     reply.WriteInt32(result);
     return NO_ERROR;
 }
@@ -93,9 +93,9 @@ int DataObsManagerStub::UnregisterObserverInner(MessageParcel &data, MessageParc
 
     auto remote = data.ReadRemoteObject();
     auto observer = remote == nullptr ? nullptr : iface_cast<IDataAbilityObserver>(remote);
-    int32_t userId = data.ReadInt32();
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    int32_t result = UnregisterObserver(uri, observer, userId, opt);
+    int32_t userId = data.ReadInt32();
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    int32_t result = UnregisterObserver(uri, observer, userId, opt);
     reply.WriteInt32(result);
     return NO_ERROR;
 }
@@ -107,9 +107,9 @@ int DataObsManagerStub::NotifyChangeInner(MessageParcel &data, MessageParcel &re
         TAG_LOGE(AAFwkTag::DBOBSMGR, "invalid uri");
         return IPC_STUB_INVALID_DATA_ERR;
     }
-    int32_t userId = data.ReadInt32();
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    int32_t result = NotifyChange(uri, userId, opt);
+    int32_t userId = data.ReadInt32();
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    int32_t result = NotifyChange(uri, userId, opt);
     reply.WriteInt32(result);
     return NO_ERROR;
 }
@@ -124,8 +124,8 @@ int32_t DataObsManagerStub::RegisterObserverExtInner(MessageParcel &data, Messag
     auto remote = data.ReadRemoteObject();
     auto observer = remote == nullptr ? nullptr : iface_cast<IDataAbilityObserver>(remote);
     bool isDescendants = data.ReadBool();
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    reply.WriteInt32(RegisterObserverExt(uri, observer, isDescendants, opt));
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    reply.WriteInt32(RegisterObserverExt(uri, observer, isDescendants, opt));
     return SUCCESS;
 }
 
@@ -138,8 +138,8 @@ int32_t DataObsManagerStub::UnregisterObserverExtInner(MessageParcel &data, Mess
     }
     auto remote = data.ReadRemoteObject();
     auto observer = remote == nullptr ? nullptr : iface_cast<IDataAbilityObserver>(remote);
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    reply.WriteInt32(UnregisterObserverExt(uri, observer, opt));
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    reply.WriteInt32(UnregisterObserverExt(uri, observer, opt));
     return SUCCESS;
 }
 
@@ -147,8 +147,8 @@ int32_t DataObsManagerStub::UnregisterObserverExtALLInner(MessageParcel &data, M
 {
     auto remote = data.ReadRemoteObject();
     auto observer = remote == nullptr ? nullptr : iface_cast<IDataAbilityObserver>(remote);
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    reply.WriteInt32(UnregisterObserverExt(observer, opt));
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    reply.WriteInt32(UnregisterObserverExt(observer, opt));
     return SUCCESS;
 }
 
@@ -159,8 +159,8 @@ int32_t DataObsManagerStub::NotifyChangeExtInner(MessageParcel &data, MessagePar
         LOG_ERROR("Failed to unmarshall changeInfo.");
         return IPC_STUB_INVALID_DATA_ERR;
     }
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    reply.WriteInt32(NotifyChangeExt(changeInfo, opt));
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    reply.WriteInt32(NotifyChangeExt(changeInfo, opt));
     return SUCCESS;
 }
 
@@ -168,8 +168,8 @@ int32_t DataObsManagerStub::NotifyProcessObserverInner(MessageParcel &data, Mess
 {
     std::string key = data.ReadString();
     auto observer = data.ReadRemoteObject();
-    DataObsOption opt = DataObsOption(data.ReadBool());
-    reply.WriteInt32(NotifyProcessObserver(key, observer, opt));
+    DataObsOption opt = DataObsOption(data.ReadBool());
+    reply.WriteInt32(NotifyProcessObserver(key, observer, opt));
     return SUCCESS;
 }
 }  // namespace AAFwk