diff --git a/bundle.json b/bundle.json
index 7750989ba4154a02f7afbfa9de3519e821e7ab75..be45e6da13838618b1d593daf15767c7a0c322a2 100644
--- a/bundle.json
+++ b/bundle.json
@@ -37,6 +37,7 @@
                 "hilog",
                 "input",
                 "graphic_2d",
+                "graphic_surface",
                 "samgr",
                 "safwk",
                 "hicollie",
diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn
index 9a8c370ea2172b7a672a729d1c3160aec2038854..e5e4188534038a2ec7c7d9002a15bfa647050e9f 100644
--- a/screenhandler/BUILD.gn
+++ b/screenhandler/BUILD.gn
@@ -49,7 +49,7 @@ ohos_shared_library("distributed_screen_handler") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
     "player_framework:media_client",
     "window_manager:libdm",
diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn
index 30da30b7838453132f77db050dba3ed5916b64e1..1580f7fbdbfdac68f5a29b73e3321d10c8bd1f2b 100644
--- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn
@@ -56,7 +56,7 @@ ohos_fuzztest("PluginHardwareFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
     "window_manager:libdm",
   ]
diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn
index a2cc09679c16891077bc23ef1ab1d9fcf536ace9..93863738f7a9328ad7a17a0036d9d754e6ba5e37 100644
--- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn
@@ -56,7 +56,7 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
     "window_manager:libdm",
   ]
diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn
index afccc61b6f10b3ff239d0f38a01516dc22c73cbd..4ee114751b393283f7d2b705e11d5b07d3aece9f 100644
--- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn
@@ -56,7 +56,7 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
     "window_manager:libdm",
   ]
diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn
index c415dc4c333a4f5bb5ec96c227f6685ea0634209..a56f495a599875f4f630d6de9770cf454ebd1d0d 100644
--- a/screenhandler/test/unittest/screenhandler/BUILD.gn
+++ b/screenhandler/test/unittest/screenhandler/BUILD.gn
@@ -45,7 +45,7 @@ ohos_unittest("DscreenHandlerTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
     "player_framework:media_client",
     "window_manager:libdm",
diff --git a/services/common/test/unittest/decision_center/BUILD.gn b/services/common/test/unittest/decision_center/BUILD.gn
index 1c3d841f6e3d69114e96befdabf64b71d4dacd93..3f49c407aec509c8a41bfdd86ac4c32a4457003e 100644
--- a/services/common/test/unittest/decision_center/BUILD.gn
+++ b/services/common/test/unittest/decision_center/BUILD.gn
@@ -44,8 +44,8 @@ ohos_unittest("ScreenDecisionCenterTest") {
 
   external_deps = [
     "c_utils:utils",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "player_framework:media_client",
   ]
 }
diff --git a/services/common/test/unittest/imageJpeg/BUILD.gn b/services/common/test/unittest/imageJpeg/BUILD.gn
index c0d6219f40b249c931a053cca7c5d5d8ad9dd48d..ae3b91d0443163e975c44570ebea6f53858dbe45 100644
--- a/services/common/test/unittest/imageJpeg/BUILD.gn
+++ b/services/common/test/unittest/imageJpeg/BUILD.gn
@@ -43,7 +43,7 @@ ohos_unittest("JpegImageProcessorTest") {
 
   external_deps = [
     "c_utils:utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "player_framework:media_client",
   ]
 }
diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn
index 8d9bf6fe381d9d314b043ce58eb395fc6a985e16..5f2f10d93268ac4a132a64117a2d0219eb341070 100644
--- a/services/screenclient/BUILD.gn
+++ b/services/screenclient/BUILD.gn
@@ -53,7 +53,7 @@ ohos_shared_library("distributed_screen_client") {
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
     "graphic_2d:librender_service_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "input:libmmi-client",
     "window_manager:libwm",
   ]
diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn
index 72263d856df677b82258f60e531ce1d2786b93e4..2fbe13ac7a84ea57301a192e20105943a6feecbb 100644
--- a/services/screenclient/test/unittest/BUILD.gn
+++ b/services/screenclient/test/unittest/BUILD.gn
@@ -52,7 +52,7 @@ ohos_unittest("ScreenClientTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:librender_service_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "input:libmmi-client",
     "window_manager:libwm",
   ]
diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn
index a424fa5da99582ae16019a26de1fa2ce2a61be0a..1e24ae2c47194a717f1b24453c186210d5799999 100644
--- a/services/screendemo/BUILD.gn
+++ b/services/screendemo/BUILD.gn
@@ -58,7 +58,7 @@ ohos_executable("distributedScreenTest") {
     "c_utils:utils",
     "dsoftbus:softbus_client",
     "graphic_2d:librender_service_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "player_framework:media_client",
     "samgr:samgr_proxy",
diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn
index d3255df9cb4e2adc0f00a4c78767136e1639d2fa..49e69948e17254c25ba22815e0fb0cd1f81057ce 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -87,7 +87,7 @@ ohos_shared_library("distributed_screen_sink") {
     "distributed_hardware_fwk:distributed_av_receiver",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn
index 345bdb2bcb15d71b4bc1b84f4f865cc0cdbd76f3..46ce0c27f0dde77ba9d68e6f974ce00ec5e60da7 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -94,7 +94,7 @@ ohos_shared_library("distributed_screen_source") {
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_2d:libcomposer",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hicollie:libhicollie",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
index ca522c3e079fb5ad6a4e92bb8ad03fcd05c55818..3df30fe215f277f00bf430eb0c29bc85ea178563 100644
--- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
+++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
@@ -62,7 +62,7 @@ ohos_fuzztest("OnChangeFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributed_av_sender",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "window_manager:libdm",
   ]
 }
diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
index 9b55ff115f4a74c4f70e87149c4172148154be68..80deea70f5712796345d27eafb2c579f28f713a3 100644
--- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
+++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
@@ -75,7 +75,7 @@ ohos_unittest("DscreenRegionMgrTest") {
     "distributed_hardware_fwk:distributedhardwareutils",
     "graphic_2d:libcomposer",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hisysevent:libhisysevent",
     "window_manager:libdm",
   ]
diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
index 5f052a7419cd3c6e5b024681f0de6b0e0938fbaa..aa82f239a73db3aa41465f1c5b784a6e9206478d 100644
--- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
+++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
@@ -79,8 +79,8 @@ ohos_unittest("DscreenMgrTest") {
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_2d:libcomposer",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "hdf_core:libhdi",
     "player_framework:media_client",
     "window_manager:libdm",
diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn
index c5b176ac7466cd93cddbe73a3070229caf79ad17..06c6368a46e741ee4d847f579c9d75c9722512e8 100644
--- a/services/screentransport/screensinktrans/BUILD.gn
+++ b/services/screentransport/screensinktrans/BUILD.gn
@@ -78,7 +78,7 @@ ohos_shared_library("distributed_screen_sinktrans") {
     "distributed_hardware_fwk:distributed_av_receiver",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn
index 8aaa41e1899365cb00ef59fa3a4ad73b0ee8c64f..7abc6fe0b238904f29b2efb3e6b770c3c4475830 100644
--- a/services/screentransport/screensourcetrans/BUILD.gn
+++ b/services/screentransport/screensourcetrans/BUILD.gn
@@ -77,8 +77,8 @@ ohos_shared_library("distributed_screen_sourcetrans") {
     "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
diff --git a/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn
index c598119f2fa8eaabdd6809dcb28b1842e66b1542..2adfea40bb0f68a3ba626f163f2af5618740a602 100644
--- a/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn
@@ -63,8 +63,8 @@ ohos_fuzztest("OnBufferAvailableFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn
index 91fabe9f4a243580151dfc5df9dcef74fc10cb8b..9a0c7656d8c1b3d726d6a1e1be48f028dcf7cc50 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn
@@ -63,8 +63,8 @@ ohos_fuzztest("OnBufferAvailableFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn
index 97b04802cdecf365d11162325df4287034c6937b..2ef872ed14728438d07821ec0b74985ae8f1bd26 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn
@@ -55,8 +55,8 @@ ohos_fuzztest("OnErrorFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn
index 44e4bbf6fed04c6ffd6d5d4d8e84043dd850a2f8..34f59f9bb57d33ffe78648c17159d8390199f8a1 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn
@@ -55,8 +55,8 @@ ohos_fuzztest("OnInputBufferAvailableFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn
index 3b5c8d6abef1f05e1ac37be33c51a61ce61f2ccd..bf17b1bf22675b30d617a583eeb660daf480d1ea 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn
@@ -56,8 +56,8 @@ ohos_fuzztest("OnOutputBufferAvailableFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn
index 86a4ee8e8f2d1bb72be46f6971b4e0719872988d..8cd92f0da924b1ee345e7788f53f338b66f4fc12 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn
@@ -55,8 +55,8 @@ ohos_fuzztest("OnOutputFormatChangedFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
index f38e2f47f727ae93c6e0a533a23290906d8c229a..344c0d17d6a900fe26d131e43111f222b37dce96 100644
--- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
@@ -60,7 +60,7 @@ ohos_unittest("SinkProcessorTest") {
 
   external_deps = [
     "c_utils:utils",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "player_framework:media_client",
   ]
 
diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
index 49dc1eddf44449cf04dcd268d33fab9e16d864be..2da1ec2038297509cdc076757ad13a91ef3b4033 100644
--- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
@@ -58,7 +58,7 @@ ohos_unittest("SinkTransTest") {
   external_deps = [
     "c_utils:utils",
     "dsoftbus:softbus_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "player_framework:media_client",
   ]
 
diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
index d30f19fbc683140c8874f0fb8fb7a72a8e9ab3c3..09d19b0d12fcb1f6c60e3fef60af45b31ce1ed1f 100644
--- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
@@ -60,8 +60,8 @@ ohos_unittest("SourceProcessorTest") {
 
   external_deps = [
     "c_utils:utils",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
index 3687d40b70e798c39eceefa4424babf97282fa7d..ee33b0d6fcdd809976a5eb4114284b70e8cab0ec 100644
--- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
@@ -63,8 +63,8 @@ ohos_unittest("SourceTransTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]
diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn
index d383974e10d9c44cfa666b3e45498cd2b58ccd5d..ba80bb96829929a977344d865555a0c0cde92849 100644
--- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn
+++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn
@@ -65,8 +65,8 @@ ohos_unittest("ScreenCallbackTest") {
   external_deps = [
     "c_utils:utils",
     "graphic_2d:libgraphic_utils",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "ipc:ipc_core",
     "player_framework:media_client",
   ]