diff --git a/Clarinet.toml b/Clarinet.toml
index d8b1e58..00a0193 100644
--- a/Clarinet.toml
+++ b/Clarinet.toml
@@ -145,58 +145,58 @@ epoch = 3.1
 
 # dao actions (as extensions)
 
-[contracts.aibtc-action-pmt-dao-add-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-pmt-dao-add-resource.clar'
+[contracts.aibtc-act-pmt-dao-add-resource]
+path = 'contracts/dao/extensions/actions/aibtc-act-pmt-dao-add-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-pmt-dao-toggle-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-pmt-dao-toggle-resource.clar'
+[contracts.aibtc-act-pmt-dao-toggle-resource]
+path = 'contracts/dao/extensions/actions/aibtc-act-pmt-dao-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-pmt-sbtc-add-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-add-resource.clar'
+[contracts.aibtc-act-pmt-sbtc-add-resource]
+path = 'contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-add-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-pmt-sbtc-toggle-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-toggle-resource.clar'
+[contracts.aibtc-act-pmt-sbtc-toggle-resource]
+path = 'contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-pmt-stx-add-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-pmt-stx-add-resource.clar'
+[contracts.aibtc-act-pmt-stx-add-resource]
+path = 'contracts/dao/extensions/actions/aibtc-act-pmt-stx-add-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-pmt-stx-toggle-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-pmt-stx-toggle-resource.clar'
+[contracts.aibtc-act-pmt-stx-toggle-resource]
+path = 'contracts/dao/extensions/actions/aibtc-act-pmt-stx-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-treasury-allow-asset]
-path = 'contracts/dao/extensions/actions/aibtc-action-treasury-allow-asset.clar'
+[contracts.aibtc-act-treasury-allow-asset]
+path = 'contracts/dao/extensions/actions/aibtc-act-treasury-allow-asset.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-send-message]
-path = 'contracts/dao/extensions/actions/aibtc-action-send-message.clar'
+[contracts.aibtc-act-send-message]
+path = 'contracts/dao/extensions/actions/aibtc-act-send-message.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-configure-timed-vault-dao]
-path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-dao.clar'
+[contracts.aibtc-act-cfg-tv-dao]
+path = 'contracts/dao/extensions/actions/aibtc-act-cfg-tv-dao.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-configure-timed-vault-sbtc]
-path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-sbtc.clar'
+[contracts.aibtc-act-cfg-tv-sbtc]
+path = 'contracts/dao/extensions/actions/aibtc-act-cfg-tv-sbtc.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-configure-timed-vault-stx]
-path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-stx.clar'
+[contracts.aibtc-act-cfg-tv-stx]
+path = 'contracts/dao/extensions/actions/aibtc-act-cfg-tv-stx.clar'
 clarity_version = 2
 epoch = 3.1
 
diff --git a/contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-dao.clar b/contracts/dao/extensions/actions/aibtc-act-cfg-tv-dao.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-dao.clar
rename to contracts/dao/extensions/actions/aibtc-act-cfg-tv-dao.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-sbtc.clar b/contracts/dao/extensions/actions/aibtc-act-cfg-tv-sbtc.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-sbtc.clar
rename to contracts/dao/extensions/actions/aibtc-act-cfg-tv-sbtc.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-stx.clar b/contracts/dao/extensions/actions/aibtc-act-cfg-tv-stx.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-stx.clar
rename to contracts/dao/extensions/actions/aibtc-act-cfg-tv-stx.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-pmt-dao-add-resource.clar b/contracts/dao/extensions/actions/aibtc-act-pmt-dao-add-resource.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-pmt-dao-add-resource.clar
rename to contracts/dao/extensions/actions/aibtc-act-pmt-dao-add-resource.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-pmt-dao-toggle-resource.clar b/contracts/dao/extensions/actions/aibtc-act-pmt-dao-toggle-resource.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-pmt-dao-toggle-resource.clar
rename to contracts/dao/extensions/actions/aibtc-act-pmt-dao-toggle-resource.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-add-resource.clar b/contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-add-resource.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-add-resource.clar
rename to contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-add-resource.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-toggle-resource.clar b/contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-toggle-resource.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-toggle-resource.clar
rename to contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-toggle-resource.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-pmt-stx-add-resource.clar b/contracts/dao/extensions/actions/aibtc-act-pmt-stx-add-resource.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-pmt-stx-add-resource.clar
rename to contracts/dao/extensions/actions/aibtc-act-pmt-stx-add-resource.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-pmt-stx-toggle-resource.clar b/contracts/dao/extensions/actions/aibtc-act-pmt-stx-toggle-resource.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-pmt-stx-toggle-resource.clar
rename to contracts/dao/extensions/actions/aibtc-act-pmt-stx-toggle-resource.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-send-message.clar b/contracts/dao/extensions/actions/aibtc-act-send-message.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-send-message.clar
rename to contracts/dao/extensions/actions/aibtc-act-send-message.clar
diff --git a/contracts/dao/extensions/actions/aibtc-action-treasury-allow-asset.clar b/contracts/dao/extensions/actions/aibtc-act-treasury-allow-asset.clar
similarity index 100%
rename from contracts/dao/extensions/actions/aibtc-action-treasury-allow-asset.clar
rename to contracts/dao/extensions/actions/aibtc-act-treasury-allow-asset.clar
diff --git a/contracts/dao/proposals/aibtc-base-bootstrap-initialization-v2.clar b/contracts/dao/proposals/aibtc-base-bootstrap-initialization-v2.clar
index 6f83303..0bd8c7b 100644
--- a/contracts/dao/proposals/aibtc-base-bootstrap-initialization-v2.clar
+++ b/contracts/dao/proposals/aibtc-base-bootstrap-initialization-v2.clar
@@ -25,17 +25,17 @@
     ;; set initial action proposals list
     (try! (contract-call? .aibtc-base-dao set-extensions
       (list
-        {extension: .aibtc-action-configure-timed-vault-dao, enabled: true}
-        {extension: .aibtc-action-configure-timed-vault-sbtc, enabled: true}
-        {extension: .aibtc-action-configure-timed-vault-stx, enabled: true}
-        {extension: .aibtc-action-pmt-dao-add-resource, enabled: true}
-        {extension: .aibtc-action-pmt-dao-toggle-resource, enabled: true}
-        {extension: .aibtc-action-pmt-sbtc-add-resource, enabled: true}
-        {extension: .aibtc-action-pmt-sbtc-toggle-resource, enabled: true}
-        {extension: .aibtc-action-pmt-stx-add-resource, enabled: true}
-        {extension: .aibtc-action-pmt-stx-toggle-resource, enabled: true}
-        {extension: .aibtc-action-send-message, enabled: true}
-        {extension: .aibtc-action-treasury-allow-asset, enabled: true}
+        {extension: .aibtc-act-cfg-tv-dao, enabled: true}
+        {extension: .aibtc-act-cfg-tv-sbtc, enabled: true}
+        {extension: .aibtc-act-cfg-tv-stx, enabled: true}
+        {extension: .aibtc-act-pmt-dao-add-resource, enabled: true}
+        {extension: .aibtc-act-pmt-dao-toggle-resource, enabled: true}
+        {extension: .aibtc-act-pmt-sbtc-add-resource, enabled: true}
+        {extension: .aibtc-act-pmt-sbtc-toggle-resource, enabled: true}
+        {extension: .aibtc-act-pmt-stx-add-resource, enabled: true}
+        {extension: .aibtc-act-pmt-stx-toggle-resource, enabled: true}
+        {extension: .aibtc-act-send-message, enabled: true}
+        {extension: .aibtc-act-treasury-allow-asset, enabled: true}
       )
     ))
     ;; set DAO manifest in dao-charter extension
diff --git a/contracts/dao/proposals/aibtc-base-bootstrap-initialization.clar b/contracts/dao/proposals/aibtc-base-bootstrap-initialization.clar
index 075f2e0..80868a3 100644
--- a/contracts/dao/proposals/aibtc-base-bootstrap-initialization.clar
+++ b/contracts/dao/proposals/aibtc-base-bootstrap-initialization.clar
@@ -21,7 +21,7 @@
       (list
         {extension: .aibtc-action-add-resource, enabled: true}
         {extension: .aibtc-action-allow-treasury-asset, enabled: true}
-        {extension: .aibtc-action-send-message, enabled: true}
+        {extension: .aibtc-act-send-message, enabled: true}
         {extension: .aibtc-action-toggle-resource-by-name, enabled: true}
       )
     ))
