diff --git a/bundle.json b/bundle.json
index f65abca8cc..c22d7134bd 100644
--- a/bundle.json
+++ b/bundle.json
@@ -51,8 +51,8 @@
           "//foundation/windowmanager/sa_profile:wms_sa_profile",
           "//foundation/windowmanager/dm:libdm",
           "//foundation/windowmanager/dmserver:libdms",
-          "//foundation/windowmanager/extension/extension_connection:libwec",
-          "//foundation/windowmanager/extension/window_extension:libwe",
+          "//foundation/windowmanager/extension/extension_connection:libwindow_extension_client",
+          "//foundation/windowmanager/extension/window_extension:libwindow_exteinsion",
           "//foundation/windowmanager/extension/window_extension:window_extension_module",
           "//foundation/windowmanager/wm:libwm",
           "//foundation/windowmanager/wmserver:libwms",
diff --git a/extension/extension_connection/BUILD.gn b/extension/extension_connection/BUILD.gn
index 7880d70161..18f9979983 100644
--- a/extension/extension_connection/BUILD.gn
+++ b/extension/extension_connection/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-config("libwec_private_config") {
+config("libwindow_extension_client_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
@@ -27,7 +27,7 @@ config("libwec_private_config") {
   ]
 }
 
-ohos_shared_library("libwec") {
+ohos_shared_library("libwindow_extension_client") {
   install_enable = true
 
   sources = [
@@ -37,14 +37,14 @@ ohos_shared_library("libwec") {
     "src/window_extension_client_stub_impl.cpp",
   ]
 
-  configs = [ ":libwec_private_config" ]
+  configs = [ ":libwindow_extension_client_private_config" ]
 
   deps = [
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
     "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
     "//foundation/windowmanager/wm:libwm",
-    "//foundation/windowmanager/extension/window_extension:libwe",
+    "//foundation/windowmanager/extension/window_extension:libwindow_exteinsion",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
   ]
diff --git a/extension/extension_connection/include/window_extension_client_stub_impl.h b/extension/extension_connection/include/window_extension_client_stub_impl.h
index 0761d38835..955b1c79c3 100644
--- a/extension/extension_connection/include/window_extension_client_stub_impl.h
+++ b/extension/extension_connection/include/window_extension_client_stub_impl.h
@@ -16,8 +16,8 @@
 #ifndef WINDOW_EXTENSION_CLIENT_STUB_IMPL_H
 #define WINDOW_EXTENSION_CLIENT_STUB_IMPL_H
 
-#include "window_extension_connection.h"
 #include "window_extension_client_stub.h"
+#include "window_extension_connection.h"
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/extension_connection/include/zidl/window_extension_client_proxy.h b/extension/extension_connection/include/zidl/window_extension_client_proxy.h
index 4bba6c39ab..9c1ef0db37 100644
--- a/extension/extension_connection/include/zidl/window_extension_client_proxy.h
+++ b/extension/extension_connection/include/zidl/window_extension_client_proxy.h
@@ -16,8 +16,8 @@
 #ifndef WINODW_EXTENSION_CLIENT_PROXY
 #define WINODW_EXTENSION_CLIENT_PROXY
 
+#include <iremote_proxy.h>
 #include "window_extension_client_interface.h"
-#include "iremote_proxy.h"
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/extension_connection/include/zidl/window_extension_client_stub.h b/extension/extension_connection/include/zidl/window_extension_client_stub.h
index 7587ed9fc5..c13d075ad5 100644
--- a/extension/extension_connection/include/zidl/window_extension_client_stub.h
+++ b/extension/extension_connection/include/zidl/window_extension_client_stub.h
@@ -16,8 +16,8 @@
 #ifndef WINDOW_EXTENSION_CLIENT_STUB
 #define WINDOW_EXTENSION_CLIENT_STUB
 
+#include <iremote_stub.h>
 #include "window_extension_client_interface.h"
-#include "iremote_stub.h"
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/extension_connection/src/window_extension_client_proxy.cpp b/extension/extension_connection/src/window_extension_client_proxy.cpp
index 70e1cef734..f893b07caf 100644
--- a/extension/extension_connection/src/window_extension_client_proxy.cpp
+++ b/extension/extension_connection/src/window_extension_client_proxy.cpp
@@ -14,8 +14,9 @@
  */
 
 #include "window_extension_client_proxy.h"
+
 #include <ipc_types.h>
-#include "message_option.h"
+#include <message_option.h>
 #include "window_manager_hilog.h"
 
 namespace OHOS {
diff --git a/extension/extension_connection/src/window_extension_client_stub_impl.cpp b/extension/extension_connection/src/window_extension_client_stub_impl.cpp
index 4bba41f584..9010fd1409 100644
--- a/extension/extension_connection/src/window_extension_client_stub_impl.cpp
+++ b/extension/extension_connection/src/window_extension_client_stub_impl.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "window_extension_client_stub_impl.h"
+
 #include "window_manager_hilog.h"
 
 namespace OHOS {
diff --git a/extension/extension_connection/src/window_extension_connection.cpp b/extension/extension_connection/src/window_extension_connection.cpp
index f35b6fbd5b..8ef67de1b4 100644
--- a/extension/extension_connection/src/window_extension_connection.cpp
+++ b/extension/extension_connection/src/window_extension_connection.cpp
@@ -15,14 +15,15 @@
 
 #include "window_extension_connection.h"
 
-#include "ability_connect_callback_stub.h"
-#include "ability_manager_client.h"
-#include "element_name.h"
+#include <ability_connect_callback_stub.h>
+#include <ability_manager_client.h>
+#include <element_name.h>
 #include <iremote_object.h>
+
+#include "window_extension_proxy.h"
+#include "window_extension_client_stub_impl.h"
 #include "window_manager_hilog.h"
 #include "wm_common.h"
-#include "./zidl/window_extension_proxy.h"
-#include "window_extension_client_stub_impl.h"
 
 namespace OHOS {
 namespace Rosen {
@@ -167,8 +168,9 @@ void WindowExtensionConnection::Impl::OnAbilityConnectDone(const AppExecFwk::Ele
         proxy_->ConnectToExtension(clientToken);
         WLOGFI("ConnectToExtension");
     }
-    WLOGFI("end");
+    WLOGFI("call end");
 }
+
 void WindowExtensionConnection::Impl::OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode)
 {
     WLOGFI("end");
diff --git a/extension/window_extension/BUILD.gn b/extension/window_extension/BUILD.gn
index 5d408fdc2d..d9df3d43db 100644
--- a/extension/window_extension/BUILD.gn
+++ b/extension/window_extension/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-config("libwe_private_config") {
+config("libwindow_exteinsion_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
@@ -25,15 +25,15 @@ config("libwe_private_config") {
   ]
 }
 
-config("libwe_public_config") {
+config("libwindow_exteinsion_public_config") {
   include_dirs = [
     "../../interfaces/innerkits/wm",
     "../../utils/include",
   ]
 }
 
-## Build libwe.so
-ohos_shared_library("libwe") {
+## Build libwindow_exteinsion.so
+ohos_shared_library("libwindow_exteinsion") {
   sources = [
     "../extension_connection/src/window_extension_client_proxy.cpp",
     "src/js_window_extension_context.cpp",
@@ -43,9 +43,9 @@ ohos_shared_library("libwe") {
     "src/window_extension.cpp",
   ]
 
-  configs = [ ":libwe_private_config" ]
+  configs = [ ":libwindow_exteinsion_private_config" ]
 
-  public_configs = [ ":libwe_public_config" ]
+  public_configs = [ ":libwindow_exteinsion_public_config" ]
 
   deps = [
     "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
@@ -84,7 +84,7 @@ ohos_shared_library("window_extension_module") {
   configs = [ ":window_extension_module_private_config" ]
 
   deps = [
-    "//foundation/windowmanager/extension/window_extension:libwe",
+    "//foundation/windowmanager/extension/window_extension:libwindow_exteinsion",
   ]
 
   external_deps = [
diff --git a/extension/window_extension/include/js_window_extension.h b/extension/window_extension/include/js_window_extension.h
index 1b78204235..384f3816d5 100644
--- a/extension/window_extension/include/js_window_extension.h
+++ b/extension/window_extension/include/js_window_extension.h
@@ -16,8 +16,9 @@
 #ifndef JS_WINDOW_EXTENSION_H
 #define JS_WINDOW_EXTENSION_H
 
-#include "js_runtime.h"
-#include "js_runtime_utils.h"
+#include <js_runtime.h>
+#include <js_runtime_utils.h>
+
 #include "js_window_extension_context.h"
 #include "window.h"
 #include "window_extension.h"
diff --git a/extension/window_extension/include/js_window_extension_context.h b/extension/window_extension/include/js_window_extension_context.h
index d57a4a63db..3f39858c45 100644
--- a/extension/window_extension/include/js_window_extension_context.h
+++ b/extension/window_extension/include/js_window_extension_context.h
@@ -16,10 +16,10 @@
 #ifndef JS_WINDOW_EXTENSION_CONTEXT_H
 #define JS_WINDOW_EXTENSION_CONTEXT_H
 
-#include "ability_connect_callback.h"
-#include "event_handler.h"
-#include "extension_context.h"
-#include "native_engine/native_engine.h"
+#include <ability_connect_callback.h>
+#include <event_handler.h>
+#include <extension_context.h>
+#include <native_engine/native_engine.h>
 
 #include "window.h"
 #include "window_extension_context.h"
diff --git a/extension/window_extension/include/window_extension.h b/extension/window_extension/include/window_extension.h
index 65a45e02da..733108d30a 100644
--- a/extension/window_extension/include/window_extension.h
+++ b/extension/window_extension/include/window_extension.h
@@ -16,9 +16,8 @@
 #ifndef WINDOW_EXTENSION_H
 #define WINDOW_EXTENSION_H
 
-#include "extension_base.h"
-
-#include "service_extension.h"
+#include <extension_base.h>
+#include <service_extension.h>
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/window_extension/include/window_extension_context.h b/extension/window_extension/include/window_extension_context.h
index 66b00e7f66..de52f89915 100644
--- a/extension/window_extension/include/window_extension_context.h
+++ b/extension/window_extension/include/window_extension_context.h
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "extension_context.h"
+#include <extension_context.h>
 
 #ifndef WINDOW_EXTENSION_CONTEXT_H
 #define WINDOW_EXTENSION_CONTEXT_H
diff --git a/extension/window_extension/include/window_extension_module_loader.h b/extension/window_extension/include/window_extension_module_loader.h
index f638202032..d6a553712c 100644
--- a/extension/window_extension/include/window_extension_module_loader.h
+++ b/extension/window_extension/include/window_extension_module_loader.h
@@ -16,7 +16,7 @@
 #ifndef WINDOW_EXTENSION_MODULE_LOADER_H
 #define WINDOW_EXTENSION_MODULE_LOADER_H
 
-#include "extension_module_loader.h"
+#include <extension_module_loader.h>
 
 namespace OHOS::Rosen {
 class WindowExtensionModuleLoader : public AbilityRuntime::ExtensionModuleLoader,
diff --git a/extension/window_extension/include/window_extension_stub_impl.h b/extension/window_extension/include/window_extension_stub_impl.h
index cd140625ff..dc9851ad07 100644
--- a/extension/window_extension/include/window_extension_stub_impl.h
+++ b/extension/window_extension/include/window_extension_stub_impl.h
@@ -16,13 +16,12 @@
 #ifndef WINDOW_EXTENSION_STUB_IMPL_H
 #define WINDOW_EXTENSION_STUB_IMPL_H
 
-#include "wm_common.h"
-
 #include <string>
 
 #include "window.h"
 #include "window_extension_stub.h"
 #include "window_extension_client_interface.h"
+#include "wm_common.h"
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/window_extension/include/zidl/window_extension_interface.h b/extension/window_extension/include/zidl/window_extension_interface.h
index fcb0e657d6..d206cf392f 100644
--- a/extension/window_extension/include/zidl/window_extension_interface.h
+++ b/extension/window_extension/include/zidl/window_extension_interface.h
@@ -16,11 +16,12 @@
 #ifndef WINDOW_EXTENSION_INTERFACE_H
 #define WINDOW_EXTENSION_INTERFACE_H
 
-#include "iremote_broker.h"
-#include "refbase.h"
-#include "wm_common.h"
+#include <iremote_broker.h>
+#include <refbase.h>
+
 #include "window.h"
 #include "window_extension_client_interface.h"
+#include "wm_common.h"
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/window_extension/include/zidl/window_extension_proxy.h b/extension/window_extension/include/zidl/window_extension_proxy.h
index f46fed9013..b891e74a41 100644
--- a/extension/window_extension/include/zidl/window_extension_proxy.h
+++ b/extension/window_extension/include/zidl/window_extension_proxy.h
@@ -16,8 +16,8 @@
 #ifndef WINDOW_EXTENSION_PROXY_H
 #define WINDOW_EXTENSION_PROXY_H
 
+#include <iremote_proxy.h>
 #include "window_extension_interface.h"
-#include "iremote_proxy.h"
 
 namespace OHOS {
 namespace Rosen {
diff --git a/extension/window_extension/include/zidl/window_extension_stub.h b/extension/window_extension/include/zidl/window_extension_stub.h
index 4201582c3e..6e29186d13 100644
--- a/extension/window_extension/include/zidl/window_extension_stub.h
+++ b/extension/window_extension/include/zidl/window_extension_stub.h
@@ -16,11 +16,10 @@
 #ifndef WINDOW_EXTENSION_STUB_H
 #define WINDOW_EXTENSION_STUB_H
 
+#include <iremote_object.h>
+#include <iremote_stub.h>
 #include "window_extension_interface.h"
 
-#include "iremote_object.h"
-#include "iremote_stub.h"
-
 namespace OHOS {
 namespace Rosen {
 class WindowExtensionStub : public IRemoteStub<IWindowExtension> {
diff --git a/extension/window_extension/src/js_window_extension.cpp b/extension/window_extension/src/js_window_extension.cpp
index 5e9390a5aa..aa0c399a86 100644
--- a/extension/window_extension/src/js_window_extension.cpp
+++ b/extension/window_extension/src/js_window_extension.cpp
@@ -15,11 +15,11 @@
 
 #include "js_window_extension.h"
 
-#include "native_engine/native_reference.h"
-#include "native_engine/native_value.h"
-#include "js_extension_context.h"
-#include "js_window_extension_context.h"
+#include <native_engine/native_reference.h>
+#include <native_engine/native_value.h>
+#include <js_extension_context.h>
 
+#include "js_window_extension_context.h"
 #include "window_extension_connection.h"
 #include "window_manager_hilog.h"
 #include "wm_common.h"
diff --git a/extension/window_extension/src/js_window_extension_context.cpp b/extension/window_extension/src/js_window_extension_context.cpp
index 63bd555bcd..f088a73e00 100644
--- a/extension/window_extension/src/js_window_extension_context.cpp
+++ b/extension/window_extension/src/js_window_extension_context.cpp
@@ -15,8 +15,8 @@
 
 #include "js_window_extension_context.h"
 
-#include "js_runtime_utils.h"
-#include "js_extension_context.h"
+#include <js_runtime_utils.h>
+#include <js_extension_context.h>
 
 #include "service_extension_context.h"
 #include "window_manager_hilog.h"
diff --git a/extension/window_extension/src/window_extension_module_loader.cpp b/extension/window_extension/src/window_extension_module_loader.cpp
index 382f261a99..4ec785c1ca 100644
--- a/extension/window_extension/src/window_extension_module_loader.cpp
+++ b/extension/window_extension/src/window_extension_module_loader.cpp
@@ -15,8 +15,8 @@
 
 #include "window_extension_module_loader.h"
 
-#include "ability_connection.h"
-#include "native_engine/native_engine.h"
+#include <ability_connection.h>
+#include <native_engine/native_engine.h>
 
 #include "window_extension.h"
 #include "window_manager_hilog.h"
diff --git a/extension/window_extension/src/window_extension_proxy.cpp b/extension/window_extension/src/window_extension_proxy.cpp
index f4c5a24d7b..830843e253 100644
--- a/extension/window_extension/src/window_extension_proxy.cpp
+++ b/extension/window_extension/src/window_extension_proxy.cpp
@@ -14,8 +14,10 @@
  */
 
 #include "window_extension_proxy.h"
+
 #include <ipc_types.h>
-#include "message_option.h"
+#include <message_option.h>
+
 #include "window_manager_hilog.h"
 
 namespace OHOS {
diff --git a/extension/window_extension/src/window_extension_stub_impl.cpp b/extension/window_extension/src/window_extension_stub_impl.cpp
index 40d3e7dfa0..01d7415b80 100644
--- a/extension/window_extension/src/window_extension_stub_impl.cpp
+++ b/extension/window_extension/src/window_extension_stub_impl.cpp
@@ -15,8 +15,6 @@
 
 #include "window_extension_stub_impl.h"
 
-#include<unistd.h> //TODO
-
 #include "js_window_extension.h"
 #include "window_extension_connection.h"
 #include "window_manager_hilog.h"
diff --git a/interfaces/kits/napi/window_extension/window_extension_module.cpp b/interfaces/kits/napi/window_extension/window_extension_module.cpp
index ca5f383947..71a23c4c86 100644
--- a/interfaces/kits/napi/window_extension/window_extension_module.cpp
+++ b/interfaces/kits/napi/window_extension/window_extension_module.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "native_engine/native_engine.h"
+#include <native_engine/native_engine.h>
 
 extern const char _binary_window_extension_js_start[];
 extern const char _binary_window_extension_js_end[];
diff --git a/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp b/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp
index 1a02a511cc..465bf04c84 100644
--- a/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp
+++ b/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "native_engine/native_engine.h"
+#include <native_engine/native_engine.h>
 
 extern const char _binary_window_extension_context_js_start[];
 extern const char _binary_window_extension_context_js_end[];