diff --git a/ability_base/BUILD.gn b/ability_base/BUILD.gn
index aec0edfd65..7e141cc061 100644
--- a/ability_base/BUILD.gn
+++ b/ability_base/BUILD.gn
@@ -49,7 +49,7 @@ ohos_shared_library("base") {
   public_configs = [ ":base_public_config" ]
   external_deps = [ "utils_base:utils" ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_base"
 }
 
@@ -85,7 +85,7 @@ ohos_shared_library("configuration") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_base"
 }
 
@@ -111,7 +111,7 @@ ohos_shared_library("zuri") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_base"
 }
 
@@ -171,7 +171,7 @@ ohos_shared_library("want") {
 
   configs = [ ":want_config" ]
   public_configs = [ ":want_public_config" ]
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_base"
 }
 
diff --git a/form_runtime/BUILD.gn b/form_runtime/BUILD.gn
index 9d1e0c410e..e8a876f8a7 100644
--- a/form_runtime/BUILD.gn
+++ b/form_runtime/BUILD.gn
@@ -122,7 +122,7 @@ ohos_shared_library("libfms") {
     external_deps += [ "power_manager_native:powermgr_client" ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -172,7 +172,7 @@ ohos_shared_library("fmskit_native") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -237,7 +237,7 @@ ohos_shared_library("form_manager") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
diff --git a/form_runtime/frameworks/js/napi/BUILD.gn b/form_runtime/frameworks/js/napi/BUILD.gn
index 1c7b0b97d8..2381f6591b 100644
--- a/form_runtime/frameworks/js/napi/BUILD.gn
+++ b/form_runtime/frameworks/js/napi/BUILD.gn
@@ -40,7 +40,7 @@ ohos_shared_library("formbindingdata_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -76,7 +76,7 @@ ohos_shared_library("formextension_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -112,7 +112,7 @@ ohos_shared_library("formextensioncontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -142,7 +142,7 @@ ohos_shared_library("forminfo_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -176,7 +176,7 @@ ohos_shared_library("formhost_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -209,7 +209,7 @@ ohos_shared_library("formmanager") {
 
   relative_install_dir = "module/ability"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -244,7 +244,7 @@ ohos_shared_library("formprovider_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -273,7 +273,7 @@ ohos_shared_library("formutil_napi") {
     "napi:ace_napi",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
 
@@ -300,6 +300,6 @@ ohos_shared_library("formerror_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "form_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/ability/BUILD.gn b/frameworks/js/napi/aafwk/ability/BUILD.gn
index d74b3879e5..3af2098021 100644
--- a/frameworks/js/napi/aafwk/ability/BUILD.gn
+++ b/frameworks/js/napi/aafwk/ability/BUILD.gn
@@ -44,6 +44,6 @@ ohos_shared_library("ability_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/abilityManager/BUILD.gn b/frameworks/js/napi/aafwk/abilityManager/BUILD.gn
index 41055fd1a3..05a57087e7 100644
--- a/frameworks/js/napi/aafwk/abilityManager/BUILD.gn
+++ b/frameworks/js/napi/aafwk/abilityManager/BUILD.gn
@@ -64,6 +64,6 @@ ohos_shared_library("abilitymanager") {
 
   relative_install_dir = "module/app"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/ability_constant/BUILD.gn b/frameworks/js/napi/aafwk/ability_constant/BUILD.gn
index e1d91ea1d4..c5b8886583 100644
--- a/frameworks/js/napi/aafwk/ability_constant/BUILD.gn
+++ b/frameworks/js/napi/aafwk/ability_constant/BUILD.gn
@@ -28,6 +28,6 @@ ohos_shared_library("abilityconstant_napi") {
   ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/ability_context/BUILD.gn b/frameworks/js/napi/aafwk/ability_context/BUILD.gn
index 3e37d56d9a..c8b3631107 100644
--- a/frameworks/js/napi/aafwk/ability_context/BUILD.gn
+++ b/frameworks/js/napi/aafwk/ability_context/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("abilitycontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/ability_manager/BUILD.gn b/frameworks/js/napi/aafwk/ability_manager/BUILD.gn
index 7d3ada3ca5..07632af703 100644
--- a/frameworks/js/napi/aafwk/ability_manager/BUILD.gn
+++ b/frameworks/js/napi/aafwk/ability_manager/BUILD.gn
@@ -55,6 +55,6 @@ ohos_shared_library("abilitymanager_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/ability_delegator/BUILD.gn b/frameworks/js/napi/aafwk/app/ability_delegator/BUILD.gn
index 5bcfd5062f..12acb2cd01 100644
--- a/frameworks/js/napi/aafwk/app/ability_delegator/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/ability_delegator/BUILD.gn
@@ -58,6 +58,6 @@ ohos_shared_library("abilitydelegatorregistry") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/ability_stage/BUILD.gn b/frameworks/js/napi/aafwk/app/ability_stage/BUILD.gn
index cbf90366e8..e0c6800b0c 100644
--- a/frameworks/js/napi/aafwk/app/ability_stage/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/ability_stage/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("abilitystage_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/ability_stage_context/BUILD.gn b/frameworks/js/napi/aafwk/app/ability_stage_context/BUILD.gn
index 79df34c919..63e6dadab6 100644
--- a/frameworks/js/napi/aafwk/app/ability_stage_context/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/ability_stage_context/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("abilitystagecontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/appMgr/BUILD.gn b/frameworks/js/napi/aafwk/app/appMgr/BUILD.gn
index 1a58e69d29..aeeda01f2b 100644
--- a/frameworks/js/napi/aafwk/app/appMgr/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/appMgr/BUILD.gn
@@ -49,6 +49,6 @@ ohos_shared_library("napi_app_mgr") {
   }
 
   relative_install_dir = "module"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/app_manager/BUILD.gn b/frameworks/js/napi/aafwk/app/app_manager/BUILD.gn
index 66bf1e3a6b..97eb37410f 100644
--- a/frameworks/js/napi/aafwk/app/app_manager/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/app_manager/BUILD.gn
@@ -52,6 +52,6 @@ ohos_shared_library("appmanager_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/application_context/BUILD.gn b/frameworks/js/napi/aafwk/app/application_context/BUILD.gn
index 0fecce64f3..f37d5cd9de 100644
--- a/frameworks/js/napi/aafwk/app/application_context/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/application_context/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("applicationcontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/context/BUILD.gn b/frameworks/js/napi/aafwk/app/context/BUILD.gn
index 8de532fcce..7cbfd8b895 100644
--- a/frameworks/js/napi/aafwk/app/context/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/context/BUILD.gn
@@ -44,6 +44,6 @@ ohos_shared_library("context_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/error_manager/BUILD.gn b/frameworks/js/napi/aafwk/app/error_manager/BUILD.gn
index eaa21a8935..17eb8879b0 100644
--- a/frameworks/js/napi/aafwk/app/error_manager/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/error_manager/BUILD.gn
@@ -43,6 +43,6 @@ ohos_shared_library("errormanager_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/app/test_runner/BUILD.gn b/frameworks/js/napi/aafwk/app/test_runner/BUILD.gn
index 7f6d90b893..358ed71410 100644
--- a/frameworks/js/napi/aafwk/app/test_runner/BUILD.gn
+++ b/frameworks/js/napi/aafwk/app/test_runner/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("testrunner_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/callee/BUILD.gn b/frameworks/js/napi/aafwk/callee/BUILD.gn
index 7d243ca01d..c9ce38c6bc 100644
--- a/frameworks/js/napi/aafwk/callee/BUILD.gn
+++ b/frameworks/js/napi/aafwk/callee/BUILD.gn
@@ -44,6 +44,6 @@ ohos_shared_library("callee_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/caller/BUILD.gn b/frameworks/js/napi/aafwk/caller/BUILD.gn
index 6636f4787e..907b0e52ac 100644
--- a/frameworks/js/napi/aafwk/caller/BUILD.gn
+++ b/frameworks/js/napi/aafwk/caller/BUILD.gn
@@ -44,6 +44,6 @@ ohos_shared_library("caller_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/configuration_constant/BUILD.gn b/frameworks/js/napi/aafwk/configuration_constant/BUILD.gn
index d063546d59..06fd1ba4ce 100644
--- a/frameworks/js/napi/aafwk/configuration_constant/BUILD.gn
+++ b/frameworks/js/napi/aafwk/configuration_constant/BUILD.gn
@@ -27,6 +27,6 @@ ohos_shared_library("configurationconstant_napi") {
   ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/dataUriUtils/BUILD.gn b/frameworks/js/napi/aafwk/dataUriUtils/BUILD.gn
index 7c495e52aa..5795331fa1 100644
--- a/frameworks/js/napi/aafwk/dataUriUtils/BUILD.gn
+++ b/frameworks/js/napi/aafwk/dataUriUtils/BUILD.gn
@@ -48,6 +48,6 @@ ohos_shared_library("datauriutils") {
 
   relative_install_dir = "module/ability"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/extensioncontext/BUILD.gn b/frameworks/js/napi/aafwk/extensioncontext/BUILD.gn
index bf2bc4159f..e70ff8eb75 100644
--- a/frameworks/js/napi/aafwk/extensioncontext/BUILD.gn
+++ b/frameworks/js/napi/aafwk/extensioncontext/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("extensioncontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/featureAbility/BUILD.gn b/frameworks/js/napi/aafwk/featureAbility/BUILD.gn
index a80b1837a5..36031953fe 100644
--- a/frameworks/js/napi/aafwk/featureAbility/BUILD.gn
+++ b/frameworks/js/napi/aafwk/featureAbility/BUILD.gn
@@ -70,6 +70,6 @@ ohos_shared_library("featureability") {
 
   relative_install_dir = "module/ability"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/feature_ability/BUILD.gn b/frameworks/js/napi/aafwk/feature_ability/BUILD.gn
index 6801561265..738ab7d1c4 100644
--- a/frameworks/js/napi/aafwk/feature_ability/BUILD.gn
+++ b/frameworks/js/napi/aafwk/feature_ability/BUILD.gn
@@ -41,6 +41,6 @@ ohos_shared_library("featureability_napi") {
 
   relative_install_dir = "module"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/inner/napi_common/BUILD.gn b/frameworks/js/napi/aafwk/inner/napi_common/BUILD.gn
index 3ea960c33f..0b37b3f693 100644
--- a/frameworks/js/napi/aafwk/inner/napi_common/BUILD.gn
+++ b/frameworks/js/napi/aafwk/inner/napi_common/BUILD.gn
@@ -62,6 +62,6 @@ ohos_shared_library("napi_common") {
     defines = [ "SUPPORT_GRAPHICS" ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/mission_manager/BUILD.gn b/frameworks/js/napi/aafwk/mission_manager/BUILD.gn
index cb8be22db8..9d52d07469 100644
--- a/frameworks/js/napi/aafwk/mission_manager/BUILD.gn
+++ b/frameworks/js/napi/aafwk/mission_manager/BUILD.gn
@@ -56,7 +56,7 @@ ohos_shared_library("missionmanager_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -98,6 +98,6 @@ ohos_shared_library("distributedmissionmanager") {
 
   relative_install_dir = "module"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/particleAbility/BUILD.gn b/frameworks/js/napi/aafwk/particleAbility/BUILD.gn
index ed4b805fb8..b5b2cafbca 100644
--- a/frameworks/js/napi/aafwk/particleAbility/BUILD.gn
+++ b/frameworks/js/napi/aafwk/particleAbility/BUILD.gn
@@ -67,6 +67,6 @@ ohos_shared_library("particleability") {
 
   relative_install_dir = "module/ability"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/service_extension_ability/BUILD.gn b/frameworks/js/napi/aafwk/service_extension_ability/BUILD.gn
index f4d8782c39..8192f2d258 100644
--- a/frameworks/js/napi/aafwk/service_extension_ability/BUILD.gn
+++ b/frameworks/js/napi/aafwk/service_extension_ability/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("serviceextensionability_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/service_extension_context/BUILD.gn b/frameworks/js/napi/aafwk/service_extension_context/BUILD.gn
index adb3c0de79..ee55408936 100644
--- a/frameworks/js/napi/aafwk/service_extension_context/BUILD.gn
+++ b/frameworks/js/napi/aafwk/service_extension_context/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("serviceextensioncontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/static_subscriber_extension/BUILD.gn b/frameworks/js/napi/aafwk/static_subscriber_extension/BUILD.gn
index 6345c3745e..9d34f3fe7e 100644
--- a/frameworks/js/napi/aafwk/static_subscriber_extension/BUILD.gn
+++ b/frameworks/js/napi/aafwk/static_subscriber_extension/BUILD.gn
@@ -47,6 +47,6 @@ ohos_shared_library("staticsubscriberextensionability_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/static_subscriber_extension_context/BUILD.gn b/frameworks/js/napi/aafwk/static_subscriber_extension_context/BUILD.gn
index a22f840fda..e3a7037663 100644
--- a/frameworks/js/napi/aafwk/static_subscriber_extension_context/BUILD.gn
+++ b/frameworks/js/napi/aafwk/static_subscriber_extension_context/BUILD.gn
@@ -47,6 +47,6 @@ ohos_shared_library("staticsubscriberextensioncontext_napi") {
   external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/uri_permission/BUILD.gn b/frameworks/js/napi/aafwk/uri_permission/BUILD.gn
index 118dad70f7..597f3dd342 100644
--- a/frameworks/js/napi/aafwk/uri_permission/BUILD.gn
+++ b/frameworks/js/napi/aafwk/uri_permission/BUILD.gn
@@ -47,6 +47,6 @@ ohos_shared_library("uripermissionmanager_napi") {
 
   relative_install_dir = "module/application"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/wantConstant/BUILD.gn b/frameworks/js/napi/aafwk/wantConstant/BUILD.gn
index a76e09995b..5fc5d03818 100644
--- a/frameworks/js/napi/aafwk/wantConstant/BUILD.gn
+++ b/frameworks/js/napi/aafwk/wantConstant/BUILD.gn
@@ -45,6 +45,6 @@ ohos_shared_library("wantconstant") {
 
   relative_install_dir = "module/ability"
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/js/napi/aafwk/wantagent/BUILD.gn b/frameworks/js/napi/aafwk/wantagent/BUILD.gn
index 47d1735c26..e51a033a59 100644
--- a/frameworks/js/napi/aafwk/wantagent/BUILD.gn
+++ b/frameworks/js/napi/aafwk/wantagent/BUILD.gn
@@ -51,6 +51,6 @@ ohos_shared_library("wantagent") {
   ]
 
   relative_install_dir = "module"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/kits/ability/ability_runtime/BUILD.gn b/frameworks/kits/ability/ability_runtime/BUILD.gn
index 6ed2e49dc3..bf900cdaed 100644
--- a/frameworks/kits/ability/ability_runtime/BUILD.gn
+++ b/frameworks/kits/ability/ability_runtime/BUILD.gn
@@ -66,6 +66,6 @@ ohos_shared_library("ability_context_native") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/kits/ability/native/BUILD.gn b/frameworks/kits/ability/native/BUILD.gn
index bffc5375d3..c5c8892479 100644
--- a/frameworks/kits/ability/native/BUILD.gn
+++ b/frameworks/kits/ability/native/BUILD.gn
@@ -105,7 +105,7 @@ ohos_shared_library("static_subscriber_ipc") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -292,7 +292,7 @@ ohos_shared_library("abilitykit_native") {
       "${windowmanager_path}/wm:libwm",
     ]
   }
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -315,6 +315,6 @@ ohos_shared_library("service_extension_module") {
   ]
 
   relative_install_dir = "extensionability/"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/kits/appkit/BUILD.gn b/frameworks/kits/appkit/BUILD.gn
index ab08d879a9..c179a6758d 100644
--- a/frameworks/kits/appkit/BUILD.gn
+++ b/frameworks/kits/appkit/BUILD.gn
@@ -156,6 +156,8 @@ ohos_shared_library("appkit_native") {
     ]
     public_deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ]
   }
+
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -216,6 +218,8 @@ ohos_shared_library("app_context") {
     ]
     public_deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ]
   }
+
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -280,6 +284,8 @@ ohos_shared_library("app_context_utils") {
     ]
     public_deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ]
   }
+
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -342,5 +348,7 @@ ohos_shared_library("appkit_delegator") {
   if (ability_runtime_graphics) {
     deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
   }
+
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/kits/runtime/test/BUILD.gn b/frameworks/kits/runtime/test/BUILD.gn
index d86d6a4c01..2f44abbe8d 100644
--- a/frameworks/kits/runtime/test/BUILD.gn
+++ b/frameworks/kits/runtime/test/BUILD.gn
@@ -18,6 +18,6 @@ ohos_executable("runtime_test") {
 
   external_deps = [ "ability_runtime:runtime" ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/frameworks/kits/wantagent/BUILD.gn b/frameworks/kits/wantagent/BUILD.gn
index 1c6bd8d8bb..70df289931 100644
--- a/frameworks/kits/wantagent/BUILD.gn
+++ b/frameworks/kits/wantagent/BUILD.gn
@@ -80,6 +80,6 @@ ohos_shared_library("wantagent_innerkits") {
     external_deps += [ "multimedia_image_standard:image_native" ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/idl/BUILD.gn b/idl/BUILD.gn
index 37571c92c1..3bf94d896c 100644
--- a/idl/BUILD.gn
+++ b/idl/BUILD.gn
@@ -82,5 +82,5 @@ ohos_executable("idl") {
   deps = [ "//third_party/bounds_checking_function:libsec_static" ]
 
   part_name = "idl"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
 }
diff --git a/idl/test/native/BUILD.gn b/idl/test/native/BUILD.gn
index 26f5e95b77..9784c54147 100644
--- a/idl/test/native/BUILD.gn
+++ b/idl/test/native/BUILD.gn
@@ -40,7 +40,7 @@ ohos_executable("idl_server_test") {
     "samgr_standard:samgr_proxy",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "idl"
 }
 
@@ -61,6 +61,6 @@ ohos_executable("idl_client_test") {
     "samgr_standard:samgr_proxy",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "idl"
 }
diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn
index 0fa9069359..591b532278 100644
--- a/interfaces/inner_api/ability_manager/BUILD.gn
+++ b/interfaces/inner_api/ability_manager/BUILD.gn
@@ -120,6 +120,6 @@ ohos_shared_library("ability_manager") {
     external_deps += [ "multimedia_image_standard:image_native" ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn
index 6b7cad86ae..54ac6e3c1b 100644
--- a/interfaces/inner_api/app_manager/BUILD.gn
+++ b/interfaces/inner_api/app_manager/BUILD.gn
@@ -102,6 +102,6 @@ ohos_shared_library("app_manager") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/interfaces/inner_api/dataobs_manager/BUILD.gn b/interfaces/inner_api/dataobs_manager/BUILD.gn
index 754bba2325..9ea010fc21 100644
--- a/interfaces/inner_api/dataobs_manager/BUILD.gn
+++ b/interfaces/inner_api/dataobs_manager/BUILD.gn
@@ -54,6 +54,6 @@ ohos_shared_library("dataobs_manager") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/interfaces/inner_api/napi_base_context/BUILD.gn b/interfaces/inner_api/napi_base_context/BUILD.gn
index 05a3d810a6..22b1b31d5a 100644
--- a/interfaces/inner_api/napi_base_context/BUILD.gn
+++ b/interfaces/inner_api/napi_base_context/BUILD.gn
@@ -27,6 +27,6 @@ ohos_shared_library("napi_base_context") {
 
   external_deps = [ "napi:ace_napi" ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn
index d01357ec2e..a862a5c7ad 100644
--- a/interfaces/inner_api/runtime/BUILD.gn
+++ b/interfaces/inner_api/runtime/BUILD.gn
@@ -88,6 +88,6 @@ ohos_shared_library("runtime") {
     ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/interfaces/inner_api/uri_permission/BUILD.gn b/interfaces/inner_api/uri_permission/BUILD.gn
index ff903db7af..860dd6c558 100644
--- a/interfaces/inner_api/uri_permission/BUILD.gn
+++ b/interfaces/inner_api/uri_permission/BUILD.gn
@@ -47,6 +47,6 @@ ohos_shared_library("uri_permission_mgr") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn
index e0e08d6e66..a4132bfd97 100644
--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@@ -133,13 +133,13 @@ ohos_shared_library("abilityms") {
     ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
 ohos_prebuilt_etc("ams_service_config.json") {
   source = "resource/ams_service_config.json"
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn
index 3194495b53..435925cc17 100644
--- a/services/appmgr/BUILD.gn
+++ b/services/appmgr/BUILD.gn
@@ -100,6 +100,6 @@ ohos_shared_library("libappms") {
     external_deps += [ "i18n:intl_util" ]
   }
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn
index a5749f54d3..240dc26160 100644
--- a/services/common/BUILD.gn
+++ b/services/common/BUILD.gn
@@ -45,7 +45,7 @@ ohos_shared_library("perm_verification") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
@@ -56,6 +56,6 @@ ohos_shared_library("event_report") {
 
   external_deps = [ "hisysevent_native:libhisysevent" ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/services/dataobsmgr/BUILD.gn b/services/dataobsmgr/BUILD.gn
index b03c916bfd..9c44b590a9 100644
--- a/services/dataobsmgr/BUILD.gn
+++ b/services/dataobsmgr/BUILD.gn
@@ -52,6 +52,6 @@ ohos_shared_library("dataobsms") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/services/test/moduletest/module_test_dump_util/BUILD.gn b/services/test/moduletest/module_test_dump_util/BUILD.gn
index cf5ee4ba33..b6e4e6d648 100644
--- a/services/test/moduletest/module_test_dump_util/BUILD.gn
+++ b/services/test/moduletest/module_test_dump_util/BUILD.gn
@@ -34,6 +34,6 @@ ohos_shared_library("module_test_dump_util_lib") {
 
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/services/uripermmgr/BUILD.gn b/services/uripermmgr/BUILD.gn
index 78412330d2..ba590bfa23 100644
--- a/services/uripermmgr/BUILD.gn
+++ b/services/uripermmgr/BUILD.gn
@@ -48,6 +48,6 @@ ohos_shared_library("libupms") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
diff --git a/test/systemtest/common/ams/tool/BUILD.gn b/test/systemtest/common/ams/tool/BUILD.gn
index abf1e80cd1..59297be44a 100644
--- a/test/systemtest/common/ams/tool/BUILD.gn
+++ b/test/systemtest/common/ams/tool/BUILD.gn
@@ -60,7 +60,7 @@ ohos_shared_library("system_test_ability_util_lib") {
     "ipc:ipc_core",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_runtime"
 }
 
diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn
index 828d9493a3..a550a1188a 100644
--- a/tools/aa/BUILD.gn
+++ b/tools/aa/BUILD.gn
@@ -68,7 +68,7 @@ ohos_source_set("tools_aa_source_set") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_tools"
 }
 
@@ -93,7 +93,7 @@ ohos_executable("aa") {
 
   install_enable = true
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_tools"
 }
 
diff --git a/tools/fm/BUILD.gn b/tools/fm/BUILD.gn
index f652225da9..354053d132 100644
--- a/tools/fm/BUILD.gn
+++ b/tools/fm/BUILD.gn
@@ -60,7 +60,7 @@ ohos_source_set("tools_fm_source_set") {
     "utils_base:utils",
   ]
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_tools"
 }
 
@@ -69,7 +69,7 @@ ohos_executable("fm") {
 
   install_enable = true
 
-  subsystem_name = "aafwk"
+  subsystem_name = "ability"
   part_name = "ability_tools"
 }