diff --git a/security/BUILD.gn b/security/BUILD.gn
index 1076ea4839ca7420501ece8c8917dc7574af08d7..3dead9bca4e134f6342fc160825eae14b6684988 100644
--- a/security/BUILD.gn
+++ b/security/BUILD.gn
@@ -18,6 +18,7 @@ group("security") {
   if (is_standard_system) {
     deps = [
       "access_token/AccessTokenTest_Normal_js:ActsAccessTokenJSApiTestNormal",
+      "cipher/datacipher:datacipher",
       "huks_standard",
       "security_huks_basic",
     ]
diff --git a/security/cipher/datacipher/BUILD.gn b/security/cipher/datacipher/BUILD.gn
index 32f35557b9a384aec8ed9136e9b9b084db3263dc..46fdd8a64ba84c768dd44381b08587ea5f6647be 100644
--- a/security/cipher/datacipher/BUILD.gn
+++ b/security/cipher/datacipher/BUILD.gn
@@ -15,6 +15,6 @@ import("//test/xts/tools/build/suite.gni")
 group("datacipher") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "cipher:HitsSecurityCipherTest" ]
+    deps = [ "cipher:ActsSecurityCipherTest" ]
   }
 }
diff --git a/security/cipher/datacipher/cipher/BUILD.gn b/security/cipher/datacipher/cipher/BUILD.gn
index e1115ea2ae452141d3c42702b57d9bbc3898f901..241c6a918c6b577544f657ba1f953d863ecc8947 100644
--- a/security/cipher/datacipher/cipher/BUILD.gn
+++ b/security/cipher/datacipher/cipher/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("HitsSecurityCipherTest") {
+ohos_js_hap_suite("ActsSecurityCipherTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "HitsSecurityCipherTest"
+  hap_name = "ActsSecurityCipherTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/cipher/datacipher/cipher/Test.json b/security/cipher/datacipher/cipher/Test.json
index 39fcb66ab4eb025bc3db87807c60b1b37aefddda..01e3f208c714ad3bc318dddb45daae55d2a7895d 100644
--- a/security/cipher/datacipher/cipher/Test.json
+++ b/security/cipher/datacipher/cipher/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for keystoretest js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "4200000",
+    "test-timeout": "300000",
     "package": "com.huawei.keystoretest",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "HitsSecurityCipherTest.hap"
+        "ActsSecurityCipherTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher1.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher1.test.js
similarity index 96%
rename from security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher1.test.js
rename to security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher1.test.js
index f03b7ea075929c5912aa76c883c65716f4ff6d00..ebc56656e65c0141a8cee56c52d39b9e98388e3d 100644
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher1.test.js
+++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher1.test.js
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/lite/interface'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 import cipher from '@system.cipher';
-describe('hitscipher.test.js', function () {
+describe('cipher1.test.js', function () {
   let plainTextRsa;
   let cipherTextRsa;
   let rsaPublicKey;
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher2.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher2.test.js
similarity index 96%
rename from security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher2.test.js
rename to security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher2.test.js
index 315052b78be750592159bc245371ee8661363555..d675c9ba82697352ce97a35c7881e9ab43ede7e7 100644
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher2.test.js
+++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher2.test.js
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/lite/interface'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 import cipher from '@system.cipher';
-describe('hitscipher.test.js', function () {
+describe('cipher2.test.js', function () {
   let plainTextRsa;
   let cipherTextRsa;
   let rsaPublicKey;
diff --git a/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js
index 82e9b69d7f9f1cfa33a6ef81d5aceb62af2b6b84..0c8185a17fa6d4b6276bf404312d6a2e48f16ec1 100644
--- a/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js
+++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js
@@ -1,4 +1,4 @@
-/*
+/*plainTextAes
  * Copyright (C) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ describe('hitscipher.test.js', function () {
   let cipherTextRsa;
   let rsaPublicKey;
   let rsaPrivateKey;
-  let plainTestAes;
+  let plainTextAes;
   let cipherTextAes;
   let aesKey;
   let cipherResultFail;
@@ -44,7 +44,7 @@ describe('hitscipher.test.js', function () {
 	'Zt8MkPdAh87mD8jdlsSzh3v2RxkbJTgzFmRotsd2dCfNdykYtRN5EBmbYM54GhBh\n' +
 	'dYZlnX92HHBDLRCL8y0CQQDuKZNoBooqVUwcrCFqpeAX/bGYiVmFxcIqyu5vYzVJ\n' +
 	'Ff5Fpkxm4FLmrjhiGwL1CKIm5RRL9kT6tsv4do6ALylb';
-	plainTestAes = '%%%%Hello,World! 123 aes key2###(^^^)';
+	plainTextAes = '%%%%Hello,World! 123 aes key2###(^^^)';
 	cipherTextAes = 'IclkeCOt6pPODqNyprSZizYdJLBFLwXsEFJo34IJwZp7JmfQJXDbqGpexINBMke4';
 	aesKey = 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjMONTY3ODkwMzI=';
 	cipherResultFail = false;
diff --git a/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js
index 57e03c70fc02c37cb874554e06a39f9f2672b3e6..44fc82db20ba3200045d114e4bf8773035638ef9 100644
--- a/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js
+++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js
@@ -14,3 +14,5 @@
  */
 
 require('./Agree/hitscipher.test.js');
+require('./Agree/cipher1.test.js');
+require('./Agree/cipher2.test.js');
diff --git a/security/cipher/datacipher2/BUILD.gn b/security/cipher/datacipher2/BUILD.gn
deleted file mode 100644
index c927b93e6abf39ea6d7aea03cf6f0cf7aeff8c7c..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import("//test/xts/tools/build/suite.gni")
-
-group("datacipher2") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [ "cipher:HitsSecurityCipherTest2" ]
-  }
-}
diff --git a/security/cipher/datacipher2/cipher/BUILD.gn b/security/cipher/datacipher2/cipher/BUILD.gn
deleted file mode 100644
index d4c7ad0706fc5b8cb2762a0ccffe7f45f55c1a70..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/BUILD.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("HitsSecurityCipherTest2") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":huks_js_assets",
-    ":huks_js_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "HitsSecurityCipherTest2"
-}
-ohos_js_assets("huks_js_assets") {
-  source_dir = "./entry/src/main/js/MainAbility"
-}
-ohos_resources("huks_js_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
diff --git a/security/cipher/datacipher2/cipher/Test.json b/security/cipher/datacipher2/cipher/Test.json
deleted file mode 100644
index b47091c77cdeefc67555d5ca693c7673dcbee3a1..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/Test.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "description": "Configuration for keystoretest js api Tests",
-  "driver": {
-    "type": "JSUnitTest",
-    "test-timeout": "4200000",
-    "package": "com.huawei.keystoretest",
-    "shell-timeout": "60000"
-  },
-  "kits": [
-    {
-      "test-file-name": [
-        "HitsSecurityCipherTest2.hap"
-      ],
-      "type": "AppInstallKit",
-      "cleanup-apps": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/config.json b/security/cipher/datacipher2/cipher/entry/src/main/config.json
deleted file mode 100644
index a533ea4d2dcad1d3aa1442781245cf1d816e8884..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/config.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "app": {
-    "bundleName": "com.huawei.keystoretest",
-    "vendor": "huawei",
-    "version": {
-      "code": 1,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 6,
-      "target": 6,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.huawei.keystoretest",
-    "name": ".MyApplication",
-    "mainAbility": "com.huawei.keystoretest.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": true
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.huawei.keystoretest.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true,
-        "isVisible": "true"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js
deleted file mode 100644
index bd5ae64a246945132c418cb72c795d5ba12c8f8a..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export default {
-  onCreate() {
-    console.info('AceApplication onCreate');
-  },
-  onDestroy() {
-    console.info('AceApplication onDestroy');
-  },
-};
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json
deleted file mode 100644
index 7f21065f105c8ff8fabc971f5e5161ab30c73d2d..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "strings": {
-    "hello": "Hello",
-    "world": "world",
-    "start": "test start"
-  }
-}
\ No newline at end of file
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json
deleted file mode 100644
index 29bea0fd91faa67602a08572d6feea8b79a0067b..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界",
-    "start": "测试开始"
-  }
-}
\ No newline at end of file
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css
deleted file mode 100644
index 50637f89ac7ae3d1ce45a4ad565eb4eab743709e..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.container {
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100%;
-}
-
-.title {
-  font-size: 40px;
-  color: #000000;
-  opacity: 0.9;
-}
-
-@media screen and (device-type: tablet) and (orientation: landscape) {
-  .title {
-    font-size: 100px;
-  }
-}
-
-@media screen and (device-type: wearable) {
-  .title {
-    font-size: 28px;
-    color: #ffffff;
-  }
-}
-
-@media screen and (device-type: tv) {
-  .container {
-    background-image: url('/common/images/Wallpaper.png');
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center;
-  }
-
-  .title {
-    font-size: 100px;
-    color: #ffffff;
-  }
-}
-
-@media screen and (device-type: phone) and (orientation: landscape) {
-  .title {
-    font-size: 60px;
-  }
-}
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml
deleted file mode 100644
index 201249a906e694fc042d0e967049a3eff15edfe2..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="container">
-    <text class="title" >
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-</div>
\ No newline at end of file
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js
deleted file mode 100644
index 764001cef986c1922056a382084c79e9017ca814..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Core, ExpectExtend } from 'deccjsunit/index';
-
-export default {
-  data: {
-    title: '',
-  },
-  onInit() {
-    this.title = this.$t('strings.world');
-  },
-  onShow() {
-    const core = Core.getInstance();
-    const expectExtend = new ExpectExtend({
-      id: 'extend',
-    });
-    core.addService('expect', expectExtend);
-    core.init();
-    const configService = core.getDefaultService('config');
-    this.timeout = 1500000;
-    configService.setConfig(this);
-    console.log('test start');
-    require('../../../test/List.test');
-    core.execute();
-  },
-  onReady() {},
-};
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json b/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json
deleted file mode 100644
index c0dd3a09e5dcefc69f22b5e00e92296f1c3f55a5..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/media/icon.png b/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/media/icon.png
deleted file mode 100644
index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000
Binary files a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/media/icon.png and /dev/null differ
diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/test/List.test.js b/security/cipher/datacipher2/cipher/entry/src/main/js/test/List.test.js
deleted file mode 100644
index 15dd148ff2b25d174a8a095d8e2985d4eb9f1ac8..0000000000000000000000000000000000000000
--- a/security/cipher/datacipher2/cipher/entry/src/main/js/test/List.test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-require('./Agree/cipher1.test.js');
diff --git a/security/cipher/datacipher2/cipher/signature/openharmony_sx.p7b b/security/cipher/datacipher2/cipher/signature/openharmony_sx.p7b
deleted file mode 100644
index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000
Binary files a/security/cipher/datacipher2/cipher/signature/openharmony_sx.p7b and /dev/null differ
diff --git a/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn
index 416564fb1c24d63d6e1a660ee324487336d6e2e3..206be2a3fa9695cb2e06e197cba8a2a97ddb7329 100644
--- a/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksagree_callback_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksAgreeBasicCallbackJSApiTest"
+  hap_name = "ActsHuksAgreeBasicCallbackJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json b/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json
index e6919e6d47e8bd91850c34ada1030755f4630770..ec84c9c0c561e01cf4f2cb254a83fb9ac6be4d7c 100644
--- a/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json
@@ -9,7 +9,7 @@
   "kits": [
     {
       "test-file-name": [
-        "huksAgreeBasicCallbackJSApiTest.hap"
+        "ActsHuksAgreeBasicCallbackJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn
index 58b425fe98a71d7418f3f44a1729097ba2506e39..092ba9199d5f4e9d761754e68767b6b9721b471c 100644
--- a/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksagree_promise_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksAgreeBasicPromiseJSApiTest"
+  hap_name = "ActsHuksAgreeBasicPromiseJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json b/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json
index 223c56d5f35856b88ace23fd187d60c43e0f4a39..3aca2b28171a9fcba3a5b902d1d117ab2dff7ec0 100644
--- a/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksAgreeBasicPromise js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "4200000",
+    "test-timeout": "180000",
     "package": "com.example.huksagreebasicpromise",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksAgreeBasicPromiseJSApiTest.hap"
+        "ActsHuksAgreeBasicPromiseJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn
index 16b45d101359a3cc81ab306dae33aee47fbbe8f4..12730c2d9d832c6854f57643ecdcd6e9b0233546 100644
--- a/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukscipher_callback_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksCipherBasicCallbackJSApiTest"
+  hap_name = "ActsHuksCipherBasicCallbackJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json b/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json
index 2b45fe6f637bf5e6c05ea0fc604bce411330732c..f63b998e18bd166ee5f725863f2e7dfc6ece8562 100644
--- a/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksCipherBasicCallback js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "2700000",
+    "test-timeout": "180000",
     "package": "com.example.hukscipherbasiccallback",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksCipherBasicCallbackJSApiTest.hap"
+        "ActsHuksCipherBasicCallbackJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn
index b319404ac687872b27706081f06d8f8ce14b4e59..bd1a2820fd4067551ce8d2af33d400cf4f3dee7a 100644
--- a/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukscipher_promise_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksCipherBasicPromiseJSApiTest"
+  hap_name = "ActsHuksCipherBasicPromiseJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json b/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json
index a3afe3e0a27af0a72998c4dc14023c30ba039d51..5d0b830663ecdc611d66350ca576204a12cfe4e5 100644
--- a/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksCipherBasicPromise js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "2700000",
+    "test-timeout": "180000",
     "package": "com.example.hukscipherbasicpromise",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksCipherBasicPromiseJSApiTest.hap"
+        "ActsHuksCipherBasicPromiseJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn
index 45bc3846e3623c3335f1b7d501d315a12aefcc2c..730187b2350f39a6963de2342b6b7c288778a80d 100644
--- a/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksderive_callback_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksDeriveBasicCallbackJSApiTest"
+  hap_name = "ActsHuksDeriveBasicCallbackJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json b/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json
index 2acedaf047551188ef2f7a74010e9b3f989b4ff3..182fb0f29ad790e0a380b8518d9ebb5f3982288c 100644
--- a/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksDeriveBasicCallback js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "4200000",
+    "test-timeout": "180000",
     "package": "com.example.huksderivebasiccallback",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksDeriveBasicCallbackJSApiTest.hap"
+        "ActsHuksDeriveBasicCallbackJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn
index a3dc56b788d5bb4d72e6ffb485f9de6625ebb238..c1212c5cc110a6bf23c1646e3a559eb4f78e11b6 100644
--- a/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksderive_promise_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksDeriveBasicPromiseJSApiTest"
+  hap_name = "ActsHuksDeriveBasicPromiseJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json b/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json
index e77b6d92d46acfd59f54e365cc6a0b3a249a200c..dc27c0af8a857b2d345e68f738cea27a4e414257 100644
--- a/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksDeriveBasicPromise js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "4200000",
+    "test-timeout": "180000",
     "package": "com.example.huksderivebasicpromise",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksDeriveBasicPromiseJSApiTest.hap"
+        "ActsHuksDeriveBasicPromiseJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn
index d860b7d3268e3ffbd13d3122c69b3a9bc3e71098..27a317886e976732b199126fe7761c2c864dc510 100644
--- a/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukshmac_callback_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksHmacBasicCallbackJSApiTest"
+  hap_name = "ActsHuksHmacBasicCallbackJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json b/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json
index 21c4f375f9cbe0e7644c6bb2d7cb30c2d48acf68..14b835e98c90ae4fbceaac4e13e5bfcb28751540 100644
--- a/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksHmacBasicCallback js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "600000",
+    "test-timeout": "180000",
     "package": "com.example.huksHmacbasiccallback",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksHmacBasicCallbackJSApiTest.hap"
+        "ActsHuksHmacBasicCallbackJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn
index b67b9dc46d595edfb9cfac8e2506eafb6c1fd3aa..6b5f3b70c4f491dbaabc9ce165c42e6e927e1096 100644
--- a/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukshmac_promise_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksHmacBasicPromiseJSApiTest"
+  hap_name = "ActsHuksHmacBasicPromiseJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json b/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json
index e4b6fac847975649555fe6901a81de1944ab7529..ce4accfe9ba41aea3da5847cb58b6111c327473a 100644
--- a/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksHmacBasicPromise js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "600000",
+    "test-timeout": "180000",
     "package": "com.example.huksHmacbasicpromise",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksHmacBasicPromiseJSApiTest.hap"
+        "ActsHuksHmacBasicPromiseJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn
index 5a09b250796ad1768803257d3bad781b67758d08..6563049b7e1183d172acfd4045a7b09ec2246dcc 100644
--- a/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukssignverify_callback_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksSignVerifyBasicCallbackJSApiTest"
+  hap_name = "ActsHuksSignVerifyBasicCallbackJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json b/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json
index 943a70d0e8683ad011bd617d75604bde4617c43b..8d637f9807ad5360a40c75a670aa3766e2f9bb51 100644
--- a/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json
@@ -9,7 +9,7 @@
   "kits": [
     {
       "test-file-name": [
-        "huksSignVerifyBasicCallbackJSApiTest.hap"
+        "ActsHuksSignVerifyBasicCallbackJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true
diff --git a/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn
index 4ad729db53c41f2010c7ed4eb70845390f3a50d4..e4ae8d77e8936ebf243d42b9b68cf5bdb53669fa 100644
--- a/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn
@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukssignverify_promise_basic_js_test") {
     ":huks_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "huksSignVerifyBasicPromiseJSApiTest"
+  hap_name = "ActsHuksSignVerifyBasicPromiseJSApiTest"
 }
 ohos_js_assets("huks_js_assets") {
   source_dir = "./entry/src/main/js/MainAbility"
diff --git a/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json b/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json
index 304d608ba16e8ea6b994e6c0e0655e45faafa186..8375b5d603eb47b8418a85d36c0f2c57697eb281 100644
--- a/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksSignVerifyBasicPromise js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "12600000",
+    "test-timeout": "180000",
     "package": "com.example.hukssignverifybasicpromise",
     "shell-timeout": "60000"
   },
   "kits": [
     {
       "test-file-name": [
-        "huksSignVerifyBasicPromiseJSApiTest.hap"
+        "ActsHuksSignVerifyBasicPromiseJSApiTest.hap"
       ],
       "type": "AppInstallKit",
       "cleanup-apps": true