diff --git a/contracts/test/disable-onchain-messaging-action.clar b/contracts/test/disable-onchain-messaging-action.clar
index 90a047e..c6242fa 100644
--- a/contracts/test/disable-onchain-messaging-action.clar
+++ b/contracts/test/disable-onchain-messaging-action.clar
@@ -6,9 +6,9 @@
   ;; disables an extension in the DAO
   (begin
     ;; check that extension exists, avoids write if not
-    (asserts! (contract-call? .aibtc-base-dao is-extension .aibtc-action-send-message) ERR_EXTENSION_NOT_FOUND)
+    (asserts! (contract-call? .aibtc-base-dao is-extension .aibtc-act-send-message) ERR_EXTENSION_NOT_FOUND)
     ;; update extension status
-    (try! (contract-call? .aibtc-base-dao set-extension .aibtc-action-send-message false))
+    (try! (contract-call? .aibtc-base-dao set-extension .aibtc-act-send-message false))
     (ok true)
   )
 )
diff --git a/tests/aibtc-user-agent-account.test.ts b/tests/aibtc-user-agent-account.test.ts
index 984e616..84ef0cc 100644
--- a/tests/aibtc-user-agent-account.test.ts
+++ b/tests/aibtc-user-agent-account.test.ts
@@ -34,7 +34,7 @@ const tokenDexContractAddress = `${deployer}.aibtc-token-dex`;
 const baseDaoContractAddress = `${deployer}.aibtc-base-dao`;
 const bootstrapContractAddress = `${deployer}.aibtc-base-bootstrap-initialization-v2`;
 const actionProposalsV2ContractAddress = `${deployer}.aibtc-action-proposals-v2`;
