diff --git a/ability_runtime.gni b/ability_runtime.gni
index be47289661..896d0d2f58 100644
--- a/ability_runtime.gni
+++ b/ability_runtime.gni
@@ -85,7 +85,8 @@ declare_args() {
   ability_fault_and_exit_test = false
   ability_command_for_test = false
   ability_runtime_feature_coverage = false
-  key_auto_fill_ability = "com.ohos.passwordbox/entry/AutoFillAbility"
+  ability_runtime_auto_fill_ability =
+      "com.ohos.passwordbox/entry/AutoFillAbility"
 
   if (!defined(global_parts_info) ||
       defined(global_parts_info.account_os_account)) {
diff --git a/bundle.json b/bundle.json
index 40fbb9dee4..a99463c02d 100644
--- a/bundle.json
+++ b/bundle.json
@@ -18,10 +18,10 @@
         "SystemCapability.Ability.AbilityRuntime.AbilityCore",
         "SystemCapability.Ability.AbilityRuntime.Mission",
         "SystemCapability.Ability.AbilityRuntime.QuickFix",
-        "SystemCapability.Ability.AbilityRuntime.AutoFill",
         "SystemCapability.Ability.AbilityTools.AbilityAssistant"
       ],
       "features": [
+        "ability_runtime_auto_fill_ability",
         "ability_runtime_graphics",
         "ability_runtime_power"
       ],
diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn
index bc592a461a..f767dc8fe0 100644
--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@@ -114,7 +114,8 @@ config("abilityms_config") {
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
-  cflags += [ "-DKEY_AUTO_FILL_ABILITY=\"${key_auto_fill_ability}\"" ]
+  cflags +=
+      [ "-DKEY_AUTO_FILL_ABILITY=\"${ability_runtime_auto_fill_ability}\"" ]
 }
 
 ohos_shared_library("abilityms") {