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 ef8066f114057d693394758724d4d5d711d4da50..390eabea8fc1b6a0b6ab1069c6b93264ba26d70d 100644
--- a/screenhandler/test/unittest/screenhandler/BUILD.gn
+++ b/screenhandler/test/unittest/screenhandler/BUILD.gn
@@ -50,7 +50,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 8b0f7e41801185da2ceed2a299e96df69ca9007e..ec46cbbba4948355f656f0d5429760e7904b46bb 100644
--- a/services/common/test/unittest/decision_center/BUILD.gn
+++ b/services/common/test/unittest/decision_center/BUILD.gn
@@ -49,8 +49,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 865b540242df3337012e9e7bd2f1c764b032eab7..4af2aaa5c2c2bf019e5de3743f6af12559828039 100644
--- a/services/common/test/unittest/imageJpeg/BUILD.gn
+++ b/services/common/test/unittest/imageJpeg/BUILD.gn
@@ -48,7 +48,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 b1be336e405619d60c7c8417c81b852b5a5edcb7..9b85c343777e5054a1ff7318f2bb5959590cf62c 100644
--- a/services/screenclient/test/unittest/BUILD.gn
+++ b/services/screenclient/test/unittest/BUILD.gn
@@ -57,7 +57,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 184f3d63c2c98d11ee725e9906b0bab5a2e1527b..3ab614e0580a0afdd2a5b95c38211d3bf3c68749 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -88,7 +88,7 @@ ohos_shared_library("distributed_screen_sink") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_2d:libgraphic_utils",
     "graphic_2d:librender_service_client",
-    "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 8554628bb72dca49d1e79fa35bf1d2812c748ede..435882d9db465935528b284bed09c545c991bd1f 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -95,7 +95,7 @@ ohos_shared_library("distributed_screen_source") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_2d:libcomposer",
     "graphic_2d:librender_service_client",
-    "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 8020d0953f16f4ad81af0b9bdc882898a253e69e..740c5950677b56bd6c66dee4e9953db23195ae49 100644
--- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
+++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
@@ -63,7 +63,7 @@ ohos_fuzztest("OnChangeFuzzTest") {
     "c_utils:utils",
     "distributed_hardware_fwk:distributed_av_sender",
     "graphic_2d:librender_service_client",
-    "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 6aca8b9295a8b174ed1d7253bc68dbf00d7b91ad..e9eb4333b5029dc7cd2b05bdc90c4c7942ba40db 100644
--- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
+++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
@@ -81,7 +81,7 @@ ohos_unittest("DscreenRegionMgrTest") {
     "graphic_2d:libcomposer",
     "graphic_2d:libgraphic_utils",
     "graphic_2d:librender_service_client",
-    "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 cebed84f5e8403d9208af9c58f772d84b7cefbd3..a477035b445d53ef7a8a479f50eb7a0d19d06ea2 100644
--- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
+++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
@@ -89,8 +89,8 @@ ohos_unittest("DscreenMgrTest") {
     "dsoftbus:softbus_client",
     "graphic_2d:libcomposer",
     "graphic_2d:librender_service_client",
-    "graphic_2d:surface",
-    "graphic_2d:sync_fence",
+    "graphic_surface:surface",
+    "graphic_surface:sync_fence",
     "hdf_core:libhdi",
     "hicollie:libhicollie",
     "player_framework:media_client",
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 774970b38a21cb1faaa7fd0a54b9ef6ef3022130..4c1eea6aeb79f5d78f3149e11d735d339defc8ad 100644
--- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
@@ -65,7 +65,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 f0d19269c4624912031c9b3d66042408d8e69ac2..4883b5e6f2b7061e9ddec5b53a229ac188ef688e 100644
--- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
@@ -63,7 +63,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 731199bbf68e6f34eced13305c43a9e18b7b7378..edc9a1b969a13fc10d2d95f3d21431a9153f156c 100644
--- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
@@ -65,8 +65,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 06bfd4056c73a78391fca2034be9b0177ffe3306..4816493bfecc7872f2645886d863069669c5f033 100644
--- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
@@ -72,8 +72,8 @@ ohos_unittest("SourceTransTest") {
     "c_utils:utils",
     "dsoftbus:softbus_client",
     "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 e508e8019f926432eba60474e9e60f57e1cd1cf5..eec6b6b2147191bea3609b0064e9a6a806808960 100644
--- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn
+++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn
@@ -70,8 +70,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",
   ]