-const sendMessageActionContractAddress = `${deployer}.aibtc-action-send-message`;
+const sendMessageActionContractAddress = `${deployer}.aibtc-act-send-message`;
 const coreProposalsV2ContractAddress = `${deployer}.aibtc-core-proposals-v2`;
 const baseEnableExtensionContractAddress = `${deployer}.aibtc-base-enable-extension`;
 
diff --git a/tests/dao-types.ts b/tests/dao-types.ts
index 5ac10bb..7ef5e2e 100644
--- a/tests/dao-types.ts
+++ b/tests/dao-types.ts
@@ -33,17 +33,17 @@ export enum ContractType {
 
 export enum ContractActionType {
   // dao extension actions
-  DAO_ACTION_ALLOW_ASSET = "aibtc-action-treasury-allow-asset",
-  DAO_ACTION_CONFIGURE_TIMED_VAULT_DAO = "aibtc-action-configure-timed-vault-dao",
-  DAO_ACTION_CONFIGURE_TIMED_VAULT_SBTC = "aibtc-action-configure-timed-vault-sbtc",
-  DAO_ACTION_CONFIGURE_TIMED_VAULT_STX = "aibtc-action-configure-timed-vault-stx",
-  DAO_ACTION_PMT_DAO_ADD_RESOURCE = "aibtc-action-pmt-dao-add-resource",
-  DAO_ACTION_PMT_DAO_TOGGLE_RESOURCE = "aibtc-action-pmt-dao-toggle-resource",
-  DAO_ACTION_PMT_SBTC_ADD_RESOURCE = "aibtc-action-pmt-sbtc-add-resource",
-  DAO_ACTION_PMT_SBTC_TOGGLE_RESOURCE = "aibtc-action-pmt-sbtc-toggle-resource",
-  DAO_ACTION_PMT_STX_ADD_RESOURCE = "aibtc-action-pmt-stx-add-resource",
-  DAO_ACTION_PMT_STX_TOGGLE_RESOURCE = "aibtc-action-pmt-stx-toggle-resource",
-  DAO_ACTION_SEND_MESSAGE = "aibtc-action-send-message",
+  DAO_ACTION_ALLOW_ASSET = "aibtc-act-treasury-allow-asset",
+  DAO_ACTION_CONFIGURE_TIMED_VAULT_DAO = "aibtc-act-cfg-tv-dao",
+  DAO_ACTION_CONFIGURE_TIMED_VAULT_SBTC = "aibtc-act-cfg-tv-sbtc",
+  DAO_ACTION_CONFIGURE_TIMED_VAULT_STX = "aibtc-act-cfg-tv-stx",
+  DAO_ACTION_PMT_DAO_ADD_RESOURCE = "aibtc-act-pmt-dao-add-resource",
+  DAO_ACTION_PMT_DAO_TOGGLE_RESOURCE = "aibtc-act-pmt-dao-toggle-resource",
+  DAO_ACTION_PMT_SBTC_ADD_RESOURCE = "aibtc-act-pmt-sbtc-add-resource",
+  DAO_ACTION_PMT_SBTC_TOGGLE_RESOURCE = "aibtc-act-pmt-sbtc-toggle-resource",
+  DAO_ACTION_PMT_STX_ADD_RESOURCE = "aibtc-act-pmt-stx-add-resource",
+  DAO_ACTION_PMT_STX_TOGGLE_RESOURCE = "aibtc-act-pmt-stx-toggle-resource",
+  DAO_ACTION_SEND_MESSAGE = "aibtc-act-send-message",
 }
 
 export enum ContractProposalType {