diff --git a/frameworks/native/BUILD.gn b/frameworks/native/BUILD.gn
index 5f6facd871ad5a0cebd3e88efd4c08af30a98ca3..b545dacaed46d51bd308c08c6a185f2edb4b7fa5 100644
--- a/frameworks/native/BUILD.gn
+++ b/frameworks/native/BUILD.gn
@@ -137,7 +137,7 @@ ohos_shared_library("image_effect_impl") {
     "libexif:libexif",
     "napi:ace_napi",
     "qos_manager:qos",
-    "media_foundation:histreamer_plugin_base",
+    "media_foundation:media_foundation",
     "skia:skia_canvaskit",
   ]
 
@@ -201,7 +201,7 @@ ohos_shared_library("image_effect") {
     "image_framework:picture",
     "image_framework:pixelmap",
     "napi:ace_napi",
-    "media_foundation:histreamer_plugin_base",
+    "media_foundation:media_foundation",
   ]
 
   cflags_cc = [
diff --git a/frameworks/native/capi/image_effect.cpp b/frameworks/native/capi/image_effect.cpp
index 61906dcd0ec082c8d68d170fd46cfa5519c2ba89..6d1927cab5a9a05ec79392fc6b1e7c99953423a6 100644
--- a/frameworks/native/capi/image_effect.cpp
+++ b/frameworks/native/capi/image_effect.cpp
@@ -306,7 +306,7 @@ ImageEffect_ErrorCode OH_ImageEffect_Configure(OH_ImageEffect *imageEffect, cons
     CHECK_AND_RETURN_RET_LOG(value != nullptr, ImageEffect_ErrorCode::EFFECT_ERROR_PARAM_INVALID,
         "Configure: input parameter value is null!");
 
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(value, any);
     CHECK_AND_RETURN_RET_LOG(result == ErrorCode::SUCCESS, ImageEffect_ErrorCode::EFFECT_PARAM_ERROR,
         "Configure: parse oh any fail! result=%{public}d, key=%{public}s, dataType=%{public}d",
diff --git a/frameworks/native/capi/image_effect_filter.cpp b/frameworks/native/capi/image_effect_filter.cpp
index 015e6812211c722b889df139bd28e62ae7aaaa90..2442250f078175cdb777ea1ffd80907f2625e537 100644
--- a/frameworks/native/capi/image_effect_filter.cpp
+++ b/frameworks/native/capi/image_effect_filter.cpp
@@ -37,14 +37,14 @@ namespace {
 
 static std::vector<std::shared_ptr<ImageEffect_FilterNames>> sOHFilterNames;
 
-void OH_EffectFilter::SetParameter(const std::string &key, Plugin::Any &param)
+void OH_EffectFilter::SetParameter(const std::string &key, Any &param)
 {
     CHECK_AND_RETURN_LOG(!key.empty(), "SetParameter: key is empty!");
     params_.erase(key);
     params_.emplace(key, param);
 }
 
-ErrorCode OH_EffectFilter::GetParameter(const std::string &key, Plugin::Any &param)
+ErrorCode OH_EffectFilter::GetParameter(const std::string &key, Any &param)
 {
     auto it = params_.find(key);
     if (it == params_.end()) {
@@ -453,7 +453,7 @@ ImageEffect_ErrorCode OH_EffectFilter_SetValue(OH_EffectFilter *filter, const ch
         "FilterSetValue: input parameter value is null!");
     EFFECT_LOGD("Effect filter set value. key=%{public}s", key);
 
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(value, any);
     if (result != ErrorCode::SUCCESS) {
         EFFECT_LOGE("FilterSetValue: parse any fail! result=%{public}d, dataType=%{public}d", result, value->dataType);
@@ -490,7 +490,7 @@ ImageEffect_ErrorCode OH_EffectFilter_GetValue(OH_EffectFilter *nativeEFilter, c
         return ImageEffect_ErrorCode::EFFECT_SUCCESS;
     }
 
-    Plugin::Any any;
+    Any any;
     ErrorCode result = nativeEFilter->filter_->GetValue(key, any);
     if (result != ErrorCode::SUCCESS) {
         EFFECT_LOGE("FilterGetValue: get value fail! result=%{public}d, key=%{public}s", result, key);
diff --git a/frameworks/native/capi/native_common_utils.cpp b/frameworks/native/capi/native_common_utils.cpp
index 761550889b3f430f73105a331bcc00a6742bf78d..4a23b23aa79c3f74880707fc8bd85e57b297657f 100644
--- a/frameworks/native/capi/native_common_utils.cpp
+++ b/frameworks/native/capi/native_common_utils.cpp
@@ -64,10 +64,10 @@ static const std::map<ErrorCode, ImageEffect_ErrorCode> ERRORCODE_TABLE_RENDER =
 };
 
 template <class ValueType>
-ErrorCode AnyCastOHAny(const Plugin::Any &any, ImageEffect_DataType &ohDataType, ImageEffect_DataType ohDataTypeValue,
+ErrorCode AnyCastOHAny(const Any &any, ImageEffect_DataType &ohDataType, ImageEffect_DataType ohDataTypeValue,
     ValueType &value)
 {
-    auto result = Plugin::AnyCast<ValueType>(&any);
+    auto result = AnyCast<ValueType>(&any);
     if (result == nullptr) {
         return ErrorCode::ERR_ANY_CAST_TYPE_NOT_MATCH;
     }
@@ -76,7 +76,7 @@ ErrorCode AnyCastOHAny(const Plugin::Any &any, ImageEffect_DataType &ohDataType,
     return ErrorCode::SUCCESS;
 }
 
-ErrorCode NativeCommonUtils::ParseOHAny(const ImageEffect_Any *value, Plugin::Any &any)
+ErrorCode NativeCommonUtils::ParseOHAny(const ImageEffect_Any *value, Any &any)
 {
     switch (value->dataType) {
         case ImageEffect_DataType::EFFECT_DATA_TYPE_INT32:
@@ -107,7 +107,7 @@ ErrorCode NativeCommonUtils::ParseOHAny(const ImageEffect_Any *value, Plugin::An
     return ErrorCode::SUCCESS;
 }
 
-ErrorCode NativeCommonUtils::SwitchToOHAny(const Plugin::Any &any, ImageEffect_Any *value)
+ErrorCode NativeCommonUtils::SwitchToOHAny(const Any &any, ImageEffect_Any *value)
 {
     CHECK_AND_RETURN_RET(AnyCastOHAny(any, value->dataType, ImageEffect_DataType::EFFECT_DATA_TYPE_INT32,
         value->dataValue.int32Value) != ErrorCode::SUCCESS, ErrorCode::SUCCESS);
diff --git a/frameworks/native/capi/native_common_utils.h b/frameworks/native/capi/native_common_utils.h
index 6522a8497ec77ec5d96a0a55f35016233ad4cca5..11b211f4d3988f428a7e99c6f44f381e31fe8bf6 100644
--- a/frameworks/native/capi/native_common_utils.h
+++ b/frameworks/native/capi/native_common_utils.h
@@ -34,22 +34,22 @@ namespace Effect {
 class NativeCommonUtils {
 public:
     /**
-     * Parses an ImageEffect_Any object and converts it to Plugin::Any.
+     * Parses an ImageEffect_Any object and converts it to Any.
      *
      * @param value The input ImageEffect_Any object.
-     * @param any The output Plugin::Any object.
+     * @param any The output Any object.
      * @return ErrorCode indicating the result of the operation.
      */
-    static ErrorCode ParseOHAny(const ImageEffect_Any *value, Plugin::Any &any);
+    static ErrorCode ParseOHAny(const ImageEffect_Any *value, Any &any);
 
     /**
-     * Converts a Plugin::Any object to an ImageEffect_Any object.
+     * Converts a Any object to an ImageEffect_Any object.
      *
-     * @param any The input Plugin::Any object.
+     * @param any The input Any object.
      * @param value The output ImageEffect_Any object.
      * @return ErrorCode indicating the result of the operation.
      */
-    static ErrorCode SwitchToOHAny(const Plugin::Any &any, ImageEffect_Any *value);
+    static ErrorCode SwitchToOHAny(const Any &any, ImageEffect_Any *value);
 
     /**
      * Converts an IEffectFormat object to an ImageEffect_Format object.
diff --git a/frameworks/native/capi/native_effect_base.h b/frameworks/native/capi/native_effect_base.h
index 7b5e7bea5a505634b770c2cb866c4efbf69f061a..55b7888ad75c2e1df4f28388883f629a52017072 100644
--- a/frameworks/native/capi/native_effect_base.h
+++ b/frameworks/native/capi/native_effect_base.h
@@ -31,12 +31,12 @@
  */
 struct OH_EffectFilter {
     std::shared_ptr<OHOS::Media::Effect::EFilter> filter_ = nullptr; // Shared pointer to EFilter object
-    void SetParameter(const std::string &key, OHOS::Media::Plugin::Any &param); // Sets a filter parameter
-    OHOS::Media::Effect::ErrorCode GetParameter(const std::string &key, OHOS::Media::Plugin::Any &param);
+    void SetParameter(const std::string &key, OHOS::Media::Any &param); // Sets a filter parameter
+    OHOS::Media::Effect::ErrorCode GetParameter(const std::string &key, OHOS::Media::Any &param);
     void RemoveParameter(const std::string &key); // Removes a filter parameter
     bool isCreatedBySystem_ = false; // Flag indicating if the filter was created by the system
 private:
-    std::unordered_map<std::string, OHOS::Media::Plugin::Any&> params_; // Map of filter parameters
+    std::unordered_map<std::string, OHOS::Media::Any&> params_; // Map of filter parameters
 };
 
 /**
diff --git a/frameworks/native/effect/base/image_effect_inner.cpp b/frameworks/native/effect/base/image_effect_inner.cpp
index e133b4543da2650b505916f41a27e1e5dc1cc933..469f5b0c3c84c3dc78b7181839812f2a6781dee7 100644
--- a/frameworks/native/effect/base/image_effect_inner.cpp
+++ b/frameworks/native/effect/base/image_effect_inner.cpp
@@ -182,14 +182,14 @@ GSError ImageEffect::Impl::AttachConsumerSurfaceBuffer(sptr<SurfaceBuffer>& buff
 
 struct EffectParameters {
     EffectParameters(std::shared_ptr<EffectBuffer> &srcEffectBuffer, std::shared_ptr<EffectBuffer> &dstEffectBuffer,
-        std::map<ConfigType, Plugin::Any> &config, std::shared_ptr<EffectContext> &effectContext)
+        std::map<ConfigType, Any> &config, std::shared_ptr<EffectContext> &effectContext)
         : srcEffectBuffer_(std::move(srcEffectBuffer)),
           dstEffectBuffer_(std::move(dstEffectBuffer)),
           config_(std::move(config)),
           effectContext_(std::move(effectContext)) {};
     std::shared_ptr<EffectBuffer> &&srcEffectBuffer_;
     std::shared_ptr<EffectBuffer> &&dstEffectBuffer_;
-    std::map<ConfigType, Plugin::Any> &&config_;
+    std::map<ConfigType, Any> &&config_;
     std::shared_ptr<EffectContext> &&effectContext_;
 };
 
@@ -364,7 +364,7 @@ ErrorCode ConfigSinkFilter(std::shared_ptr<ImageSinkFilter> &sinkFilter, std::sh
     return ErrorCode::SUCCESS;
 }
 
-void GetConfigIPTypes(const std::map<ConfigType, Plugin::Any> &config, std::vector<IPType> &configIPTypes)
+void GetConfigIPTypes(const std::map<ConfigType, Any> &config, std::vector<IPType> &configIPTypes)
 {
     auto it = config.find(ConfigType::IPTYPE);
     if (it == config.end()) {
@@ -395,7 +395,7 @@ void AdjustEffectFormat(IEffectFormat& effectFormat) {
 }
 
 ErrorCode ChooseIPType(const std::shared_ptr<EffectBuffer> &srcEffectBuffer,
-    const std::shared_ptr<EffectContext> &context, const std::map<ConfigType, Plugin::Any> &config,
+    const std::shared_ptr<EffectContext> &context, const std::map<ConfigType, Any> &config,
     IPType &runningIPType)
 {
     std::vector<IPType> configIPTypes;
@@ -1426,7 +1426,7 @@ ErrorCode ImageEffect::SetOutNativeWindow(OHNativeWindow *nativeWindow)
     return ErrorCode::SUCCESS;
 }
 
-ErrorCode ImageEffect::Configure(const std::string &key, const Plugin::Any &value)
+ErrorCode ImageEffect::Configure(const std::string &key, const Any &value)
 {
     if (FUNCTION_FLUSH_SURFACE_BUFFER.compare(key) == 0) {
         EFFECT_LOGI("ImageEffect Configure FlushCache");
diff --git a/frameworks/native/effect/pipeline/include/core/filter.h b/frameworks/native/effect/pipeline/include/core/filter.h
index 9874f679861ec062565b065e5e4d0f352a06d3ee..a35e6812849947f9ef750b7e729e446004a030a5 100644
--- a/frameworks/native/effect/pipeline/include/core/filter.h
+++ b/frameworks/native/effect/pipeline/include/core/filter.h
@@ -52,9 +52,9 @@ public:
 
     virtual ErrorCode Start() = 0;
 
-    virtual ErrorCode SetParameter(int32_t key, const Plugin::Any &value) = 0;
+    virtual ErrorCode SetParameter(int32_t key, const Any &value) = 0;
 
-    virtual ErrorCode GetParameter(int32_t key, Plugin::Any &value) = 0;
+    virtual ErrorCode GetParameter(int32_t key, Any &value) = 0;
 
     virtual void UnlinkPrevFilters() = 0;
 
diff --git a/frameworks/native/effect/pipeline/include/core/filter_base.h b/frameworks/native/effect/pipeline/include/core/filter_base.h
index 5710d76c328d327e4e5e73f0183941f84b2805ca..948884302a504e00fd331d9414aae7ab5f3cfb6b 100644
--- a/frameworks/native/effect/pipeline/include/core/filter_base.h
+++ b/frameworks/native/effect/pipeline/include/core/filter_base.h
@@ -66,12 +66,12 @@ public:
 
     IMAGE_EFFECT_EXPORT ErrorCode Start() override;
 
-    ErrorCode SetParameter(int32_t key, const Media::Plugin::Any &value) override
+    ErrorCode SetParameter(int32_t key, const Media::Any &value) override
     {
         return ErrorCode::ERR_UNIMPLEMENTED;
     }
 
-    ErrorCode GetParameter(int32_t key, Media::Plugin::Any &value) override
+    ErrorCode GetParameter(int32_t key, Media::Any &value) override
     {
         return ErrorCode::ERR_UNIMPLEMENTED;
     }
diff --git a/frameworks/native/effect/pipeline/include/core/transfer.h b/frameworks/native/effect/pipeline/include/core/transfer.h
index e589872d3979fd048fa752ff50d8743c9a6753b1..7dd5100064ba95dc1b022b2c62d13c5ebdd584c6 100644
--- a/frameworks/native/effect/pipeline/include/core/transfer.h
+++ b/frameworks/native/effect/pipeline/include/core/transfer.h
@@ -41,7 +41,7 @@ enum struct EventType : uint32_t {
 struct Event {
     std::string srcFilter;
     EventType type;
-    Media::Plugin::Any param;
+    Media::Any param;
 };
 
 /**
diff --git a/frameworks/native/effect/pipeline/include/factory/filter_factory.h b/frameworks/native/effect/pipeline/include/factory/filter_factory.h
index c2a75a6232430d081da5437dbe927f95e40bea8b..ed7b5df13f05c64cb5a7524b2b13fec9dcc9ac7a 100644
--- a/frameworks/native/effect/pipeline/include/factory/filter_factory.h
+++ b/frameworks/native/effect/pipeline/include/factory/filter_factory.h
@@ -57,7 +57,7 @@ public:
     std::shared_ptr<T> CreateFilterWithType(const std::string &filterName, const std::string &aliasName)
     {
         auto filter = CreateFilter(filterName, aliasName);
-        auto typedFilter = Plugin::ReinterpretPointerCast<T>(filter);
+        auto typedFilter = ReinterpretPointerCast<T>(filter);
         return typedFilter;
     }
 
diff --git a/frameworks/native/effect/pipeline/include/filters/sink/image_sink_filter.h b/frameworks/native/effect/pipeline/include/filters/sink/image_sink_filter.h
index e6aa5ce60253db1d1ef855c4e76f7f5ff9d9536c..0214710b18546ae8d731b2adb08fcfb21af9f69a 100644
--- a/frameworks/native/effect/pipeline/include/filters/sink/image_sink_filter.h
+++ b/frameworks/native/effect/pipeline/include/filters/sink/image_sink_filter.h
@@ -54,12 +54,12 @@ public:
 
     ErrorCode SetXComponentSurface(sptr<Surface> &surface);
 
-    ErrorCode SetParameter(int32_t key, const Media::Plugin::Any &value) override
+    ErrorCode SetParameter(int32_t key, const Media::Any &value) override
     {
         return FilterBase::SetParameter(key, value);
     }
 
-    ErrorCode GetParameter(int32_t key, Media::Plugin::Any &value) override
+    ErrorCode GetParameter(int32_t key, Media::Any &value) override
     {
         return FilterBase::GetParameter(key, value);
     }
diff --git a/frameworks/native/effect/pipeline/include/filters/source/image_source_filter.h b/frameworks/native/effect/pipeline/include/filters/source/image_source_filter.h
index 00fa0140dbdd5c444dfe578ab322c373617b93f1..cb803facbc3ab2ca459a697d1a36eb0338475fd9 100644
--- a/frameworks/native/effect/pipeline/include/filters/source/image_source_filter.h
+++ b/frameworks/native/effect/pipeline/include/filters/source/image_source_filter.h
@@ -34,12 +34,12 @@ public:
 
     virtual ErrorCode SetSource(const std::shared_ptr<EffectBuffer> &source, std::shared_ptr<EffectContext> &context);
 
-    ErrorCode SetParameter(int32_t key, const Media::Plugin::Any &value) override
+    ErrorCode SetParameter(int32_t key, const Media::Any &value) override
     {
         return FilterBase::SetParameter(key, value);
     }
 
-    ErrorCode GetParameter(int32_t key, Media::Plugin::Any &value) override
+    ErrorCode GetParameter(int32_t key, Media::Any &value) override
     {
         return FilterBase::GetParameter(key, value);
     }
diff --git a/frameworks/native/efilter/base/efilter.cpp b/frameworks/native/efilter/base/efilter.cpp
index fc85784ecdeef725c2383bb95fa17077d6cd5247..d326eb81406aa4c2cd38b3bac541b5880cf614fa 100644
--- a/frameworks/native/efilter/base/efilter.cpp
+++ b/frameworks/native/efilter/base/efilter.cpp
@@ -52,7 +52,7 @@ ErrorCode EFilter::ProcessConfig(const std::string &key)
     return ErrorCode::SUCCESS;
 }
 
-ErrorCode EFilter::SetValue(const std::string &key, Plugin::Any &value)
+ErrorCode EFilter::SetValue(const std::string &key, Any &value)
 {
     auto it = values_.find(key);
     if (it == values_.end()) {
@@ -63,7 +63,7 @@ ErrorCode EFilter::SetValue(const std::string &key, Plugin::Any &value)
     return ErrorCode::SUCCESS;
 }
 
-ErrorCode EFilter::GetValue(const std::string &key, Plugin::Any &value)
+ErrorCode EFilter::GetValue(const std::string &key, Any &value)
 {
     if (key.empty()) {
         return ErrorCode::ERR_INPUT_NULL;
diff --git a/frameworks/native/efilter/custom/custom_efilter.cpp b/frameworks/native/efilter/custom/custom_efilter.cpp
index aebf42db2885c0cc07b4d98b5fd0c3c7ff40cb94..d1334ffd279a55d5999b62b0ab8c5dfe2bc7c152 100644
--- a/frameworks/native/efilter/custom/custom_efilter.cpp
+++ b/frameworks/native/efilter/custom/custom_efilter.cpp
@@ -44,7 +44,7 @@ ErrorCode CustomEFilter::Render(EffectBuffer *buffer, std::shared_ptr<EffectCont
     return ErrorCode::SUCCESS;
 }
 
-ErrorCode CustomEFilter::SetValue(const std::string &key, Plugin::Any &value)
+ErrorCode CustomEFilter::SetValue(const std::string &key, Any &value)
 {
     CHECK_AND_RETURN_RET_LOG(delegate_ != nullptr, ErrorCode::ERR_INPUT_NULL, "delegate_ is null");
     if (!delegate_->SetValue(handler_, key, value)) {
@@ -74,7 +74,7 @@ ErrorCode CustomEFilter::Restore(const EffectJsonPtr &value)
         return ErrorCode::ERR_CUSTOM_EFILTER_RESTORE_FAIL;
     }
 
-    std::map<std::string, Plugin::Any> filterValues = filter->GetValues();
+    std::map<std::string, Any> filterValues = filter->GetValues();
     for (auto &filterValue : filterValues) {
         SetValue(filterValue.first, filterValue.second);
     }
diff --git a/frameworks/native/efilter/custom/custom_efilter.h b/frameworks/native/efilter/custom/custom_efilter.h
index a4d1963c6cb19880d21537f63f2f247da8cbe66c..cf4e4a73a48095e9294deb385100871345ad7619 100644
--- a/frameworks/native/efilter/custom/custom_efilter.h
+++ b/frameworks/native/efilter/custom/custom_efilter.h
@@ -41,7 +41,7 @@ public:
 
     ErrorCode Render(EffectBuffer *src, EffectBuffer *dst, std::shared_ptr<EffectContext> &context) override;
 
-    ErrorCode SetValue(const std::string &key, Plugin::Any &value) override;
+    ErrorCode SetValue(const std::string &key, Any &value) override;
 
     ErrorCode Save(EffectJsonPtr &res) override;
 
diff --git a/frameworks/native/efilter/custom/filter_delegate.cpp b/frameworks/native/efilter/custom/filter_delegate.cpp
index 68b82bca980325b0a2b0b3df1a5d681387b36922..44485d5af67dfba997d033398734cdd9ddd50e58 100644
--- a/frameworks/native/efilter/custom/filter_delegate.cpp
+++ b/frameworks/native/efilter/custom/filter_delegate.cpp
@@ -40,9 +40,9 @@ bool FilterDelegate::Render(void *efilter, EffectBuffer *src, EffectBuffer *dst,
     OH_EffectFilter *ohEFilter = (OH_EffectFilter *)efilter;
     CHECK_AND_RETURN_RET_LOG(ohEFilter != nullptr && ohEFilter->filter_ != nullptr, false,
         "FilterDelegateRender: filter is null!");
-    Plugin::Any param = true;
+    Any param = true;
     ohEFilter->SetParameter(PARA_RENDER_WITH_SRC_AND_DST, param);
-    Plugin::Any any = context;
+    Any any = context;
     ohEFilter->SetParameter(PARA_RENDER_INFO, any);
 
     if (src->extraInfo_->dataType != DataType::TEX) {
@@ -75,9 +75,9 @@ bool FilterDelegate::Render(void *efilter, EffectBuffer *src, std::shared_ptr<Ef
     CHECK_AND_RETURN_RET_LOG(ohEFilter != nullptr && ohEFilter->filter_ != nullptr, false,
         "FilterDelegateRender: filter is null!");
 
-    Plugin::Any any = src;
+    Any any = src;
     ohEFilter->SetParameter(PARA_SRC_EFFECT_BUFFER, any);
-    Plugin::Any parameter = context;
+    Any parameter = context;
     ohEFilter->SetParameter(PARA_RENDER_INFO, parameter);
 
     OH_EffectFilterDelegate_PushData pushData = [](OH_EffectFilter *filter, OH_EffectBufferInfo *dst) {
@@ -90,7 +90,7 @@ bool FilterDelegate::Render(void *efilter, EffectBuffer *src, std::shared_ptr<Ef
     return res;
 }
 
-bool FilterDelegate::SetValue(void *efilter, const std::string &key, const Plugin::Any &value)
+bool FilterDelegate::SetValue(void *efilter, const std::string &key, const Any &value)
 {
     EFFECT_LOGD("FilterDelegate SetValue.");
     std::unique_ptr<ImageEffect_Any> ohValue = std::make_unique<ImageEffect_Any>();
@@ -130,12 +130,12 @@ void FilterDelegate::PushData(OH_EffectFilter *filter, OH_EffectBufferInfo *dst)
 {
     CHECK_AND_RETURN_LOG(dst != nullptr && filter != nullptr && filter->filter_ != nullptr,
         "FilterDelegatePushData: filter is null!");
-    Plugin::Any param;
+    Any param;
     if (filter->GetParameter(PARA_RENDER_WITH_SRC_AND_DST, param) == ErrorCode::SUCCESS) {
         return;
     }
 
-    Plugin::Any value;
+    Any value;
     ErrorCode res = filter->GetParameter(PARA_SRC_EFFECT_BUFFER, value);
     CHECK_AND_RETURN_LOG(res == ErrorCode::SUCCESS, "FilterDelegatePushData: get param fail! key=%{public}s",
         PARA_SRC_EFFECT_BUFFER);
@@ -154,24 +154,24 @@ void FilterDelegate::PushData(OH_EffectFilter *filter, OH_EffectBufferInfo *dst)
     if (dst->addr == src->buffer_ && src->extraInfo_->dataType != DataType::TEX) {
         std::shared_ptr<EffectBuffer> effectBuffer = std::make_shared<EffectBuffer>(src->bufferInfo_,
             dst->addr, src->extraInfo_);
-        Plugin::Any any;
+        Any any;
         res = filter->GetParameter(PARA_RENDER_INFO, any);
         CHECK_AND_RETURN_LOG(res == ErrorCode::SUCCESS, "FilterDelegatePushData: get param fail! key=%{public}s",
             PARA_RENDER_INFO);
 
-        auto &context = Plugin::AnyCast<std::shared_ptr<EffectContext> &>(any);
+        auto &context = AnyCast<std::shared_ptr<EffectContext> &>(any);
         filter->filter_->PushData(effectBuffer.get(), context);
         return;
     }
 
     std::shared_ptr<EffectBuffer> effectBuffer = GenDstEffectBuffer(dst, src);
 
-    Plugin::Any any;
+    Any any;
     res = filter->GetParameter(PARA_RENDER_INFO, any);
     CHECK_AND_RETURN_LOG(res == ErrorCode::SUCCESS, "FilterDelegatePushData: get param fail! key=%{public}s",
         PARA_RENDER_INFO);
 
-    auto &context = Plugin::AnyCast<std::shared_ptr<EffectContext> &>(any);
+    auto &context = AnyCast<std::shared_ptr<EffectContext> &>(any);
     filter->filter_->PushData(effectBuffer.get(), context);
 }
 
diff --git a/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.cpp b/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.cpp
index 9b6053cee083a2d74e4369e6ff84cf8f7584f093..20480060370e64778b9d9978b434e5efed8d6402 100644
--- a/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.cpp
+++ b/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.cpp
@@ -48,7 +48,7 @@ BrightnessEFilter::BrightnessEFilter(const std::string &name) : EFilter(name)
             {
                 {
                     IEffectFormat::RGBA8888,
-                    [this](EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+                    [this](EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
                         std::shared_ptr<EffectContext> &context)
                         { return gpuBrightnessAlgo_->OnApplyRGBA8888(src, dst, value, context); }
                 },
@@ -94,14 +94,14 @@ ErrorCode BrightnessEFilter::Render(EffectBuffer *src, EffectBuffer *dst, std::s
     return formatIter->second(src, dst, values_, context);
 }
 
-ErrorCode BrightnessEFilter::SetValue(const std::string &key, Plugin::Any &value)
+ErrorCode BrightnessEFilter::SetValue(const std::string &key, Any &value)
 {
     if (Parameter::KEY_INTENSITY.compare(key) != 0) {
         EFFECT_LOGE("key is not support! key=%{public}s", key.c_str());
         return ErrorCode::ERR_UNSUPPORTED_VALUE_KEY;
     }
 
-    auto brightnessPtr = Plugin::AnyCast<float>(&value);
+    auto brightnessPtr = AnyCast<float>(&value);
     if (brightnessPtr == nullptr) {
         EFFECT_LOGE("the type is not float! key=%{public}s", key.c_str());
         return ErrorCode::ERR_ANY_CAST_TYPE_NOT_FLOAT;
@@ -131,7 +131,7 @@ ErrorCode BrightnessEFilter::Restore(const EffectJsonPtr &values)
     if (brightness < Parameter::INTENSITY_RANGE[0] || brightness > Parameter::INTENSITY_RANGE[1]) {
         return ErrorCode::ERR_VALUE_OUT_OF_RANGE;
     }
-    Plugin::Any any = brightness;
+    Any any = brightness;
     return SetValue(Parameter::KEY_INTENSITY, any);
 }
 
diff --git a/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.h b/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.h
index c845406e4e65f142594d6fbc42593678f6ba9906..1be9db06cac6bc112c9429c36d8f3897ac396428 100644
--- a/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.h
+++ b/frameworks/native/efilter/filterimpl/brightness/brightness_efilter.h
@@ -39,7 +39,7 @@ public:
 
     ErrorCode Render(EffectBuffer *src, EffectBuffer *dst, std::shared_ptr<EffectContext> &context) override;
 
-    ErrorCode SetValue(const std::string &key, Plugin::Any &value) override;
+    ErrorCode SetValue(const std::string &key, Any &value) override;
 
     ErrorCode Restore(const EffectJsonPtr &values) override;
 
@@ -48,7 +48,7 @@ public:
     ErrorCode PreRender(IEffectFormat &format) override;
 private:
     using ApplyFunc =
-        std::function<ErrorCode(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+        std::function<ErrorCode(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
             std::shared_ptr<EffectContext> &context)>;
 
     static std::shared_ptr<EffectInfo> info_;
diff --git a/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.cpp b/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.cpp
index 3dc207503eaa2e7337248758d66de93108f830b7..8ec1de3ddcb5570b8d58406f0beb611685da8762 100644
--- a/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.cpp
+++ b/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.cpp
@@ -47,7 +47,7 @@ ErrorCode BrightnessCheckBufferInfolen(EffectBuffer *src, EffectBuffer *dst, uin
     return ErrorCode::SUCCESS;
 }
 
-float CpuBrightnessAlgo::ParseBrightness(std::map<std::string, Plugin::Any> &value)
+float CpuBrightnessAlgo::ParseBrightness(std::map<std::string, Any> &value)
 {
     float brightness = 0.f;
     ErrorCode res = CommonUtils::GetValue("FilterIntensity", value, brightness);
@@ -59,7 +59,7 @@ float CpuBrightnessAlgo::ParseBrightness(std::map<std::string, Plugin::Any> &val
 }
 
 ErrorCode CpuBrightnessAlgo::OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, std::shared_ptr<EffectContext> &context)
 {
     EFFECT_LOGI("CpuBrightnessAlgo::OnApplyRGBA8888 enter!");
     CHECK_AND_RETURN_RET_LOG(src != nullptr && dst != nullptr, ErrorCode::ERR_INPUT_NULL, "input para is null!");
@@ -114,7 +114,7 @@ ErrorCode CpuBrightnessAlgo::OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *ds
 }
 
 ErrorCode CpuBrightnessAlgo::OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, std::shared_ptr<EffectContext> &context)
 {
     EFFECT_TRACE_NAME("CpuBrightnessAlgo::OnApplyYUVNV21");
     EFFECT_LOGI("CpuBrightnessAlgo::OnApplyYUVNV21 enter!");
@@ -173,7 +173,7 @@ ErrorCode CpuBrightnessAlgo::OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst
 }
 
 ErrorCode CpuBrightnessAlgo::OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, std::shared_ptr<EffectContext> &context)
 {
     EFFECT_TRACE_NAME("CpuBrightnessAlgo::OnApplyYUVNV12");
     EFFECT_LOGI("CpuBrightnessAlgo::OnApplyYUVNV12 enter!");
diff --git a/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.h b/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.h
index e94aa6124f4b1b17514e6aac9a6444b9422f7496..82a72ca6e297b95600c86701451260aec54e3a34 100644
--- a/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.h
+++ b/frameworks/native/efilter/filterimpl/brightness/cpu_brightness_algo.h
@@ -28,17 +28,17 @@ namespace Media {
 namespace Effect {
 class CpuBrightnessAlgo {
 public:
-    static ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    static ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         std::shared_ptr<EffectContext> &context);
 
-    static ErrorCode OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    static ErrorCode OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         std::shared_ptr<EffectContext> &context);
 
-    static ErrorCode OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    static ErrorCode OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         std::shared_ptr<EffectContext> &context);
 
 private:
-    static float ParseBrightness(std::map<std::string, Plugin::Any> &value);
+    static float ParseBrightness(std::map<std::string, Any> &value);
 };
 } // namespace Effect
 } // namespace Media
diff --git a/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.cpp b/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.cpp
index 5d315d6438844ae066af2ca784081d194b76fff2..3602b07f81ce3bfcad26861a611ce2311fc5eadb 100644
--- a/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.cpp
+++ b/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.cpp
@@ -98,7 +98,7 @@ void GpuBrightnessAlgo::PostDraw(GLenum target)
     }
 }
 
-float GpuBrightnessAlgo::ParseBrightness(std::map<std::string, Plugin::Any> &value)
+float GpuBrightnessAlgo::ParseBrightness(std::map<std::string, Any> &value)
 {
     float brightness = 0.f;
     ErrorCode res = CommonUtils::GetValue("FilterIntensity", value, brightness);
@@ -110,7 +110,7 @@ float GpuBrightnessAlgo::ParseBrightness(std::map<std::string, Plugin::Any> &val
 }
 
 ErrorCode GpuBrightnessAlgo::OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, const std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, const std::shared_ptr<EffectContext> &context)
 {
     EFFECT_LOGI("GpuBrightnessFilterOperator::OnApplyRGBA8888 enter!");
     CHECK_AND_RETURN_RET_LOG(src != nullptr && dst != nullptr, ErrorCode::ERR_INPUT_NULL, "input para is null!");
diff --git a/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.h b/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.h
index b013e232a5ca6e2ff251ce5d7e54e2b20574b1c3..5a29e47c7e34324125151a97bfe0aa76e497e7e8 100644
--- a/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.h
+++ b/frameworks/native/efilter/filterimpl/brightness/gpu_brightness_algo.h
@@ -40,13 +40,13 @@ using BrightnessFilterDataPtr = std::shared_ptr<BrightnessFilterData>;
 class GpuBrightnessAlgo {
 public:
     IMAGE_EFFECT_EXPORT
-    ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         const std::shared_ptr<EffectContext> &context);
     ErrorCode Release();
     ErrorCode Init();
     void Render(GLenum target, RenderTexturePtr tex);
 private:
-    float ParseBrightness(std::map<std::string, Plugin::Any> &value);
+    float ParseBrightness(std::map<std::string, Any> &value);
     BrightnessFilterDataPtr renderEffectData_;
     void PreDraw(GLenum target);
     void PostDraw(GLenum target);
diff --git a/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.cpp b/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.cpp
index 502a02a2264573cd52beab1fc4be6b5fe375695f..847bbe855e00bc5edd9384931d105cf3c56d4e88 100644
--- a/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.cpp
+++ b/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.cpp
@@ -47,7 +47,7 @@ ContrastEFilter::ContrastEFilter(const std::string &name) : EFilter(name)
             {
                 {
                     IEffectFormat::RGBA8888,
-                    [this](EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+                    [this](EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
                         std::shared_ptr<EffectContext> &context)
                         { return gpuContrastAlgo_->OnApplyRGBA8888(src, dst, value, context); }
                 },
@@ -93,14 +93,14 @@ ErrorCode ContrastEFilter::Render(EffectBuffer *src, EffectBuffer *dst, std::sha
     return formatIter->second(src, dst, values_, context);
 }
 
-ErrorCode ContrastEFilter::SetValue(const std::string &key, Plugin::Any &value)
+ErrorCode ContrastEFilter::SetValue(const std::string &key, Any &value)
 {
     if (Parameter::KEY_INTENSITY.compare(key) != 0) {
         EFFECT_LOGE("key is not support! key=%{public}s", key.c_str());
         return ErrorCode::ERR_UNSUPPORTED_VALUE_KEY;
     }
 
-    auto contrastPtr = Plugin::AnyCast<float>(&value);
+    auto contrastPtr = AnyCast<float>(&value);
     if (contrastPtr == nullptr) {
         EFFECT_LOGE("the type is not float! key=%{public}s", key.c_str());
         return ErrorCode::ERR_ANY_CAST_TYPE_NOT_FLOAT;
@@ -128,7 +128,7 @@ ErrorCode ContrastEFilter::Restore(const EffectJsonPtr &values)
     if (contrast < Parameter::INTENSITY_RANGE[0] || contrast > Parameter::INTENSITY_RANGE[1]) {
         return ErrorCode::ERR_VALUE_OUT_OF_RANGE;
     }
-    Plugin::Any any = contrast;
+    Any any = contrast;
     return SetValue(Parameter::KEY_INTENSITY, any);
 }
 
diff --git a/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.h b/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.h
index effa852fc10aa4397dc7a4b9a7ecc6931c201ebb..6ee6f04169ef9bb167bda83a29ae7fb8e701adc9 100644
--- a/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.h
+++ b/frameworks/native/efilter/filterimpl/contrast/contrast_efilter.h
@@ -39,7 +39,7 @@ public:
 
     ErrorCode Render(EffectBuffer *src, EffectBuffer *dst, std::shared_ptr<EffectContext> &context) override;
 
-    ErrorCode SetValue(const std::string &key, Plugin::Any &value) override;
+    ErrorCode SetValue(const std::string &key, Any &value) override;
 
     ErrorCode Restore(const EffectJsonPtr &values) override;
 
@@ -48,7 +48,7 @@ public:
     ErrorCode PreRender(IEffectFormat &format) override;
 private:
     using ApplyFunc =
-        std::function<ErrorCode(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+        std::function<ErrorCode(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
             std::shared_ptr<EffectContext> &context)>;
 
     static std::shared_ptr<EffectInfo> info_;
diff --git a/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.cpp b/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.cpp
index 6603e0e1052ec8836529ca25e9f85aa744bb6317..80de70a3b61e477fce2657760ba6275a411ca358 100644
--- a/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.cpp
+++ b/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.cpp
@@ -50,7 +50,7 @@ ErrorCode ContrastCheckBufferInfolen(EffectBuffer *src, EffectBuffer *dst, uint3
 }
 
 ErrorCode CpuContrastAlgo::OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, std::shared_ptr<EffectContext> &context)
 {
     EFFECT_LOGI("CpuContrastAlgo::OnApplyRGBA8888 enter!");
     CHECK_AND_RETURN_RET_LOG(src != nullptr && dst != nullptr, ErrorCode::ERR_INPUT_NULL, "input para is null!");
@@ -105,7 +105,7 @@ ErrorCode CpuContrastAlgo::OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst,
 }
 
 ErrorCode CpuContrastAlgo::OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, std::shared_ptr<EffectContext> &context)
 {
     EFFECT_LOGI("CpuContrastAlgo::OnApplyYUVNV21 enter!");
     CHECK_AND_RETURN_RET_LOG(src != nullptr && dst != nullptr, ErrorCode::ERR_INPUT_NULL, "input para is null!");
@@ -161,7 +161,7 @@ ErrorCode CpuContrastAlgo::OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst,
 }
 
 ErrorCode CpuContrastAlgo::OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, std::shared_ptr<EffectContext> &context)
 {
     EFFECT_TRACE_NAME("CpuContrastAlgo::OnApplyYUVNV12");
     EFFECT_LOGI("CpuContrastAlgo::OnApplyYUVNV12 enter!");
@@ -218,7 +218,7 @@ ErrorCode CpuContrastAlgo::OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst,
     return ErrorCode::SUCCESS;
 }
 
-float CpuContrastAlgo::ParseContrast(std::map<std::string, Plugin::Any> &value)
+float CpuContrastAlgo::ParseContrast(std::map<std::string, Any> &value)
 {
     float contrast = 0.f;
     ErrorCode res = CommonUtils::GetValue("FilterIntensity", value, contrast);
diff --git a/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.h b/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.h
index 718784ba19de7b90f057ee5fdd004469141a762f..cfcf69e9a5e04a3898963945b4a3be0ea7cd1c5a 100644
--- a/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.h
+++ b/frameworks/native/efilter/filterimpl/contrast/cpu_contrast_algo.h
@@ -28,17 +28,17 @@ namespace Media {
 namespace Effect {
 class CpuContrastAlgo {
 public:
-    static ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    static ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         std::shared_ptr<EffectContext> &context);
 
-    static ErrorCode OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    static ErrorCode OnApplyYUVNV21(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         std::shared_ptr<EffectContext> &context);
 
-    static ErrorCode OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    static ErrorCode OnApplyYUVNV12(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         std::shared_ptr<EffectContext> &context);
 
 private:
-    static float ParseContrast(std::map<std::string, Plugin::Any> &value);
+    static float ParseContrast(std::map<std::string, Any> &value);
 };
 } // namespace Effect
 } // namespace Media
diff --git a/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.cpp b/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.cpp
index da69b5a808eba0fb2c6b1806db4f9bae3f046bd7..e9dbbb4699a8bec1e7c90bdf219d6c591525b583 100644
--- a/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.cpp
+++ b/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.cpp
@@ -99,7 +99,7 @@ void GpuContrastAlgo::PostDraw(GLenum target)
     }
 }
 
-float GpuContrastAlgo::ParseContrast(std::map<std::string, Plugin::Any> &value)
+float GpuContrastAlgo::ParseContrast(std::map<std::string, Any> &value)
 {
     float contrast = 0.f;
     ErrorCode res = CommonUtils::GetValue("FilterIntensity", value, contrast);
@@ -111,7 +111,7 @@ float GpuContrastAlgo::ParseContrast(std::map<std::string, Plugin::Any> &value)
 }
 
 ErrorCode GpuContrastAlgo::OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst,
-    std::map<std::string, Plugin::Any> &value, const std::shared_ptr<EffectContext> &context)
+    std::map<std::string, Any> &value, const std::shared_ptr<EffectContext> &context)
 {
     EFFECT_LOGI("GpuContrastFilter::OnApplyRGBA8888 enter!");
     CHECK_AND_RETURN_RET_LOG(src != nullptr && dst != nullptr, ErrorCode::ERR_INPUT_NULL, "input para is null!");
diff --git a/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.h b/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.h
index fa31bc0e3b5018c7e071089656fca7647328a5c1..6c9de243a854d5185f0ff0f62434570b3dda4dd1 100644
--- a/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.h
+++ b/frameworks/native/efilter/filterimpl/contrast/gpu_contrast_algo.h
@@ -40,13 +40,13 @@ using ContrastFilterDataPtr = std::shared_ptr<ContrastFilterData>;
 class GpuContrastAlgo {
 public:
     IMAGE_EFFECT_EXPORT
-    ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Plugin::Any> &value,
+    ErrorCode OnApplyRGBA8888(EffectBuffer *src, EffectBuffer *dst, std::map<std::string, Any> &value,
         const std::shared_ptr<EffectContext> &context);
     ErrorCode Release();
     ErrorCode Init();
     void Render(GLenum target, RenderTexturePtr tex);
 private:
-    float ParseContrast(std::map<std::string, Plugin::Any> &value);
+    float ParseContrast(std::map<std::string, Any> &value);
     ContrastFilterDataPtr renderEffectData_;
     void PreDraw(GLenum target);
     void PostDraw(GLenum target);
diff --git a/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp b/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp
index df4bdf0a6c3b5a5ce976e47a5fe5485fbc93e6c8..6ebbe5bd5dabb42e2034ed2c1900084872f63056 100644
--- a/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp
+++ b/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp
@@ -45,7 +45,7 @@ struct Region {
     int32_t height;
 };
 
-void CalculateCropRegion(int32_t srcWidth, int32_t srcHeight, std::map<std::string, Plugin::Any> &values,
+void CalculateCropRegion(int32_t srcWidth, int32_t srcHeight, std::map<std::string, Any> &values,
     Region *region)
 {
     AreaInfo areaInfo = { 0, 0, srcWidth, srcHeight };
diff --git a/frameworks/native/utils/common/common_utils.cpp b/frameworks/native/utils/common/common_utils.cpp
index 050f201277a84f0a8b7638d38c886d2eaf4ae014..2cf0431dc08dfcc8d99015f6542b66325f21b88c 100644
--- a/frameworks/native/utils/common/common_utils.cpp
+++ b/frameworks/native/utils/common/common_utils.cpp
@@ -106,9 +106,9 @@ std::vector<int32_t> HDR_P010_LIST = {
 };
 
 template <class ValueType>
-ErrorCode ParseJson(const std::string &key, Plugin::Any &any, EffectJsonPtr &json)
+ErrorCode ParseJson(const std::string &key, Any &any, EffectJsonPtr &json)
 {
-    auto result = Plugin::AnyCast<ValueType>(&any);
+    auto result = AnyCast<ValueType>(&any);
     if (result == nullptr) {
         return ErrorCode::ERR_ANY_CAST_TYPE_NOT_MATCH;
     }
@@ -512,7 +512,7 @@ void CommonUtils::UnlockPixelMap(const PixelMap *pixelMap)
     EFFECT_LOGI("UnlockPixelMap!");
 }
 
-ErrorCode CommonUtils::ParseAnyAndAddToJson(const std::string &key, Plugin::Any &any, EffectJsonPtr &result)
+ErrorCode CommonUtils::ParseAnyAndAddToJson(const std::string &key, Any &any, EffectJsonPtr &result)
 {
     CHECK_AND_RETURN_RET(ParseJson<float>(key, any, result) != ErrorCode::SUCCESS, ErrorCode::SUCCESS);
     CHECK_AND_RETURN_RET(ParseJson<int32_t>(key, any, result) != ErrorCode::SUCCESS, ErrorCode::SUCCESS);
diff --git a/frameworks/native/utils/common/common_utils.h b/frameworks/native/utils/common/common_utils.h
index 15de7f8d7aeff8fa4a3f7dadda95d825a45284a8..6535349ff6c0136d20fb599fd63e4e9b67f97a8e 100644
--- a/frameworks/native/utils/common/common_utils.h
+++ b/frameworks/native/utils/common/common_utils.h
@@ -59,7 +59,7 @@ public:
     IMAGE_EFFECT_EXPORT static ErrorCode ParseTex(unsigned int textureId, unsigned int colorSpace,
         std::shared_ptr<EffectBuffer> &effectBuffer);
     IMAGE_EFFECT_EXPORT static void UnlockPixelMap(const PixelMap *pixelMap);
-    static ErrorCode ParseAnyAndAddToJson(const std::string &key, Plugin::Any &any, EffectJsonPtr &result);
+    static ErrorCode ParseAnyAndAddToJson(const std::string &key, Any &any, EffectJsonPtr &result);
     static bool EndsWithJPG(const std::string &input);
     static bool EndsWithHEIF(const std::string &input);
     static ErrorCode ModifyPixelMapProperty(PixelMap *pixelMap, const std::shared_ptr<EffectBuffer> &buffer,
@@ -78,9 +78,9 @@ public:
 
     static std::shared_ptr<ImageSource> GetImageSourceFromPath(std::string path);
 
-    template <class ValueType> static ErrorCode ParseAny(Plugin::Any any, ValueType &value)
+    template <class ValueType> static ErrorCode ParseAny(Any any, ValueType &value)
     {
-        auto result = Plugin::AnyCast<ValueType>(&any);
+        auto result = AnyCast<ValueType>(&any);
         if (result == nullptr) {
             EFFECT_LOGE("value type is not match!");
             return ErrorCode::ERR_ANY_CAST_TYPE_NOT_MATCH;
@@ -92,7 +92,7 @@ public:
     }
 
     template <class ValueType>
-    static ErrorCode GetValue(const std::string &key, std::map<std::string, Plugin::Any> &valueMap, ValueType &value)
+    static ErrorCode GetValue(const std::string &key, std::map<std::string, Any> &valueMap, ValueType &value)
     {
         auto it = valueMap.find(key);
         if (it == valueMap.end()) {
@@ -100,7 +100,7 @@ public:
             return ErrorCode::ERR_NO_VALUE_KEY;
         }
 
-        auto result = Plugin::AnyCast<ValueType>(&it->second);
+        auto result = AnyCast<ValueType>(&it->second);
         if (result == nullptr) {
             EFFECT_LOGE("value type is not match! key=%{public}s", key.c_str());
             return ErrorCode::ERR_ANY_CAST_TYPE_NOT_MATCH;
diff --git a/interfaces/inner_api/native/common/any.h b/interfaces/inner_api/native/common/any.h
index 2dce2ab0df42838fcb54bb62bc4cc3ed18615bd4..3e98166affcfce3c8e53544b1751aa38dfb1d8f8 100644
--- a/interfaces/inner_api/native/common/any.h
+++ b/interfaces/inner_api/native/common/any.h
@@ -16,6 +16,6 @@
 #ifndef IMAGE_EFFECT_ANY_H
 #define IMAGE_EFFECT_ANY_H
 
-#include "plugin/common/any.h"
+#include "meta/any.h"
 
 #endif // IMAGE_EFFECT_ANY_H
diff --git a/interfaces/inner_api/native/custom/delegate.h b/interfaces/inner_api/native/custom/delegate.h
index 0b0993db92ab68a71280e5c6881c24d44484aa91..421a9c99feec417b9894569c3798fe55b85c5d93 100644
--- a/interfaces/inner_api/native/custom/delegate.h
+++ b/interfaces/inner_api/native/custom/delegate.h
@@ -38,7 +38,7 @@ public:
     IMAGE_EFFECT_EXPORT
     virtual bool Render(void *efilter, EffectBuffer *src, std::shared_ptr<EffectContext> &context) = 0;
 
-    IMAGE_EFFECT_EXPORT virtual bool SetValue(void *efilter, const std::string &key, const Plugin::Any &value) = 0;
+    IMAGE_EFFECT_EXPORT virtual bool SetValue(void *efilter, const std::string &key, const Any &value) = 0;
 
     IMAGE_EFFECT_EXPORT virtual bool Save(void *efilter, EffectJsonPtr &res) = 0;
 
diff --git a/interfaces/inner_api/native/custom/filter_delegate.h b/interfaces/inner_api/native/custom/filter_delegate.h
index e369d5adcb91d3c4ac39241fc0e6145362102381..b38003322015a79a1653cd18dedb0625a49e571d 100644
--- a/interfaces/inner_api/native/custom/filter_delegate.h
+++ b/interfaces/inner_api/native/custom/filter_delegate.h
@@ -41,7 +41,7 @@ public:
 
     bool Render(void *efilter, EffectBuffer *src, std::shared_ptr<EffectContext> &context) override;
 
-    bool SetValue(void *efilter, const std::string &key, const Plugin::Any &value) override;
+    bool SetValue(void *efilter, const std::string &key, const Any &value) override;
 
     bool Save(void *efilter, EffectJsonPtr &res) override;
 
diff --git a/interfaces/inner_api/native/effect/image_effect_inner.h b/interfaces/inner_api/native/effect/image_effect_inner.h
index 239a0e87c2ec6afd3bec9d079f685da0951ea01e..c566eb912c9b0c762559e9a11531d02a5b093ec1 100644
--- a/interfaces/inner_api/native/effect/image_effect_inner.h
+++ b/interfaces/inner_api/native/effect/image_effect_inner.h
@@ -201,7 +201,7 @@ public:
     IMAGE_EFFECT_EXPORT virtual ErrorCode SetOutNativeWindow(OHNativeWindow *nativeWindow);
     IMAGE_EFFECT_EXPORT sptr<Surface> GetInputSurface();
 
-    IMAGE_EFFECT_EXPORT virtual ErrorCode Configure(const std::string &key, const Plugin::Any &value);
+    IMAGE_EFFECT_EXPORT virtual ErrorCode Configure(const std::string &key, const Any &value);
 
     IMAGE_EFFECT_EXPORT void Stop();
 
@@ -306,7 +306,7 @@ private:
         { IPType::CPU, IPType::GPU },
     };
 
-    std::map<ConfigType, Plugin::Any> config_ = { { ConfigType::IPTYPE, ipType_ } };
+    std::map<ConfigType, Any> config_ = { { ConfigType::IPTYPE, ipType_ } };
 
     EffectJsonPtr extraInfo_ = nullptr;
 
diff --git a/interfaces/inner_api/native/efilter/efilter.h b/interfaces/inner_api/native/efilter/efilter.h
index abbade6d24ff1d17921b127c64ae76913e6fadcf..3e0b92736ceb9ae6dec1b0c97e364e464af173ae 100644
--- a/interfaces/inner_api/native/efilter/efilter.h
+++ b/interfaces/inner_api/native/efilter/efilter.h
@@ -51,9 +51,9 @@ public:
     IMAGE_EFFECT_EXPORT
     virtual ErrorCode Render(EffectBuffer *src, EffectBuffer *dst, std::shared_ptr<EffectContext> &context) = 0;
 
-    IMAGE_EFFECT_EXPORT virtual ErrorCode SetValue(const std::string &key, Plugin::Any &value);
+    IMAGE_EFFECT_EXPORT virtual ErrorCode SetValue(const std::string &key, Any &value);
 
-    IMAGE_EFFECT_EXPORT virtual ErrorCode GetValue(const std::string &key, Plugin::Any &value);
+    IMAGE_EFFECT_EXPORT virtual ErrorCode GetValue(const std::string &key, Any &value);
 
     IMAGE_EFFECT_EXPORT virtual ErrorCode Save(EffectJsonPtr &res);
 
@@ -72,7 +72,7 @@ public:
 
     IMAGE_EFFECT_EXPORT ErrorCode PushData(EffectBuffer *buffer, std::shared_ptr<EffectContext> &context);
 
-    std::map<std::string, Plugin::Any> &GetValues()
+    std::map<std::string, Any> &GetValues()
     {
         return values_;
     }
@@ -104,7 +104,7 @@ public:
 protected:
     ErrorCode CalculateEFilterIPType(IEffectFormat &formatType, IPType &ipType);
 
-    std::map<std::string, Plugin::Any> values_;
+    std::map<std::string, Any> values_;
 
     std::shared_ptr<EFilterCacheConfig> cacheConfig_ = nullptr;
 
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index cfc2b1a1e31dc9010fd8987f21027df04ea92fd7..df35c1b819f71b0fc3b137f706b54a7748b8390c 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -103,7 +103,7 @@ ohos_unittest("image_effect_unittest") {
     "libexif:libexif",
     "googletest:gmock_main",
     "googletest:gtest_main",
-    "media_foundation:histreamer_plugin_base",
+    "media_foundation:media_foundation",
   ]
 
   use_exceptions = true
diff --git a/test/unittest/TestImageEffect.cpp b/test/unittest/TestImageEffect.cpp
index 6032c071f2f6d1c727c81cfc3942603a4f79981a..5ed43b51b242469ac8072be4b52e64037ec8f746 100644
--- a/test/unittest/TestImageEffect.cpp
+++ b/test/unittest/TestImageEffect.cpp
@@ -49,7 +49,7 @@ public:
         return true;
     }
 
-    bool SetValue(void *efilter, const std::string &key, const Plugin::Any &value) override
+    bool SetValue(void *efilter, const std::string &key, const Any &value) override
     {
         return true;
     }
@@ -63,7 +63,7 @@ public:
     void *Restore(const EffectJsonPtr &values) override
     {
         filter_ = EFilterFactory::Instance()->Create(CUSTOM_TEST_EFILTER);
-        Plugin::Any brightness = values->GetFloat("brightness");
+        Any brightness = values->GetFloat("brightness");
         filter_->SetValue("brightness", brightness);
         return filter_.get();
     }
@@ -148,7 +148,7 @@ HWTEST_F(TestImageEffect, Start001, TestSize.Level1)
 {
     std::shared_ptr<ImageEffect> imageEffect = std::make_unique<ImageEffect>(IMAGE_EFFECT_NAME);
     std::shared_ptr<EFilter> efilter = EFilterFactory::Instance()->Create(BRIGHTNESS_EFILTER);
-    Plugin::Any value = 100.f;
+    Any value = 100.f;
     ErrorCode result = efilter->SetValue(KEY_FILTER_INTENSITY, value);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
     imageEffect->AddEFilter(efilter);
@@ -367,16 +367,16 @@ HWTEST_F(TestImageEffect, Restore001, TestSize.Level1)
     std::vector<std::shared_ptr<EFilter>> efilters = imageEffect->GetEFilters();
     ASSERT_EQ(efilters.size(), 2);
     ASSERT_STREQ(efilters.at(0)->GetName().c_str(), BRIGHTNESS_EFILTER);
-    Plugin::Any value;
+    Any value;
     ASSERT_EQ(efilters.at(0)->GetValue(KEY_FILTER_INTENSITY, value), ErrorCode::SUCCESS);
-    auto brightnessRatio = Plugin::AnyCast<float>(&value);
+    auto brightnessRatio = AnyCast<float>(&value);
     ASSERT_NE(brightnessRatio, nullptr);
     ASSERT_FLOAT_EQ(*brightnessRatio, 100.f);
 
-    Plugin::Any any;
+    Any any;
     ASSERT_STREQ(efilters.at(1)->GetName().c_str(), CONTRAST_EFILTER);
     ASSERT_EQ(efilters.at(1)->GetValue(KEY_FILTER_INTENSITY, any), ErrorCode::SUCCESS);
-    auto contrastRatio = Plugin::AnyCast<float>(&any);
+    auto contrastRatio = AnyCast<float>(&any);
     ASSERT_NE(contrastRatio, nullptr);
     ASSERT_FLOAT_EQ(*contrastRatio, 50.f);
 }
@@ -396,9 +396,9 @@ HWTEST_F(TestImageEffect, Restore002, TestSize.Level1)
     std::vector<std::shared_ptr<EFilter>> efilters = imageEffect->GetEFilters();
     ASSERT_EQ(efilters.size(), 2);
     ASSERT_STREQ(efilters.at(0)->GetName().c_str(), "CustomTestEFilter");
-    Plugin::Any value;
+    Any value;
     ASSERT_EQ(efilters.at(0)->GetValue("brightness", value), ErrorCode::SUCCESS);
-    auto brightness = Plugin::AnyCast<float>(&value);
+    auto brightness = AnyCast<float>(&value);
     ASSERT_NE(brightness, nullptr);
     ASSERT_FLOAT_EQ(*brightness, 60.f);
 
@@ -439,7 +439,7 @@ HWTEST_F(TestImageEffect, Surface001, TestSize.Level1)
     imageEffect_->ConsumerBufferAvailable();
 
     std::shared_ptr<EFilter> contrastEFilter = EFilterFactory::Instance()->Create(CONTRAST_EFILTER);
-    Plugin::Any value = 50.f;
+    Any value = 50.f;
     result = contrastEFilter->SetValue(KEY_FILTER_INTENSITY, value);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
     imageEffect_->AddEFilter(contrastEFilter);
diff --git a/test/unittest/TestUtils.cpp b/test/unittest/TestUtils.cpp
index dddeb06d034b7c233f243dccc2ca7e50030d450d..e75aa0e59278cd99f176b97617352d20ce5830f9 100644
--- a/test/unittest/TestUtils.cpp
+++ b/test/unittest/TestUtils.cpp
@@ -115,10 +115,10 @@ HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny001, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_INT32;
     value.dataValue.int32Value = 123;
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
-    int actualValue = Plugin::AnyCast<int>(any);
+    int actualValue = AnyCast<int>(any);
     ASSERT_EQ(actualValue, 123);
 }
 
@@ -126,10 +126,10 @@ HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny002, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_FLOAT;
     value.dataValue.floatValue = 123.45f;
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
-    float actualValue = Plugin::AnyCast<float>(any);
+    float actualValue = AnyCast<float>(any);
     ASSERT_EQ(actualValue, 123.45f);
 }
 
@@ -137,10 +137,10 @@ HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny003, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_DOUBLE;
     value.dataValue.doubleValue = 123.45;
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
-    double actualValue = Plugin::AnyCast<double>(any);
+    double actualValue = AnyCast<double>(any);
     ASSERT_EQ(actualValue, 123.45);
 }
 
@@ -148,35 +148,35 @@ HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny004, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_CHAR;
     value.dataValue.charValue = 'A';
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
-    ASSERT_EQ(Plugin::AnyCast<char>(any), 'A');
+    ASSERT_EQ(AnyCast<char>(any), 'A');
 }
 
 HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny005, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_LONG;
     value.dataValue.longValue = 123456789L;
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
-    ASSERT_EQ(Plugin::AnyCast<long>(any), 123456789L);
+    ASSERT_EQ(AnyCast<long>(any), 123456789L);
 }
 
 HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny006, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_PTR;
     value.dataValue.ptrValue = (void*)0x12345678;
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
-    ASSERT_EQ(Plugin::AnyCast<void*>(any), reinterpret_cast<void*>(0x12345678));
+    ASSERT_EQ(AnyCast<void*>(any), reinterpret_cast<void*>(0x12345678));
 }
 
 HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny007, TestSize.Level1) {
     ImageEffect_Any value;
-    Plugin::Any any;
+    Any any;
     ErrorCode result = NativeCommonUtils::ParseOHAny(&value, any);
     ASSERT_NE(result, ErrorCode::SUCCESS);
 }
@@ -185,47 +185,47 @@ HWTEST_F(TestUtils, NativeCommonUtilsParseOHAny008, TestSize.Level1) {
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_BOOL;
     value.dataValue.boolValue = true;
-    Plugin::Any any;
+    Any any;
     EXPECT_EQ(NativeCommonUtils::ParseOHAny(&value, any), ErrorCode::SUCCESS);
 }
 
 HWTEST_F(TestUtils, NativeCommonUtilsSwitchToOHAny001, TestSize.Level1) {
-    Plugin::Any any = 10.0;
+    Any any = 10.0;
     ImageEffect_Any value;
     value.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_DOUBLE;
     ErrorCode result = NativeCommonUtils::SwitchToOHAny(any, &value);
     EXPECT_EQ(result, ErrorCode::SUCCESS);
     EXPECT_DOUBLE_EQ(value.dataValue.doubleValue, 10.0);
 
-    Plugin::Any anyChar = 'a';
+    Any anyChar = 'a';
     ImageEffect_Any valueChar;
     valueChar.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_CHAR;
     result = NativeCommonUtils::SwitchToOHAny(anyChar, &valueChar);
     EXPECT_EQ(result, ErrorCode::SUCCESS);
     EXPECT_EQ(valueChar.dataValue.charValue, 'a');
 
-    Plugin::Any anyLong = 10L;
+    Any anyLong = 10L;
     ImageEffect_Any valueLong;
     valueLong.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_LONG;
     result = NativeCommonUtils::SwitchToOHAny(anyLong, &valueLong);
     EXPECT_EQ(result, ErrorCode::SUCCESS);
     EXPECT_EQ(valueLong.dataValue.longValue, 10L);
 
-    Plugin::Any anyPtr = (void*)10;
+    Any anyPtr = (void*)10;
     ImageEffect_Any valuePtr;
     valuePtr.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_PTR;
     result = NativeCommonUtils::SwitchToOHAny(anyPtr, &valuePtr);
     EXPECT_EQ(result, ErrorCode::SUCCESS);
     EXPECT_EQ(valuePtr.dataValue.ptrValue, (void*)10);
 
-    Plugin::Any anyBool = true;
+    Any anyBool = true;
     ImageEffect_Any valueBool;
     valueBool.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_BOOL;
     result = NativeCommonUtils::SwitchToOHAny(anyBool, &valueBool);
     EXPECT_EQ(result, ErrorCode::SUCCESS);
     EXPECT_EQ(valueBool.dataValue.boolValue, true);
 
-    Plugin::Any anyUnknown = std::string("Unsupported");
+    Any anyUnknown = std::string("Unsupported");
     ImageEffect_Any valueUnknown;
     valueUnknown.dataType = ImageEffect_DataType::EFFECT_DATA_TYPE_UNKNOWN;
     result = NativeCommonUtils::SwitchToOHAny(anyUnknown, &valueUnknown);
@@ -282,7 +282,7 @@ HWTEST_F(TestUtils, JsonHelper001, TestSize.Level1) {
 
 HWTEST_F(TestUtils, NativeCommonUtilsParseJson001, TestSize.Level1) {
     std::string key = "test_key";
-    Plugin::Any any = nullptr;
+    Any any = nullptr;
     Json *json = nullptr;
     EffectJsonPtr result = std::make_shared<EffectJson>(json);
     ErrorCode ret = CommonUtils::ParseAnyAndAddToJson(key, any, result);
diff --git a/test/unittest/image_effect_inner_unittest.cpp b/test/unittest/image_effect_inner_unittest.cpp
index 6e68765c450cf9f1da9bdf91d664a40715b95e99..ac2f376ea9b816d116a066acde93086b9a56fa42 100644
--- a/test/unittest/image_effect_inner_unittest.cpp
+++ b/test/unittest/image_effect_inner_unittest.cpp
@@ -113,7 +113,7 @@ HWTEST_F(ImageEffectInnerUnittest, Image_effect_unittest_001, TestSize.Level1)
     InSequence s;
     std::shared_ptr<EFilter> efilter = EFilterFactory::Instance()->Create(BRIGHTNESS_EFILTER);
     imageEffect_->AddEFilter(efilter);
-    Plugin::Any value = 200.f;
+    Any value = 200.f;
     efilter->SetValue(KEY_FILTER_INTENSITY, value);
     ErrorCode result = imageEffect_->SetInputPixelMap(mockPixelMap_);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
@@ -125,7 +125,7 @@ HWTEST_F(ImageEffectInnerUnittest, Image_effect_unittest_002, TestSize.Level1)
 {
     InSequence s;
     std::shared_ptr<EFilter> efilter = EFilterFactory::Instance()->Create(BRIGHTNESS_EFILTER);
-    Plugin::Any value = 200.f;
+    Any value = 200.f;
     efilter->SetValue(KEY_FILTER_INTENSITY, value);
     std::shared_ptr<EffectBuffer> src = std::make_shared<EffectBuffer>(
         effectBuffer_->bufferInfo_, effectBuffer_->buffer_, effectBuffer_->extraInfo_);
@@ -138,7 +138,7 @@ HWTEST_F(ImageEffectInnerUnittest, Image_effect_unittest_003, TestSize.Level1)
 {
     std::shared_ptr<EFilter> efilter = EFilterFactory::Instance()->Create(BRIGHTNESS_EFILTER);
     imageEffect_->AddEFilter(efilter);
-    Plugin::Any value = 100.f;
+    Any value = 100.f;
     efilter->SetValue(KEY_FILTER_INTENSITY, value);
     ErrorCode result = imageEffect_->SetInputPixelMap(mockPixelMap_);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
@@ -155,7 +155,7 @@ HWTEST_F(ImageEffectInnerUnittest, Image_effect_unittest_004, TestSize.Level1)
     uint32_t x1 = static_cast<uint32_t>(mockPixelMap_->GetWidth() / CROP_FACTOR);
     uint32_t y1 = static_cast<uint32_t>(mockPixelMap_->GetHeight() / CROP_FACTOR);
     uint32_t areaInfo[] = { 0, 0, x1, y1};
-    Plugin::Any value = static_cast<void *>(areaInfo);
+    Any value = static_cast<void *>(areaInfo);
     efilter->SetValue(KEY_FILTER_REGION, value);
     ErrorCode result = imageEffect_->SetInputPixelMap(mockPixelMap_);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
@@ -172,7 +172,7 @@ HWTEST_F(ImageEffectInnerUnittest, Image_effect_unittest_005, TestSize.Level1)
     uint32_t x1 = static_cast<uint32_t>(mockPixelMap_->GetWidth() / CROP_FACTOR);
     uint32_t y1 = static_cast<uint32_t>(mockPixelMap_->GetHeight() / CROP_FACTOR);
     uint32_t areaInfo[] = { 0, 0, x1, y1};
-    Plugin::Any value = static_cast<void *>(areaInfo);
+    Any value = static_cast<void *>(areaInfo);
     efilter->SetValue(KEY_FILTER_REGION, value);
     ErrorCode result = imageEffect_->SetInputPixelMap(mockPixelMap_);
     ASSERT_EQ(result, ErrorCode::SUCCESS);
@@ -358,7 +358,7 @@ HWTEST_F(ImageEffectInnerUnittest, RenderTexture_001, TestSize.Level1)
     result = imageEffect_->SetOutputTexture(outTex->GetName());
     ASSERT_EQ(result, ErrorCode::SUCCESS);
     std::shared_ptr<EFilter> efilter = EFilterFactory::Instance()->Create(BRIGHTNESS_EFILTER);
-    Plugin::Any value = 70.f;
+    Any value = 70.f;
     efilter->SetValue(KEY_FILTER_INTENSITY, value);
     imageEffect_->AddEFilter(efilter);
     result = imageEffect_->Start();
diff --git a/test/unittest/native_image_effect_unittest.cpp b/test/unittest/native_image_effect_unittest.cpp
index e9050dbbfe9f756b41870afa00b8dd3a12ed97de..bbf76dae579716c3c62a99b79c67330428a5ee11 100644
--- a/test/unittest/native_image_effect_unittest.cpp
+++ b/test/unittest/native_image_effect_unittest.cpp
@@ -89,13 +89,13 @@ public:
     {
         res->Put("name", name_);
         EffectJsonPtr jsonValues = EffectJsonHelper::CreateObject();
-        Plugin::Any any;
+        Any any;
         auto it = values_.find(Test::KEY_FILTER_INTENSITY);
         if (it == values_.end()) {
             return ErrorCode::ERR_UNKNOWN;
         }
 
-        auto value = Plugin::AnyCast<void *>(&it->second);
+        auto value = AnyCast<void *>(&it->second);
         if (value == nullptr) {
             return ErrorCode::ERR_UNKNOWN;
         }