diff --git a/services/service/include/devicenamemgr/device_name_change_monitor.h b/services/service/include/devicenamemgr/device_name_change_monitor.h
index fe73e52206ccbe7ed98dbb3b31c43f6cb5043ede..64e54ed997cf83cbe39b8eae07ec0cdbee427ee2 100644
--- a/services/service/include/devicenamemgr/device_name_change_monitor.h
+++ b/services/service/include/devicenamemgr/device_name_change_monitor.h
@@ -24,7 +24,7 @@ enum class SettingsDataMonitorType : int32_t {
     USER_DEFINED_DEVICE_NAME_MONITOR = 0
 };
 
-class DeviceNameChangeMonitor : public AAFwk::DataAbilityObserverStub {
+class DeviceNameChangeMonitor : public DataShare::DataAbilityObserverStub {
 public:
     DeviceNameChangeMonitor(int32_t userId);
     void OnChange() override;
diff --git a/test/unittest/mock/datashare_helper_mock.h b/test/unittest/mock/datashare_helper_mock.h
index 914a895b00fac035445e44c21abe7b8559aa014d..15dc92028e0db5c85bbdf4c6e4348b4a2867e607 100644
--- a/test/unittest/mock/datashare_helper_mock.h
+++ b/test/unittest/mock/datashare_helper_mock.h
@@ -21,7 +21,7 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-using OHOS::AAFwk::IDataAbilityObserver;
+using OHOS::DataShare::IDataAbilityObserver;
 using OHOS::DataShare::BatchUpdateResult;
 using OHOS::DataShare::Data;
 using OHOS::DataShare::DatashareBusinessError;
@@ -38,6 +38,7 @@ using OHOS::DataShare::Template;
 using OHOS::DataShare::TemplateId;
 using OHOS::DataShare::UpdateOperations;
 using namespace OHOS::DataShare;
+using ChangeInfo = DataShare::ChangeInfo;
 
 class DataShareHelperMock : public DataShareHelper {
 public:
@@ -66,7 +67,7 @@ public:
             bool isDescendants), (override));
     MOCK_METHOD(void, UnregisterObserverExtProvider, (const Uri &uri,
         const std::shared_ptr<DataShareObserver> dataObserver), (override));
-    MOCK_METHOD(void, NotifyChangeExtProvider, (const DataShareObserver::ChangeInfo &changeInfo), (override));
+    MOCK_METHOD(void, NotifyChangeExtProvider, (const ChangeInfo &changeInfo), (override));
     MOCK_METHOD(Uri, NormalizeUri, (Uri &));
     MOCK_METHOD(Uri, DenormalizeUri, (Uri &));
     MOCK_METHOD(int, AddQueryTemplate, (const std::string &, int64_t, Template &));