From d6bce5a85253e4bfd733d42ad9d7e29d5186d360 Mon Sep 17 00:00:00 2001
From: Paul Balaji <paul@hyperlane.xyz>
Date: Thu, 21 Mar 2024 17:29:15 +0000
Subject: [PATCH] update configs

Signed-off-by: Paul Balaji <paul@hyperlane.xyz>
---
 rust/config/mainnet3_config.json              | 152 +++++++--------
 rust/config/testnet4_config.json              |  68 +++----
 .../cli/examples/contract-artifacts.yaml      |   8 +-
 .../mainnet3/ism/verification.json            | 174 +++++++++---------
 .../testnet4/ism/verification.json            | 120 ++++++------
 .../sdk/src/consts/environments/mainnet.json  | 150 +++++++--------
 .../sdk/src/consts/environments/testnet.json  |  68 +++----
 7 files changed, 370 insertions(+), 370 deletions(-)

diff --git a/rust/config/mainnet3_config.json b/rust/config/mainnet3_config.json
index 3755388f01..049e79c1ea 100644
--- a/rust/config/mainnet3_config.json
+++ b/rust/config/mainnet3_config.json
@@ -34,10 +34,10 @@
       ],
       "storageGasOracle": "0xD3805207b65d99C075ceA938Fa7c0587026a5DF5",
       "proxyAdmin": "0x80Cebd56A65e46c474a1A101e89E76C4c51D179c",
-      "merkleRootMultisigIsmFactory": "0x3C330D4A2e2b8443AFaB8E326E64ab4251B7Eae0",
-      "messageIdMultisigIsmFactory": "0x12Df53079d399a47e9E730df095b712B0FDFA791",
-      "aggregationIsmFactory": "0xD4883084389fC1Eeb4dAfB2ADcFc36B711c310EB",
-      "aggregationHookFactory": "0x9B5f440bBb64Fee337F37e03362b628711Ea09C7",
+      "staticMerkleRootMultisigIsmFactory": "0x3C330D4A2e2b8443AFaB8E326E64ab4251B7Eae0",
+      "staticMessageIdMultisigIsmFactory": "0x12Df53079d399a47e9E730df095b712B0FDFA791",
+      "staticAggregationIsmFactory": "0xD4883084389fC1Eeb4dAfB2ADcFc36B711c310EB",
+      "staticAggregationHookFactory": "0x9B5f440bBb64Fee337F37e03362b628711Ea09C7",
       "merkleTreeHook": "0x748040afB89B8FdBb992799808215419d36A0930",
       "interchainGasPaymaster": "0x3b6044acd6767f017e99318AA6Ef93b7B06A5a22",
       "aggregationHook": "0xe0cb37cFc47296f1c4eD77EFf92Aed478644d10c",
@@ -46,7 +46,7 @@
       "validatorAnnounce": "0x1df063280C4166AF9a725e3828b4dAC6c7113B08",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0xa2931C37957f3079d3B21b877d56E1db930e02a5",
+      "domainRoutingIsmFactory": "0xa2931C37957f3079d3B21b877d56E1db930e02a5",
       "pausableHook": "0xEf30f29Dcd3FCB1DCcDA9C7Cbf2A5957E8Ee9Cc3",
       "fallbackRoutingHook": "0x9e8fFb1c26099e75Dd5D794030e2E9AA51471c25",
       "interchainSecurityModule": "0xD0DBBF922076352cC50B285A0023536561F00EEa",
@@ -91,10 +91,10 @@
       ],
       "storageGasOracle": "0x175821F30AdCAA4bbB72Ce98eF76C2E0De2C3f21",
       "proxyAdmin": "0xd7CF8c05fd81b8cA7CfF8E6C49B08a9D63265c9B",
-      "merkleRootMultisigIsmFactory": "0x896cF1D1B66cD211633eDd589fF158E8Cfaf9B54",
-      "messageIdMultisigIsmFactory": "0x8819D653DF5b1FC0DdB32189a2704E471AF8483c",
-      "aggregationIsmFactory": "0xa5E13796eB7d2EDCc88012c8cfF90D69B51FcF9f",
-      "aggregationHookFactory": "0x3bF6Ac986C7Af9A9Ac356C0e99C0041EFd8D96e7",
+      "staticMerkleRootMultisigIsmFactory": "0x896cF1D1B66cD211633eDd589fF158E8Cfaf9B54",
+      "staticMessageIdMultisigIsmFactory": "0x8819D653DF5b1FC0DdB32189a2704E471AF8483c",
+      "staticAggregationIsmFactory": "0xa5E13796eB7d2EDCc88012c8cfF90D69B51FcF9f",
+      "staticAggregationHookFactory": "0x3bF6Ac986C7Af9A9Ac356C0e99C0041EFd8D96e7",
       "merkleTreeHook": "0x84eea61D679F42D92145fA052C89900CBAccE95A",
       "interchainGasPaymaster": "0x95519ba800BBd0d34eeAE026fEc620AD978176C0",
       "aggregationHook": "0x0165a22BA489F7DA37DAf6397781777D9FCB5708",
@@ -103,7 +103,7 @@
       "validatorAnnounce": "0x9Cad0eC82328CEE2386Ec14a12E81d070a27712f",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0x28F7907911C7E321c596686AE6D1F20516450037",
+      "domainRoutingIsmFactory": "0x28F7907911C7E321c596686AE6D1F20516450037",
       "pausableHook": "0x239eB860770F1C48ABAC9bE9825d20e3E7c018df",
       "fallbackRoutingHook": "0x61D15D571D5f7A9eF0D1938f072f430bBF024747",
       "interchainSecurityModule": "0xA36B02a83564f52d9244310Ea439ee6F6AfeFb60",
@@ -148,10 +148,10 @@
           "http": "https://base.blockpi.network/v1/rpc/public"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-      "messageIdMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-      "aggregationIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-      "aggregationHookFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+      "staticMerkleRootMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+      "staticMessageIdMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+      "staticAggregationIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+      "staticAggregationHookFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "proxyAdmin": "0x4Ed7d626f1E96cD1C0401607Bf70D95243E3dEd1",
       "mailbox": "0xeA87ae93Fa0019a82A727bfd3eBd1cFCa8f64f1D",
       "merkleTreeHook": "0x19dc38aeae620380430C200a6E990D5Af5480117",
@@ -160,7 +160,7 @@
       "aggregationHook": "0x13f3d4B0Ee0a713430fded9E18f7fb6c91A6E41F",
       "protocolFee": "0x99ca8c74cE7Cfa9d72A51fbb05F9821f5f826b3a",
       "validatorAnnounce": "0x182E8d7c5F1B06201b102123FC7dF0EaeB445a7B",
-      "routingIsmFactory": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503",
+      "domainRoutingIsmFactory": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503",
       "pausableHook": "0x46fa3A5780e5B90Eaf34BDED554d5353B5ABE9E7",
       "fallbackRoutingHook": "0x4Eb82Ee35b0a1c1d776E3a3B547f9A9bA6FCC9f2",
       "interchainSecurityModule": "0x5D1e7D7c5B9e6dDC8439F67F10c578f2A1084f6F",
@@ -211,10 +211,10 @@
       },
       "storageGasOracle": "0x91d23D603d60445411C06e6443d81395593B7940",
       "proxyAdmin": "0x65993Af9D0D3a64ec77590db7ba362D6eB78eF70",
-      "merkleRootMultisigIsmFactory": "0xfADBc81Ca8A957F1Bf7c78bCc575b28DBDE042b6",
-      "messageIdMultisigIsmFactory": "0x4B1d8352E35e3BDE36dF5ED2e73C24E35c4a96b7",
-      "aggregationIsmFactory": "0x38B3878c4fb44d201DA924c4a04bae3EE728c065",
-      "aggregationHookFactory": "0xe70E86a7D1e001D419D71F960Cb6CaD59b6A3dB6",
+      "staticMerkleRootMultisigIsmFactory": "0xfADBc81Ca8A957F1Bf7c78bCc575b28DBDE042b6",
+      "staticMessageIdMultisigIsmFactory": "0x4B1d8352E35e3BDE36dF5ED2e73C24E35c4a96b7",
+      "staticAggregationIsmFactory": "0x38B3878c4fb44d201DA924c4a04bae3EE728c065",
+      "staticAggregationHookFactory": "0xe70E86a7D1e001D419D71F960Cb6CaD59b6A3dB6",
       "mailbox": "0x2971b9Aec44bE4eb673DF1B88cDB57b96eefe8a4",
       "merkleTreeHook": "0xFDb9Cd5f9daAA2E4474019405A328a88E7484f26",
       "interchainGasPaymaster": "0x78E25e7f84416e69b9339B0A6336EB6EFfF6b451",
@@ -223,7 +223,7 @@
       "validatorAnnounce": "0x7024078130D9c2100fEA474DAD009C2d1703aCcd",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0xe6Af5720d34213C805C08e2470aea979e3F72F75",
+      "domainRoutingIsmFactory": "0xe6Af5720d34213C805C08e2470aea979e3F72F75",
       "interchainSecurityModule": "0xab3df354baBee6c2B88E2CeD3b2e030e31aA5e61",
       "fallbackRoutingHook": "0x237E81f87F57Badad9e09f13CC676D986cA852e7",
       "pausableHook": "0x7DBdAd1b4A922B65d37d7258a4227b6658344b7f",
@@ -269,10 +269,10 @@
       ],
       "storageGasOracle": "0xD9A9966E7dA9a7f0032bF449FB12696a638E673C",
       "proxyAdmin": "0x90f9a2E9eCe93516d65FdaB726a3c62F5960a1b9",
-      "merkleRootMultisigIsmFactory": "0x4C96a1abc44dc846775CE702C9E9BE821D3b487c",
-      "messageIdMultisigIsmFactory": "0xaB402f227e892Ef37C105bf06619c0fa106a1fB2",
-      "aggregationIsmFactory": "0x1722dd970a1F56040712129f5Eeb76B003fd7500",
-      "aggregationHookFactory": "0xc3745652EFB8555A8b064A0EA78d295133d326D2",
+      "staticMerkleRootMultisigIsmFactory": "0x4C96a1abc44dc846775CE702C9E9BE821D3b487c",
+      "staticMessageIdMultisigIsmFactory": "0xaB402f227e892Ef37C105bf06619c0fa106a1fB2",
+      "staticAggregationIsmFactory": "0x1722dd970a1F56040712129f5Eeb76B003fd7500",
+      "staticAggregationHookFactory": "0xc3745652EFB8555A8b064A0EA78d295133d326D2",
       "merkleTreeHook": "0x04dB778f05854f26E67e0a66b740BBbE9070D366",
       "interchainGasPaymaster": "0x571f1435613381208477ac5d6974310d88AC7cB7",
       "aggregationHook": "0xc65890329066FB20c339Bc5C22f1756e9D3a4fF5",
@@ -281,7 +281,7 @@
       "validatorAnnounce": "0xCeF677b65FDaA6804d4403083bb12B8dB3991FE1",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0x2A2c22B0a8615ad24839fA6Af302E896Af32d1a3",
+      "domainRoutingIsmFactory": "0x2A2c22B0a8615ad24839fA6Af302E896Af32d1a3",
       "domainRoutingIsm": "0xf18E32428dad0802C5D6F723cB80A6Da889777c4",
       "pausableIsm": "0x6Bc4437ce69696C9461Cbc89582c259AC8847A58",
       "staticAggregationIsm": "0x99e8E56Dce3402D6E09A82718937fc1cA2A9491E",
@@ -337,10 +337,10 @@
       },
       "storageGasOracle": "0xc9a103990A8dB11b4f627bc5CD1D0c2685484Ec5",
       "proxyAdmin": "0x75EE15Ee1B4A75Fa3e2fDF5DF3253c25599cc659",
-      "merkleRootMultisigIsmFactory": "0x47e8aF9e30C32Ab91060ED587894288786761B45",
-      "messageIdMultisigIsmFactory": "0xfA21D9628ADce86531854C2B7ef00F07394B0B69",
-      "aggregationIsmFactory": "0x46FA191Ad972D9674Ed752B69f9659A0d7b22846",
-      "aggregationHookFactory": "0x6D2555A8ba483CcF4409C39013F5e9a3285D3C9E",
+      "staticMerkleRootMultisigIsmFactory": "0x47e8aF9e30C32Ab91060ED587894288786761B45",
+      "staticMessageIdMultisigIsmFactory": "0xfA21D9628ADce86531854C2B7ef00F07394B0B69",
+      "staticAggregationIsmFactory": "0x46FA191Ad972D9674Ed752B69f9659A0d7b22846",
+      "staticAggregationHookFactory": "0x6D2555A8ba483CcF4409C39013F5e9a3285D3C9E",
       "merkleTreeHook": "0x48e6c30B97748d1e2e03bf3e9FbE3890ca5f8CCA",
       "interchainGasPaymaster": "0x9e6B1022bE9BBF5aFd152483DAD9b88911bC8611",
       "aggregationHook": "0xb87AC8EA4533AE017604E44470F7c1E550AC6F10",
@@ -349,7 +349,7 @@
       "validatorAnnounce": "0xCe74905e51497b4adD3639366708b821dcBcff96",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0x28fA9552F19039b450498B0d8e5DEAe0d0aAc559",
+      "domainRoutingIsmFactory": "0x28fA9552F19039b450498B0d8e5DEAe0d0aAc559",
       "pausableHook": "0x3A66Dc852e56d3748838b3C27CF381105b83705b",
       "fallbackRoutingHook": "0x571f1435613381208477ac5d6974310d88AC7cB7",
       "interchainSecurityModule": "0x43Ce4Eb4aE3585dDe9Ac6967Db5b06f7f6764C8a",
@@ -394,10 +394,10 @@
       ],
       "storageGasOracle": "0x5E01d8F34b629E3f92d69546bbc4142A7Adee7e9",
       "proxyAdmin": "0x81a92A1a272cb09d7b4970b07548463dC7aE0cB7",
-      "merkleRootMultisigIsmFactory": "0x8E273260EAd8B72A085B19346A676d355740e875",
-      "messageIdMultisigIsmFactory": "0x603f46cc520d2fc22957b81e206408590808F02F",
-      "aggregationIsmFactory": "0x11EF91d17c5ad3330DbCa709a8841743d3Af6819",
-      "aggregationHookFactory": "0xbC8AA096dabDf4A0200BB9f8D4Cbb644C3D86d7B",
+      "staticMerkleRootMultisigIsmFactory": "0x8E273260EAd8B72A085B19346A676d355740e875",
+      "staticMessageIdMultisigIsmFactory": "0x603f46cc520d2fc22957b81e206408590808F02F",
+      "staticAggregationIsmFactory": "0x11EF91d17c5ad3330DbCa709a8841743d3Af6819",
+      "staticAggregationHookFactory": "0xbC8AA096dabDf4A0200BB9f8D4Cbb644C3D86d7B",
       "mailbox": "0xaD09d78f4c6b9dA2Ae82b1D34107802d380Bb74f",
       "merkleTreeHook": "0x2684C6F89E901987E1FdB7649dC5Be0c57C61645",
       "interchainGasPaymaster": "0xDd260B99d302f0A3fF885728c086f729c06f227f",
@@ -406,7 +406,7 @@
       "validatorAnnounce": "0x87ED6926abc9E38b9C7C19f835B41943b622663c",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0xbB5Df000113e767dE11343A16f83De733e5bCC0F",
+      "domainRoutingIsmFactory": "0xbB5Df000113e767dE11343A16f83De733e5bCC0F",
       "pausableHook": "0xf728C884De5275a608dEC222dACd0f2BF2E23AB6",
       "fallbackRoutingHook": "0x24f5E353dD03E103Ba2372F7D6FC0cf3A66f849c",
       "interchainSecurityModule": "0x8e1aa0687B6d939D5a44304D13B7c922ebB012f1",
@@ -445,10 +445,10 @@
           "http": "https://pacific-rpc.manta.network/http"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-      "messageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-      "aggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
-      "aggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
+      "staticMerkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+      "staticMessageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+      "staticAggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+      "staticAggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "proxyAdmin": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
       "mailbox": "0x3a464f746D23Ab22155710f44dB16dcA53e0775E",
       "domainRoutingIsm": "0xDEed16fe4b1c9b2a93483EDFf34C77A9b57D31Ff",
@@ -458,7 +458,7 @@
       "aggregationHook": "0x8464aF853363B8d6844070F68b0AB34Cb6523d0F",
       "protocolFee": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
       "validatorAnnounce": "0x2fa5F5C96419C222cDbCeC797D696e6cE428A7A9",
-      "routingIsmFactory": "0x8358D8291e3bEDb04804975eEa0fe9fe0fAfB147",
+      "domainRoutingIsmFactory": "0x8358D8291e3bEDb04804975eEa0fe9fe0fAfB147",
       "pausableHook": "0x7556a0E61d577D921Cba8Fca0d7D6299d36E607E",
       "fallbackRoutingHook": "0xD1E267d2d7876e97E217BfE61c34AB50FEF52807",
       "interchainSecurityModule": "0xDEed16fe4b1c9b2a93483EDFf34C77A9b57D31Ff",
@@ -571,10 +571,10 @@
       ],
       "storageGasOracle": "0x448b7ADB0dA36d41AA2AfDc9d63b97541A7b3819",
       "proxyAdmin": "0x6A9cdA3dd1F593983BFd142Eb35e6ce4137bd5ce",
-      "merkleRootMultisigIsmFactory": "0xE2f485bc031Feb5a4C41C1967bf028653d75f0C3",
-      "messageIdMultisigIsmFactory": "0x84Df48F8f241f11d0fA302d09d73030429Bd9C73",
-      "aggregationIsmFactory": "0x40c6Abcb6A2CdC8882d4bEcaC47927005c7Bb8c2",
-      "aggregationHookFactory": "0x59cC3E7A49DdC4893eB8754c7908f96072A7DbE8",
+      "staticMerkleRootMultisigIsmFactory": "0xE2f485bc031Feb5a4C41C1967bf028653d75f0C3",
+      "staticMessageIdMultisigIsmFactory": "0x84Df48F8f241f11d0fA302d09d73030429Bd9C73",
+      "staticAggregationIsmFactory": "0x40c6Abcb6A2CdC8882d4bEcaC47927005c7Bb8c2",
+      "staticAggregationHookFactory": "0x59cC3E7A49DdC4893eB8754c7908f96072A7DbE8",
       "mailbox": "0x094d03E751f49908080EFf000Dd6FD177fd44CC3",
       "merkleTreeHook": "0x87403b85f6f316e7ba91ba1fa6C3Fb7dD4095547",
       "interchainGasPaymaster": "0x14760E32C0746094cF14D97124865BC7F0F7368F",
@@ -583,7 +583,7 @@
       "validatorAnnounce": "0x8c1001eBee6F25b31863A55EadfF149aF88B356F",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0x8061Af3A459093540d17823D651BC5E2A92669a7",
+      "domainRoutingIsmFactory": "0x8061Af3A459093540d17823D651BC5E2A92669a7",
       "pausableHook": "0xe28f2AEEB42ee83CAd068D9A9a449c8b868C137f",
       "fallbackRoutingHook": "0x6C2D6eA0969F7Aa0A850CCA88c7BFACa563B2361",
       "interchainSecurityModule": "0x373836DFa82f2D27ec79Ca32A197Aa1665F0E1e9",
@@ -621,11 +621,11 @@
           "http": "https://inevm.calderachain.xyz/http"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
-      "messageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-      "aggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-      "aggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-      "routingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+      "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
+      "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+      "staticAggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+      "staticAggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+      "domainRoutingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "domainRoutingIsm": "0xBD70Ea9D599a0FC8158B026797177773C3445730",
       "proxyAdmin": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "storageGasOracle": "0x6119E37Bd66406A1Db74920aC79C15fB8411Ba76",
@@ -673,10 +673,10 @@
       ],
       "storageGasOracle": "0x27e88AeB8EA4B159d81df06355Ea3d20bEB1de38",
       "proxyAdmin": "0xE047cb95FB3b7117989e911c6afb34771183fC35",
-      "merkleRootMultisigIsmFactory": "0xCA6Cb9Bc3cfF9E11003A06617cF934B684Bc78BC",
-      "messageIdMultisigIsmFactory": "0xAa4Be20E9957fE21602c74d7C3cF5CB1112EA9Ef",
-      "aggregationIsmFactory": "0x7491843F3A5Ba24E0f17a22645bDa04A1Ae2c584",
-      "aggregationHookFactory": "0x15DEeAB8dECDe553bb0B1F9C00984cbcae1af3D7",
+      "staticMerkleRootMultisigIsmFactory": "0xCA6Cb9Bc3cfF9E11003A06617cF934B684Bc78BC",
+      "staticMessageIdMultisigIsmFactory": "0xAa4Be20E9957fE21602c74d7C3cF5CB1112EA9Ef",
+      "staticAggregationIsmFactory": "0x7491843F3A5Ba24E0f17a22645bDa04A1Ae2c584",
+      "staticAggregationHookFactory": "0x15DEeAB8dECDe553bb0B1F9C00984cbcae1af3D7",
       "merkleTreeHook": "0x68eE9bec9B4dbB61f69D9D293Ae26a5AACb2e28f",
       "interchainGasPaymaster": "0xD8A76C4D91fCbB7Cc8eA795DFDF870E48368995C",
       "aggregationHook": "0x4ccC6d8eB79f2a1EC9bcb0f211fef7907631F91f",
@@ -685,7 +685,7 @@
       "validatorAnnounce": "0x30f5b08e01808643221528BB2f7953bf2830Ef38",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0xD2e905108c5e44dADA680274740f896Ea96Cf2Fb",
+      "domainRoutingIsmFactory": "0xD2e905108c5e44dADA680274740f896Ea96Cf2Fb",
       "pausableHook": "0xf753CA2269c8A7693ce1808b5709Fbf36a65D47A",
       "fallbackRoutingHook": "0xD4b132C6d4AA93A4247F1A91e1ED929c0572a43d",
       "interchainSecurityModule": "0x04938856bE60c8e734ffDe5f720E2238302BE8D2",
@@ -740,10 +740,10 @@
       },
       "storageGasOracle": "0xA3a24EC5670F1F416AB9fD554FcE2f226AE9D7eB",
       "proxyAdmin": "0xC4F7590C5d30BE959225dC75640657954A86b980",
-      "merkleRootMultisigIsmFactory": "0xa9E0E18E78b098c2DE36c42E4DDEA13ce214c592",
-      "messageIdMultisigIsmFactory": "0xEa5Be2AD66BB1BA321B7aCf0A079fBE304B09Ca0",
-      "aggregationIsmFactory": "0x81AdDD9Ca89105063DaDEBd5B4408551Ce850E22",
-      "aggregationHookFactory": "0xFeeB86e70e4a640cDd29636CCE19BD6fe8628135",
+      "staticMerkleRootMultisigIsmFactory": "0xa9E0E18E78b098c2DE36c42E4DDEA13ce214c592",
+      "staticMessageIdMultisigIsmFactory": "0xEa5Be2AD66BB1BA321B7aCf0A079fBE304B09Ca0",
+      "staticAggregationIsmFactory": "0x81AdDD9Ca89105063DaDEBd5B4408551Ce850E22",
+      "staticAggregationHookFactory": "0xFeeB86e70e4a640cDd29636CCE19BD6fe8628135",
       "mailbox": "0x5d934f4e2f797775e53561bB72aca21ba36B96BB",
       "merkleTreeHook": "0x73FbD25c3e817DC4B4Cd9d00eff6D83dcde2DfF6",
       "interchainGasPaymaster": "0x0071740Bf129b05C4684abfbBeD248D80971cce2",
@@ -752,7 +752,7 @@
       "validatorAnnounce": "0x454E1a1E1CA8B51506090f1b5399083658eA4Fc5",
       "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
       "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-      "routingIsmFactory": "0x0d0E816eE4557689d34fAd5885C53b9393C1D9fA",
+      "domainRoutingIsmFactory": "0x0d0E816eE4557689d34fAd5885C53b9393C1D9fA",
       "interchainSecurityModule": "0x9a795fB62f86146ec06e2377e3C95Af65c7C20eB",
       "fallbackRoutingHook": "0xca4cCe24E7e06241846F5EA0cda9947F0507C40C",
       "pausableHook": "0x748040afB89B8FdBb992799808215419d36A0930",
@@ -791,10 +791,10 @@
           "http": "https://polygon-zkevm.drpc.org"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-      "messageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-      "aggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
-      "aggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
+      "staticMerkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+      "staticMessageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+      "staticAggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+      "staticAggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "merkleTreeHook": "0x149db7afD694722747035d5AEC7007ccb6F8f112",
       "proxyAdmin": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
       "storageGasOracle": "0x19dc38aeae620380430C200a6E990D5Af5480117",
@@ -803,7 +803,7 @@
       "protocolFee": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
       "mailbox": "0x3a464f746D23Ab22155710f44dB16dcA53e0775E",
       "validatorAnnounce": "0x2fa5F5C96419C222cDbCeC797D696e6cE428A7A9",
-      "routingIsmFactory": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d",
+      "domainRoutingIsmFactory": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d",
       "interchainSecurityModule": "0xf2BEE9D2c15Ba9D7e06799B5912dE1F05533c141",
       "fallbackRoutingHook": "0x01aE937A7B05d187bBCBE80F44F41879D3D335a4",
       "pausableHook": "0xc2FbB9411186AB3b1a6AFCCA702D1a80B48b197c",
@@ -841,10 +841,10 @@
           "http": "https://scroll.blockpi.network/v1/rpc/public"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
-      "messageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-      "aggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-      "aggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+      "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
+      "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+      "staticAggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+      "staticAggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
       "merkleTreeHook": "0x6119E37Bd66406A1Db74920aC79C15fB8411Ba76",
       "proxyAdmin": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "storageGasOracle": "0x481171eb1aad17eDE6a56005B7F1aB00C581ef13",
@@ -853,7 +853,7 @@
       "protocolFee": "0xc3F23848Ed2e04C0c6d41bd7804fa8f89F940B94",
       "mailbox": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
       "validatorAnnounce": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
-      "routingIsmFactory": "0xe03dad16074BC5EEA9A9311257BF02Eb0B6AAA2b",
+      "domainRoutingIsmFactory": "0xe03dad16074BC5EEA9A9311257BF02Eb0B6AAA2b",
       "pausableHook": "0x4Eb82Ee35b0a1c1d776E3a3B547f9A9bA6FCC9f2",
       "fallbackRoutingHook": "0xDa7cECb05C4aeB02c1aFDE277d4306a2da7Bd762",
       "interchainSecurityModule": "0xaDc0cB48E8DB81855A930C0C1165ea3dCe4Ba5C7",
@@ -883,11 +883,11 @@
           "http": "https://viction.blockpi.network/v1/rpc/public"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
-      "messageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-      "aggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-      "aggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-      "routingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+      "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
+      "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+      "staticAggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+      "staticAggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+      "domainRoutingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "mailbox": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
       "proxyAdmin": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "validatorAnnounce": "0x2fa5F5C96419C222cDbCeC797D696e6cE428A7A9",
@@ -903,4 +903,4 @@
     }
   },
   "defaultRpcConsensusType": "fallback"
-}
\ No newline at end of file
+}
diff --git a/rust/config/testnet4_config.json b/rust/config/testnet4_config.json
index 76fcec119c..027281da98 100644
--- a/rust/config/testnet4_config.json
+++ b/rust/config/testnet4_config.json
@@ -36,10 +36,10 @@
           "http": "https://alfajores-forno.celo-testnet.org"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0xa9C7e306C0941896CA1fd528aA59089571D8D67E",
-      "messageIdMultisigIsmFactory": "0xC1b8c0e56D6a34940Ee2B86172450B54AFd633A7",
-      "aggregationIsmFactory": "0x4bE8AC22f506B1504C93C3A5b1579C5e7c550D9C",
-      "aggregationHookFactory": "0x71bB34Ee833467443628CEdFAA188B2387827Cee",
+      "staticMerkleRootMultisigIsmFactory": "0xa9C7e306C0941896CA1fd528aA59089571D8D67E",
+      "staticMessageIdMultisigIsmFactory": "0xC1b8c0e56D6a34940Ee2B86172450B54AFd633A7",
+      "staticAggregationIsmFactory": "0x4bE8AC22f506B1504C93C3A5b1579C5e7c550D9C",
+      "staticAggregationHookFactory": "0x71bB34Ee833467443628CEdFAA188B2387827Cee",
       "proxyAdmin": "0x4eDBf5846D973c53AF478cf62aB5bC92807521e3",
       "mailbox": "0xEf9F292fcEBC3848bF4bB92a96a04F9ECBb78E59",
       "validatorAnnounce": "0x3726EE36a2A9e11a40d1ffD7D9A1A16e0154cDA0",
@@ -51,7 +51,7 @@
       "fallbackRoutingHook": "0x3528B1aeF3a3d29E0eae90ad777A2b4A6a48aC3F",
       "testRecipient": "0x6489d13AcAd3B8dce4c5B31f375DE4f9451E7b38",
       "testTokenRecipient": "0x92dC0a76452a9D9358D2d2dEd8CddA209DF67c45",
-      "routingIsmFactory": "0x30d9A03762431F8A917a0C469E7A62Bf55092Ca6",
+      "domainRoutingIsmFactory": "0x30d9A03762431F8A917a0C469E7A62Bf55092Ca6",
       "index": {
         "from": 20231908
       }
@@ -92,10 +92,10 @@
       "transactionOverrides": {
         "gasPrice": 80000000000
       },
-      "merkleRootMultisigIsmFactory": "0x3E235B90197E1D6b5DB5ad5aD49f2c1ED6406382",
-      "messageIdMultisigIsmFactory": "0x0D96aF0c01c4bbbadaaF989Eb489c8783F35B763",
-      "aggregationIsmFactory": "0x40613dE82d672605Ab051C64079022Bb4F8bDE4f",
-      "aggregationHookFactory": "0xa1145B39F1c7Ef9aA593BC1DB1634b00CC020942",
+      "staticMerkleRootMultisigIsmFactory": "0x3E235B90197E1D6b5DB5ad5aD49f2c1ED6406382",
+      "staticMessageIdMultisigIsmFactory": "0x0D96aF0c01c4bbbadaaF989Eb489c8783F35B763",
+      "staticAggregationIsmFactory": "0x40613dE82d672605Ab051C64079022Bb4F8bDE4f",
+      "staticAggregationHookFactory": "0xa1145B39F1c7Ef9aA593BC1DB1634b00CC020942",
       "proxyAdmin": "0xb12282d2E838Aa5f2A4F9Ee5f624a77b7199A078",
       "storageGasOracle": "0x124EBCBC018A5D4Efe639f02ED86f95cdC3f6498",
       "interchainGasPaymaster": "0x0dD20e410bdB95404f71c5a4e7Fa67B892A5f949",
@@ -144,10 +144,10 @@
           }
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x93F50Ac4E5663DAAb03508008d592f6260964f62",
-      "messageIdMultisigIsmFactory": "0x90e1F9918F304645e4F6324E5C0EAc70138C84Ce",
-      "aggregationIsmFactory": "0xF588129ed84F219A1f0f921bE7Aa1B2176516858",
-      "aggregationHookFactory": "0x99554CC33cBCd6EDDd2f3fc9c7C9194Cb3b5df1E",
+      "staticMerkleRootMultisigIsmFactory": "0x93F50Ac4E5663DAAb03508008d592f6260964f62",
+      "staticMessageIdMultisigIsmFactory": "0x90e1F9918F304645e4F6324E5C0EAc70138C84Ce",
+      "staticAggregationIsmFactory": "0xF588129ed84F219A1f0f921bE7Aa1B2176516858",
+      "staticAggregationHookFactory": "0x99554CC33cBCd6EDDd2f3fc9c7C9194Cb3b5df1E",
       "proxyAdmin": "0x378dA02f7dC3c23A8B5ecE32b8056CdF01e8d477",
       "mailbox": "0x5b6CFf85442B851A8e6eaBd2A4E4507B5135B3B0",
       "validatorAnnounce": "0x4f7179A691F8a684f56cF7Fed65171877d30739a",
@@ -159,7 +159,7 @@
       "fallbackRoutingHook": "0xc684f7F50DB4b2563218512e021fBdd0BeD6b57E",
       "testRecipient": "0x44a7e1d76fD8AfA244AdE7278336E3D5C658D398",
       "testTokenRecipient": "0x9CC10c844B3Bbae2444E39991aB027C4A05D1F2e",
-      "routingIsmFactory": "0x683a81E0e1a238dcA7341e04c08d3bba6f0Cb74f",
+      "domainRoutingIsmFactory": "0x683a81E0e1a238dcA7341e04c08d3bba6f0Cb74f",
       "index": {
         "from": 26503317
       }
@@ -202,10 +202,10 @@
         "maxFeePerGas": 150000000000,
         "maxPriorityFeePerGas": 40000000000
       },
-      "merkleRootMultisigIsmFactory": "0xda0780ed3eE577EfE0B856E00f983bF231603307",
-      "messageIdMultisigIsmFactory": "0x23c2483ab814177bA79DCDCb5dFA1B105387AAB1",
-      "aggregationIsmFactory": "0x54b0d9AB6a99E9C9425D20fa4D9eE9dbf067e886",
-      "aggregationHookFactory": "0x54CA9De95B37365909364672D363D2ecFC4e1Af4",
+      "staticMerkleRootMultisigIsmFactory": "0xda0780ed3eE577EfE0B856E00f983bF231603307",
+      "staticMessageIdMultisigIsmFactory": "0x23c2483ab814177bA79DCDCb5dFA1B105387AAB1",
+      "staticAggregationIsmFactory": "0x54b0d9AB6a99E9C9425D20fa4D9eE9dbf067e886",
+      "staticAggregationHookFactory": "0x54CA9De95B37365909364672D363D2ecFC4e1Af4",
       "merkleTreeHook": "0x9AF85731EDd41E2E50F81Ef8a0A69D2fB836EDf9",
       "proxyAdmin": "0xa99aD6B1c10E92DB8d3510f1865A6d2Ab43EAd58",
       "storageGasOracle": "0xBEd8Fd6d5c6cBd878479C25f4725C7c842a43821",
@@ -217,7 +217,7 @@
       "fallbackRoutingHook": "0x31191BA83143b4745745389fEe64990c65F36829",
       "testRecipient": "0xF45A4D54223DA32bf7b5D43a9a460Ef3C94C713B",
       "testTokenRecipient": "0x57d098e6952B6C1c85Ce0B68C9Deada3dCf7D05A",
-      "routingIsmFactory": "0x832Ea28749C93C05E5AaF8207E4e61Bd56aE3877",
+      "domainRoutingIsmFactory": "0x832Ea28749C93C05E5AaF8207E4e61Bd56aE3877",
       "index": {
         "from": 40879305
       }
@@ -257,11 +257,11 @@
       "transactionOverrides": {
         "gasPrice": 1000000
       },
-      "merkleRootMultisigIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
-      "messageIdMultisigIsmFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
-      "aggregationIsmFactory": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
-      "aggregationHookFactory": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
-      "routingIsmFactory": "0x54148470292C24345fb828B003461a9444414517",
+      "staticMerkleRootMultisigIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
+      "staticMessageIdMultisigIsmFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
+      "staticAggregationIsmFactory": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
+      "staticAggregationHookFactory": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
+      "domainRoutingIsmFactory": "0x54148470292C24345fb828B003461a9444414517",
       "mailbox": "0x33dB966328Ea213b0f76eF96CA368AB37779F065",
       "proxyAdmin": "0x589C201a07c26b4725A4A829d772f24423da480B",
       "validatorAnnounce": "0x20c44b1E3BeaDA1e9826CFd48BeEDABeE9871cE9",
@@ -307,10 +307,10 @@
           "http": "https://sepolia-rpc.scroll.io"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7",
-      "messageIdMultisigIsmFactory": "0xeb6f11189197223c656807a83B0DD374f9A6dF44",
-      "aggregationIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
-      "aggregationHookFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
+      "staticMerkleRootMultisigIsmFactory": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7",
+      "staticMessageIdMultisigIsmFactory": "0xeb6f11189197223c656807a83B0DD374f9A6dF44",
+      "staticAggregationIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
+      "staticAggregationHookFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
       "proxyAdmin": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8",
       "mailbox": "0x3C5154a193D6e2955650f9305c8d80c18C814A68",
       "validatorAnnounce": "0x527768930D889662Fe7ACF64294871e86e4C2381",
@@ -322,7 +322,7 @@
       "fallbackRoutingHook": "0xE1CCB130389f687bf745Dd6dc05E50da17d9ea96",
       "testRecipient": "0xa3AB7E6cE24E6293bD5320A53329Ef2f4DE73fCA",
       "testTokenRecipient": "0xc76E477437065093D353b7d56c81ff54D167B0Ab",
-      "routingIsmFactory": "0x17866ebE0e503784a9461d3e753dEeD0d3F61153",
+      "domainRoutingIsmFactory": "0x17866ebE0e503784a9461d3e753dEeD0d3F61153",
       "index": {
         "from": 1344054
       }
@@ -363,10 +363,10 @@
           "http": "https://rpc.sepolia.org"
         }
       ],
-      "merkleRootMultisigIsmFactory": "0x0a71AcC99967829eE305a285750017C4916Ca269",
-      "messageIdMultisigIsmFactory": "0xFEb9585b2f948c1eD74034205a7439261a9d27DD",
-      "aggregationIsmFactory": "0xC83e12EF2627ACE445C298e6eC418684918a6002",
-      "aggregationHookFactory": "0x160C28C92cA453570aD7C031972b58d5Dd128F72",
+      "staticMerkleRootMultisigIsmFactory": "0x0a71AcC99967829eE305a285750017C4916Ca269",
+      "staticMessageIdMultisigIsmFactory": "0xFEb9585b2f948c1eD74034205a7439261a9d27DD",
+      "staticAggregationIsmFactory": "0xC83e12EF2627ACE445C298e6eC418684918a6002",
+      "staticAggregationHookFactory": "0x160C28C92cA453570aD7C031972b58d5Dd128F72",
       "proxyAdmin": "0x97Bbc6bBaFa5Ce3b2FA966c121Af63bD09e940f8",
       "storageGasOracle": "0x71775B071F77F1ce52Ece810ce084451a3045FFe",
       "interchainGasPaymaster": "0x6f2756380FD49228ae25Aa7F2817993cB74Ecc56",
@@ -378,7 +378,7 @@
       "fallbackRoutingHook": "0x17Dc724B7a2F09141C13b8AC33B396073785c2BC",
       "testRecipient": "0xeDc1A3EDf87187085A3ABb7A9a65E1e7aE370C07",
       "testTokenRecipient": "0x031AD9c560D37baC7d6Bd2d27A2443bAfd10101A",
-      "routingIsmFactory": "0x3F100cBBE5FD5466BdB4B3a15Ac226957e7965Ad",
+      "domainRoutingIsmFactory": "0x3F100cBBE5FD5466BdB4B3a15Ac226957e7965Ad",
       "interchainSecurityModule": "0x958124472b14B7940Ed5317C44a2508791dB1d48",
       "pausableHook": "0xa68022e53Fd28119D07C8336a8eC84A298Fd38Fd",
       "index": {
diff --git a/typescript/cli/examples/contract-artifacts.yaml b/typescript/cli/examples/contract-artifacts.yaml
index 04f690045c..1227611afd 100644
--- a/typescript/cli/examples/contract-artifacts.yaml
+++ b/typescript/cli/examples/contract-artifacts.yaml
@@ -12,9 +12,9 @@ anvil1:
   multisigIsm: '0x9bDE63104EE030d9De419EEd6bA7D14b86D6fE3f'
   testRecipient: '0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35'
   interchainAccountIsm: '0x5e8ee6840caa4f367aff1FF28aA36D5B1b836d35'
-  aggregationIsmFactory: '0xc864fa3B662613cA5051f41e157d0a997f9a5A87'
-  routingIsmFactory: '0x1fdfD1486b8339638C6b92f8a96D698D8182D2b1'
+  staticAggregationIsmFactory: '0xc864fa3B662613cA5051f41e157d0a997f9a5A87'
+  domainRoutingIsmFactory: '0x1fdfD1486b8339638C6b92f8a96D698D8182D2b1'
   interchainQueryRouter: '0xA837e38C3F7D509DF3a7a0fCf65E3814DB6c2618'
   interchainAccountRouter: '0x9521291A43ebA3aD3FD24d610F4b7F7543C8d761'
-  merkleRootMultisigIsmFactory: '0x82140b2ddAd4E4dd7e1D6757Fb5F9485c230B79d'
-  messageIdMultisigIsmFactory: '0x1079056da3EC7D55521F27e1E094015C0d39Cc65'
+  staticMerkleRootMultisigIsmFactory: '0x82140b2ddAd4E4dd7e1D6757Fb5F9485c230B79d'
+  staticMessageIdMultisigIsmFactory: '0x1079056da3EC7D55521F27e1E094015C0d39Cc65'
diff --git a/typescript/infra/config/environments/mainnet3/ism/verification.json b/typescript/infra/config/environments/mainnet3/ism/verification.json
index 1b8f42b360..6098085542 100644
--- a/typescript/infra/config/environments/mainnet3/ism/verification.json
+++ b/typescript/infra/config/environments/mainnet3/ism/verification.json
@@ -1,7 +1,7 @@
 {
   "celo": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x4C96a1abc44dc846775CE702C9E9BE821D3b487c",
       "constructorArguments": "",
       "isProxy": false
@@ -13,7 +13,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xaB402f227e892Ef37C105bf06619c0fa106a1fB2",
       "constructorArguments": "",
       "isProxy": false
@@ -25,7 +25,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x1722dd970a1F56040712129f5Eeb76B003fd7500",
       "constructorArguments": "",
       "isProxy": false
@@ -37,7 +37,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xc3745652EFB8555A8b064A0EA78d295133d326D2",
       "constructorArguments": "",
       "isProxy": false
@@ -49,7 +49,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xec748b5623f0B50E4c5eB1CFa7Bd46C3213608b6",
       "constructorArguments": "",
       "isProxy": false
@@ -145,7 +145,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x2A2c22B0a8615ad24839fA6Af302E896Af32d1a3",
       "constructorArguments": "",
       "isProxy": false
@@ -189,7 +189,7 @@
   ],
   "ethereum": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x47e8aF9e30C32Ab91060ED587894288786761B45",
       "constructorArguments": "",
       "isProxy": false
@@ -201,7 +201,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xfA21D9628ADce86531854C2B7ef00F07394B0B69",
       "constructorArguments": "",
       "isProxy": false
@@ -213,7 +213,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x46FA191Ad972D9674Ed752B69f9659A0d7b22846",
       "constructorArguments": "",
       "isProxy": false
@@ -225,7 +225,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x6D2555A8ba483CcF4409C39013F5e9a3285D3C9E",
       "constructorArguments": "",
       "isProxy": false
@@ -237,7 +237,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xCb74c6aE411236CEE6803619916694BE86cF5987",
       "constructorArguments": "",
       "isProxy": false
@@ -333,7 +333,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x28fA9552F19039b450498B0d8e5DEAe0d0aAc559",
       "constructorArguments": "",
       "isProxy": false
@@ -377,7 +377,7 @@
   ],
   "avalanche": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x896cF1D1B66cD211633eDd589fF158E8Cfaf9B54",
       "constructorArguments": "",
       "isProxy": false
@@ -389,7 +389,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8819D653DF5b1FC0DdB32189a2704E471AF8483c",
       "constructorArguments": "",
       "isProxy": false
@@ -401,7 +401,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0xa5E13796eB7d2EDCc88012c8cfF90D69B51FcF9f",
       "constructorArguments": "",
       "isProxy": false
@@ -413,7 +413,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x3bF6Ac986C7Af9A9Ac356C0e99C0041EFd8D96e7",
       "constructorArguments": "",
       "isProxy": false
@@ -425,7 +425,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xA9Ddc70f50009aF8bDB312aA757B4304b0F7BbB3",
       "constructorArguments": "",
       "isProxy": false
@@ -521,7 +521,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x28F7907911C7E321c596686AE6D1F20516450037",
       "constructorArguments": "",
       "isProxy": false
@@ -565,7 +565,7 @@
   ],
   "polygon": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xa9E0E18E78b098c2DE36c42E4DDEA13ce214c592",
       "constructorArguments": "",
       "isProxy": false
@@ -577,7 +577,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xEa5Be2AD66BB1BA321B7aCf0A079fBE304B09Ca0",
       "constructorArguments": "",
       "isProxy": false
@@ -589,7 +589,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x81AdDD9Ca89105063DaDEBd5B4408551Ce850E22",
       "constructorArguments": "",
       "isProxy": false
@@ -601,7 +601,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xFeeB86e70e4a640cDd29636CCE19BD6fe8628135",
       "constructorArguments": "",
       "isProxy": false
@@ -613,7 +613,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xF0752A65ffB2153EaE53F6a70c858a87022d5c56",
       "constructorArguments": "",
       "isProxy": false
@@ -709,7 +709,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x0d0E816eE4557689d34fAd5885C53b9393C1D9fA",
       "constructorArguments": "",
       "isProxy": false
@@ -753,7 +753,7 @@
   ],
   "bsc": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xfADBc81Ca8A957F1Bf7c78bCc575b28DBDE042b6",
       "constructorArguments": "",
       "isProxy": false
@@ -765,7 +765,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x4B1d8352E35e3BDE36dF5ED2e73C24E35c4a96b7",
       "constructorArguments": "",
       "isProxy": false
@@ -777,7 +777,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x38B3878c4fb44d201DA924c4a04bae3EE728c065",
       "constructorArguments": "",
       "isProxy": false
@@ -807,7 +807,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xe70E86a7D1e001D419D71F960Cb6CaD59b6A3dB6",
       "constructorArguments": "",
       "isProxy": false
@@ -819,7 +819,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xc40481D13419BC8090e6AD07074Ef39E538c09CE",
       "constructorArguments": "",
       "isProxy": false
@@ -855,7 +855,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xe6Af5720d34213C805C08e2470aea979e3F72F75",
       "constructorArguments": "",
       "isProxy": false
@@ -899,7 +899,7 @@
   ],
   "optimism": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xCA6Cb9Bc3cfF9E11003A06617cF934B684Bc78BC",
       "constructorArguments": "",
       "isProxy": false
@@ -911,7 +911,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xAa4Be20E9957fE21602c74d7C3cF5CB1112EA9Ef",
       "constructorArguments": "",
       "isProxy": false
@@ -923,7 +923,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x7491843F3A5Ba24E0f17a22645bDa04A1Ae2c584",
       "constructorArguments": "",
       "isProxy": false
@@ -935,7 +935,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x15DEeAB8dECDe553bb0B1F9C00984cbcae1af3D7",
       "constructorArguments": "",
       "isProxy": false
@@ -947,7 +947,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x89E3530137aD51743536443a3EC838b502E72eb7",
       "constructorArguments": "",
       "isProxy": false
@@ -1013,7 +1013,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xD2e905108c5e44dADA680274740f896Ea96Cf2Fb",
       "constructorArguments": "",
       "isProxy": false
@@ -1057,7 +1057,7 @@
   ],
   "arbitrum": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x3C330D4A2e2b8443AFaB8E326E64ab4251B7Eae0",
       "constructorArguments": "",
       "isProxy": false
@@ -1069,7 +1069,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x12Df53079d399a47e9E730df095b712B0FDFA791",
       "constructorArguments": "",
       "isProxy": false
@@ -1081,7 +1081,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0xD4883084389fC1Eeb4dAfB2ADcFc36B711c310EB",
       "constructorArguments": "",
       "isProxy": false
@@ -1093,7 +1093,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x9B5f440bBb64Fee337F37e03362b628711Ea09C7",
       "constructorArguments": "",
       "isProxy": false
@@ -1105,7 +1105,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xC020F8A7b00178dFA0fcC75C159e14b79F8e5c63",
       "constructorArguments": "",
       "isProxy": false
@@ -1171,7 +1171,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xa2931C37957f3079d3B21b877d56E1db930e02a5",
       "constructorArguments": "",
       "isProxy": false
@@ -1215,7 +1215,7 @@
   ],
   "scroll": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
       "constructorArguments": "",
       "isProxy": false
@@ -1227,7 +1227,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
       "constructorArguments": "",
       "isProxy": false
@@ -1239,7 +1239,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
       "constructorArguments": "",
       "isProxy": false
@@ -1251,7 +1251,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
       "constructorArguments": "",
       "isProxy": false
@@ -1263,7 +1263,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "constructorArguments": "",
       "isProxy": false
@@ -1359,7 +1359,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xe03dad16074BC5EEA9A9311257BF02Eb0B6AAA2b",
       "constructorArguments": "",
       "isProxy": false
@@ -1403,7 +1403,7 @@
   ],
   "base": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
       "constructorArguments": "",
       "isProxy": false
@@ -1415,7 +1415,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
       "constructorArguments": "",
       "isProxy": false
@@ -1427,7 +1427,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
       "constructorArguments": "",
       "isProxy": false
@@ -1439,7 +1439,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "constructorArguments": "",
       "isProxy": false
@@ -1451,7 +1451,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "constructorArguments": "",
       "isProxy": false
@@ -1547,7 +1547,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503",
       "constructorArguments": "",
       "isProxy": false
@@ -1591,7 +1591,7 @@
   ],
   "polygonzkevm": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
       "constructorArguments": "",
       "isProxy": false
@@ -1603,7 +1603,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
       "constructorArguments": "",
       "isProxy": false
@@ -1615,7 +1615,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "constructorArguments": "",
       "isProxy": false
@@ -1627,7 +1627,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
       "constructorArguments": "",
       "isProxy": false
@@ -1639,7 +1639,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x4Ed7d626f1E96cD1C0401607Bf70D95243E3dEd1",
       "constructorArguments": "",
       "isProxy": false
@@ -1735,7 +1735,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d",
       "constructorArguments": "",
       "isProxy": false
@@ -1779,7 +1779,7 @@
   ],
   "gnosis": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x8E273260EAd8B72A085B19346A676d355740e875",
       "constructorArguments": "",
       "isProxy": false
@@ -1791,7 +1791,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x603f46cc520d2fc22957b81e206408590808F02F",
       "constructorArguments": "",
       "isProxy": false
@@ -1803,7 +1803,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x11EF91d17c5ad3330DbCa709a8841743d3Af6819",
       "constructorArguments": "",
       "isProxy": false
@@ -1815,7 +1815,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xbC8AA096dabDf4A0200BB9f8D4Cbb644C3D86d7B",
       "constructorArguments": "",
       "isProxy": false
@@ -1827,7 +1827,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xe522A5DcA58e3ab7fEd2bf25DA3E8d90c14083a8",
       "constructorArguments": "",
       "isProxy": false
@@ -1893,7 +1893,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xd9Cc2e652A162bb93173d1c44d46cd2c0bbDA59D",
       "constructorArguments": "",
       "isProxy": false
@@ -1923,13 +1923,13 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xd9Cc2e652A162bb93173d1c44d46cd2c0bbDA59D",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x28846fCb579747E8ddad9E93b55BE51b0A1Bf1f3",
       "constructorArguments": "",
       "isProxy": false
@@ -1941,13 +1941,13 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8528bAa7d1d386E7967603e480fa2B558a23644c",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x28846fCb579747E8ddad9E93b55BE51b0A1Bf1f3",
       "constructorArguments": "",
       "isProxy": false
@@ -1959,7 +1959,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8528bAa7d1d386E7967603e480fa2B558a23644c",
       "constructorArguments": "",
       "isProxy": false
@@ -2019,7 +2019,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xbB5Df000113e767dE11343A16f83De733e5bCC0F",
       "constructorArguments": "",
       "isProxy": false
@@ -2063,7 +2063,7 @@
   ],
   "moonbeam": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xE2f485bc031Feb5a4C41C1967bf028653d75f0C3",
       "constructorArguments": "",
       "isProxy": false
@@ -2075,7 +2075,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x84Df48F8f241f11d0fA302d09d73030429Bd9C73",
       "constructorArguments": "",
       "isProxy": false
@@ -2087,7 +2087,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x40c6Abcb6A2CdC8882d4bEcaC47927005c7Bb8c2",
       "constructorArguments": "",
       "isProxy": false
@@ -2099,7 +2099,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x59cC3E7A49DdC4893eB8754c7908f96072A7DbE8",
       "constructorArguments": "",
       "isProxy": false
@@ -2111,7 +2111,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x98Aa6239FfCcEc73A662a5e5e26Bc3fD7c7291B7",
       "constructorArguments": "",
       "isProxy": false
@@ -2185,7 +2185,7 @@
   ],
   "viction": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
       "constructorArguments": "",
       "isProxy": false
@@ -2197,7 +2197,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
       "constructorArguments": "",
       "isProxy": false
@@ -2209,7 +2209,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
       "constructorArguments": "",
       "isProxy": false
@@ -2221,7 +2221,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
       "constructorArguments": "",
       "isProxy": false
@@ -2233,7 +2233,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "constructorArguments": "",
       "isProxy": false
@@ -2247,7 +2247,7 @@
   ],
   "inevm": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
       "constructorArguments": "",
       "isProxy": false
@@ -2259,7 +2259,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
       "constructorArguments": "",
       "isProxy": false
@@ -2271,7 +2271,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
       "constructorArguments": "",
       "isProxy": false
@@ -2283,7 +2283,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
       "constructorArguments": "",
       "isProxy": false
@@ -2295,7 +2295,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
       "constructorArguments": "",
       "isProxy": false
diff --git a/typescript/infra/config/environments/testnet4/ism/verification.json b/typescript/infra/config/environments/testnet4/ism/verification.json
index 9769ccad24..c792693257 100644
--- a/typescript/infra/config/environments/testnet4/ism/verification.json
+++ b/typescript/infra/config/environments/testnet4/ism/verification.json
@@ -19,25 +19,25 @@
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x6525Ac4008E38e0E70DaEf59d5f0e1721bd8aA83",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x4C739E01f295B70762C0bA9D86123E1775C2f703",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x9A574458497FCaB5E5673a2610C108725002DbA3",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xa9C7e306C0941896CA1fd528aA59089571D8D67E",
       "constructorArguments": "",
       "isProxy": false
@@ -47,7 +47,7 @@
       "address": "0x826Ab153e944cE1B251aBD174071DF70d71132D7"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xC1b8c0e56D6a34940Ee2B86172450B54AFd633A7",
       "constructorArguments": "",
       "isProxy": false
@@ -57,7 +57,7 @@
       "address": "0x78ebeCE0fCAa39F0F0C422E87EBd6BcB708aa763"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x4bE8AC22f506B1504C93C3A5b1579C5e7c550D9C",
       "constructorArguments": "",
       "isProxy": false
@@ -67,7 +67,7 @@
       "address": "0xd93F514f36d528DCDc3af1C92788f1bf1f480A7f"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x71bB34Ee833467443628CEdFAA188B2387827Cee",
       "constructorArguments": "",
       "isProxy": false
@@ -77,7 +77,7 @@
       "address": "0x019e0a350D85eF67250dD88CD6477ad5E0c6E31e"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x37308d498bc7B0f002cb02Cf8fA01770dC2169c8",
       "constructorArguments": "",
       "isProxy": false
@@ -327,19 +327,19 @@
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x76a1aaE73e9D837ceF10Ac5AF5AfDD30d7612f98",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xA1e6d12a3F5F7e05E4D6cb39E71534F27fE29561",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xc25e8cE0960fa2573AFa591484F2cA6e4497C2e5",
       "constructorArguments": "",
       "isProxy": false
@@ -349,7 +349,7 @@
       "address": "0x074D3C4249AFdac44B70d1D220F358Ff895F7a80"
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x93F50Ac4E5663DAAb03508008d592f6260964f62",
       "constructorArguments": "",
       "isProxy": false
@@ -359,7 +359,7 @@
       "address": "0x0683D0258A162a87E1F25C454BaA4e9E9DE46B0a"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x90e1F9918F304645e4F6324E5C0EAc70138C84Ce",
       "constructorArguments": "",
       "isProxy": false
@@ -369,7 +369,7 @@
       "address": "0xd3262339D39103a4b41379b183b0311B78c9a11F"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0xF588129ed84F219A1f0f921bE7Aa1B2176516858",
       "constructorArguments": "",
       "isProxy": false
@@ -379,7 +379,7 @@
       "address": "0x6716Ef4e72c74e66eB40198B16b4379a763fCEd8"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x99554CC33cBCd6EDDd2f3fc9c7C9194Cb3b5df1E",
       "constructorArguments": "",
       "isProxy": false
@@ -389,7 +389,7 @@
       "address": "0xBDD7Cfb61D7ae89343b428D3E527BDA9705c4EAC"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xf9271189Cb30AD1F272f1A9EB2272224135B9350",
       "constructorArguments": "",
       "isProxy": false
@@ -523,7 +523,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x683a81E0e1a238dcA7341e04c08d3bba6f0Cb74f",
       "constructorArguments": "",
       "isProxy": false
@@ -645,19 +645,19 @@
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xbA38823853Fa2994823F3E62d3EAC5cC701C8CCA",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x5F8A06fb970775C0C317AF6AfA5aD45B11FBD342",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xda0780ed3eE577EfE0B856E00f983bF231603307",
       "constructorArguments": "",
       "isProxy": false
@@ -667,7 +667,7 @@
       "address": "0xEd57F6Eb1750610b3879F7F5093267AF10b3a67D"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x23c2483ab814177bA79DCDCb5dFA1B105387AAB1",
       "constructorArguments": "",
       "isProxy": false
@@ -677,7 +677,7 @@
       "address": "0x4265E4082290e2beF66670A0fb117F3aA0aa126D"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x54b0d9AB6a99E9C9425D20fa4D9eE9dbf067e886",
       "constructorArguments": "",
       "isProxy": false
@@ -687,7 +687,7 @@
       "address": "0xE0978760a9E66E6B9101eAA08A73155C5F61d29D"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x54CA9De95B37365909364672D363D2ecFC4e1Af4",
       "constructorArguments": "",
       "isProxy": false
@@ -697,7 +697,7 @@
       "address": "0xe18F31FCd00D8DA65A11610a55458d84b2700a3d"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x276C07098879f44F6C4a6ab91B6AAca6a56AD4B1",
       "constructorArguments": "",
       "isProxy": false
@@ -731,7 +731,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x832Ea28749C93C05E5AaF8207E4e61Bd56aE3877",
       "constructorArguments": "",
       "isProxy": false
@@ -853,19 +853,19 @@
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x8DA546024850D998Be3b65204c0F0f63C1f3B0A1",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x7Bc0bb71aE0E9bDC0Ac53e932870728D95FA28bF",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x3E235B90197E1D6b5DB5ad5aD49f2c1ED6406382",
       "constructorArguments": "",
       "isProxy": false
@@ -875,7 +875,7 @@
       "address": "0x9b13f3d75797951f463D61092Bba7947c8cEb25c"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x0D96aF0c01c4bbbadaaF989Eb489c8783F35B763",
       "constructorArguments": "",
       "isProxy": false
@@ -885,7 +885,7 @@
       "address": "0x25069c25466B1F21E0D22f467a5f91bc7b24b515"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x40613dE82d672605Ab051C64079022Bb4F8bDE4f",
       "constructorArguments": "",
       "isProxy": false
@@ -895,7 +895,7 @@
       "address": "0x25adfb5Ddf378EC77cd5842Ff33B96277E4DD29b"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0xa1145B39F1c7Ef9aA593BC1DB1634b00CC020942",
       "constructorArguments": "",
       "isProxy": false
@@ -905,7 +905,7 @@
       "address": "0x3938ED4c6b5a7f9947C44e58e36a864F03228175"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xea12ECFD1f241da323e93F12b4ed936403990190",
       "constructorArguments": "",
       "isProxy": false
@@ -1087,19 +1087,19 @@
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xA9999B4abC373FF2BB95B8725FABC96CA883d811",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xCCC126d96efcc342BF2781A7d224D3AB1F25B19C",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x0a71AcC99967829eE305a285750017C4916Ca269",
       "constructorArguments": "",
       "isProxy": false
@@ -1109,7 +1109,7 @@
       "address": "0xbe94Cd5d0973dB4A6E63Cb9e6b2b2042D99F9Bcd"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xFEb9585b2f948c1eD74034205a7439261a9d27DD",
       "constructorArguments": "",
       "isProxy": false
@@ -1119,7 +1119,7 @@
       "address": "0x218C5DFb7C2bC1e051FCFebBa8C6D66Dda28617E"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0xC83e12EF2627ACE445C298e6eC418684918a6002",
       "constructorArguments": "",
       "isProxy": false
@@ -1129,7 +1129,7 @@
       "address": "0x3dD1aB6B71EBfEd239869365FE5B8b47E0507d89"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x160C28C92cA453570aD7C031972b58d5Dd128F72",
       "constructorArguments": "",
       "isProxy": false
@@ -1139,7 +1139,7 @@
       "address": "0x4BC580FF77Dd1Eb320E96D34FddC97F0F04D3feD"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x3603458990BfEb30f99E61B58427d196814D8ce1",
       "constructorArguments": "",
       "isProxy": false
@@ -1253,7 +1253,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x3F100cBBE5FD5466BdB4B3a15Ac226957e7965Ad",
       "constructorArguments": "",
       "isProxy": false
@@ -1285,19 +1285,19 @@
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x0616A79374e81eB1d2275eCe5837aD050f9c53f1",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x3D696c38Dd958e635f9077e65b64aA9cf7c92627",
       "constructorArguments": "",
       "isProxy": false
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0xA59Ba0A8D4ea5A5DC9c8B0101ba7E6eE6C3399A4",
       "constructorArguments": "",
       "isProxy": false
@@ -1307,7 +1307,7 @@
       "address": "0x97B07A8BCc0d212A4C76679b303A4C6441BB6186"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x8f919348F9C4619A196Acb5e377f49E5E2C0B569",
       "constructorArguments": "",
       "isProxy": false
@@ -1317,7 +1317,7 @@
       "address": "0xb1Fc72f251A6b6c37CD4Ef8f9287578BCc7CE9Eb"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x0048FaB53526D9a0478f66D660059E3E3611FE3E",
       "constructorArguments": "",
       "isProxy": false
@@ -1327,7 +1327,7 @@
       "address": "0x13b6Cb8d51C7e15e5fFee432CBB1d4614972A87e"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x00DFB81Bfc45fa03060b605273147F274ea807E5",
       "constructorArguments": "",
       "isProxy": false
@@ -1337,7 +1337,7 @@
       "address": "0x713496A1477a08230E526a4e9449FCCE4d6523e9"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x385C7f179168f5Da92c72E17AE8EF50F3874077f",
       "constructorArguments": "",
       "isProxy": false
@@ -1451,7 +1451,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xE8F752e5C4E1A6a2e3eAfa42d44D601A22d78f2b",
       "constructorArguments": "",
       "isProxy": false
@@ -1465,7 +1465,7 @@
   ],
   "scrollsepolia": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x6E7b29CB2A7617405B4d30C6f84bBD51b4Bb4be8",
       "constructorArguments": "",
       "isProxy": false
@@ -1475,7 +1475,7 @@
       "address": "0x209e7F9d40954E230008B9bb076a0901d32695e5"
     },
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7",
       "constructorArguments": "",
       "isProxy": false
@@ -1485,7 +1485,7 @@
       "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360"
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0xeb6f11189197223c656807a83B0DD374f9A6dF44",
       "constructorArguments": "",
       "isProxy": false
@@ -1495,7 +1495,7 @@
       "address": "0x3e6F45B03314bD21BcE4201666d483291575E391"
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
       "constructorArguments": "",
       "isProxy": false
@@ -1505,7 +1505,7 @@
       "address": "0x87935eB971eaA9826060261b07a919451dfd0409"
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x44b764045BfDC68517e10e783E69B376cef196B2",
       "constructorArguments": "",
       "isProxy": false
@@ -1515,7 +1515,7 @@
       "address": "0xE5cA56294dA5Bd490D5Bc489B177B002ad16AF83"
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
       "constructorArguments": "",
       "isProxy": false
@@ -1629,7 +1629,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x17866ebE0e503784a9461d3e753dEeD0d3F61153",
       "constructorArguments": "",
       "isProxy": false
@@ -1643,7 +1643,7 @@
   ],
   "plumetestnet": [
     {
-      "name": "MerkleRootMultisigIsmFactory",
+      "name": "StaticMerkleRootMultisigIsmFactory",
       "address": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
       "constructorArguments": "",
       "isProxy": false
@@ -1655,7 +1655,7 @@
       "isProxy": true
     },
     {
-      "name": "MessageIdMultisigIsmFactory",
+      "name": "StaticMessageIdMultisigIsmFactory",
       "address": "0x44b764045BfDC68517e10e783E69B376cef196B2",
       "constructorArguments": "",
       "isProxy": false
@@ -1667,7 +1667,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationIsmFactory",
+      "name": "StaticAggregationIsmFactory",
       "address": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
       "constructorArguments": "",
       "isProxy": false
@@ -1679,7 +1679,7 @@
       "isProxy": true
     },
     {
-      "name": "AggregationHookFactory",
+      "name": "StaticAggregationHookFactory",
       "address": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
       "constructorArguments": "",
       "isProxy": false
@@ -1691,7 +1691,7 @@
       "isProxy": true
     },
     {
-      "name": "RoutingIsmFactory",
+      "name": "DomainRoutingIsmFactory",
       "address": "0x54148470292C24345fb828B003461a9444414517",
       "constructorArguments": "",
       "isProxy": false
diff --git a/typescript/sdk/src/consts/environments/mainnet.json b/typescript/sdk/src/consts/environments/mainnet.json
index 82f22b523a..62842ffde9 100644
--- a/typescript/sdk/src/consts/environments/mainnet.json
+++ b/typescript/sdk/src/consts/environments/mainnet.json
@@ -2,10 +2,10 @@
   "polygon": {
     "storageGasOracle": "0xA3a24EC5670F1F416AB9fD554FcE2f226AE9D7eB",
     "proxyAdmin": "0xC4F7590C5d30BE959225dC75640657954A86b980",
-    "merkleRootMultisigIsmFactory": "0xa9E0E18E78b098c2DE36c42E4DDEA13ce214c592",
-    "messageIdMultisigIsmFactory": "0xEa5Be2AD66BB1BA321B7aCf0A079fBE304B09Ca0",
-    "aggregationIsmFactory": "0x81AdDD9Ca89105063DaDEBd5B4408551Ce850E22",
-    "aggregationHookFactory": "0xFeeB86e70e4a640cDd29636CCE19BD6fe8628135",
+    "staticMerkleRootMultisigIsmFactory": "0xa9E0E18E78b098c2DE36c42E4DDEA13ce214c592",
+    "staticMessageIdMultisigIsmFactory": "0xEa5Be2AD66BB1BA321B7aCf0A079fBE304B09Ca0",
+    "staticAggregationIsmFactory": "0x81AdDD9Ca89105063DaDEBd5B4408551Ce850E22",
+    "staticAggregationHookFactory": "0xFeeB86e70e4a640cDd29636CCE19BD6fe8628135",
     "mailbox": "0x5d934f4e2f797775e53561bB72aca21ba36B96BB",
     "merkleTreeHook": "0x73FbD25c3e817DC4B4Cd9d00eff6D83dcde2DfF6",
     "interchainGasPaymaster": "0x0071740Bf129b05C4684abfbBeD248D80971cce2",
@@ -14,7 +14,7 @@
     "validatorAnnounce": "0x454E1a1E1CA8B51506090f1b5399083658eA4Fc5",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0x0d0E816eE4557689d34fAd5885C53b9393C1D9fA",
+    "domainRoutingIsmFactory": "0x0d0E816eE4557689d34fAd5885C53b9393C1D9fA",
     "interchainSecurityModule": "0x9a795fB62f86146ec06e2377e3C95Af65c7C20eB",
     "fallbackRoutingHook": "0xca4cCe24E7e06241846F5EA0cda9947F0507C40C",
     "pausableHook": "0x748040afB89B8FdBb992799808215419d36A0930"
@@ -22,10 +22,10 @@
   "bsc": {
     "storageGasOracle": "0x91d23D603d60445411C06e6443d81395593B7940",
     "proxyAdmin": "0x65993Af9D0D3a64ec77590db7ba362D6eB78eF70",
-    "merkleRootMultisigIsmFactory": "0xfADBc81Ca8A957F1Bf7c78bCc575b28DBDE042b6",
-    "messageIdMultisigIsmFactory": "0x4B1d8352E35e3BDE36dF5ED2e73C24E35c4a96b7",
-    "aggregationIsmFactory": "0x38B3878c4fb44d201DA924c4a04bae3EE728c065",
-    "aggregationHookFactory": "0xe70E86a7D1e001D419D71F960Cb6CaD59b6A3dB6",
+    "staticMerkleRootMultisigIsmFactory": "0xfADBc81Ca8A957F1Bf7c78bCc575b28DBDE042b6",
+    "staticMessageIdMultisigIsmFactory": "0x4B1d8352E35e3BDE36dF5ED2e73C24E35c4a96b7",
+    "staticAggregationIsmFactory": "0x38B3878c4fb44d201DA924c4a04bae3EE728c065",
+    "staticAggregationHookFactory": "0xe70E86a7D1e001D419D71F960Cb6CaD59b6A3dB6",
     "mailbox": "0x2971b9Aec44bE4eb673DF1B88cDB57b96eefe8a4",
     "merkleTreeHook": "0xFDb9Cd5f9daAA2E4474019405A328a88E7484f26",
     "interchainGasPaymaster": "0x78E25e7f84416e69b9339B0A6336EB6EFfF6b451",
@@ -34,7 +34,7 @@
     "validatorAnnounce": "0x7024078130D9c2100fEA474DAD009C2d1703aCcd",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0xe6Af5720d34213C805C08e2470aea979e3F72F75",
+    "domainRoutingIsmFactory": "0xe6Af5720d34213C805C08e2470aea979e3F72F75",
     "interchainSecurityModule": "0xab3df354baBee6c2B88E2CeD3b2e030e31aA5e61",
     "fallbackRoutingHook": "0x237E81f87F57Badad9e09f13CC676D986cA852e7",
     "pausableHook": "0x7DBdAd1b4A922B65d37d7258a4227b6658344b7f"
@@ -42,10 +42,10 @@
   "arbitrum": {
     "storageGasOracle": "0xD3805207b65d99C075ceA938Fa7c0587026a5DF5",
     "proxyAdmin": "0x80Cebd56A65e46c474a1A101e89E76C4c51D179c",
-    "merkleRootMultisigIsmFactory": "0x3C330D4A2e2b8443AFaB8E326E64ab4251B7Eae0",
-    "messageIdMultisigIsmFactory": "0x12Df53079d399a47e9E730df095b712B0FDFA791",
-    "aggregationIsmFactory": "0xD4883084389fC1Eeb4dAfB2ADcFc36B711c310EB",
-    "aggregationHookFactory": "0x9B5f440bBb64Fee337F37e03362b628711Ea09C7",
+    "staticMerkleRootMultisigIsmFactory": "0x3C330D4A2e2b8443AFaB8E326E64ab4251B7Eae0",
+    "staticMessageIdMultisigIsmFactory": "0x12Df53079d399a47e9E730df095b712B0FDFA791",
+    "staticAggregationIsmFactory": "0xD4883084389fC1Eeb4dAfB2ADcFc36B711c310EB",
+    "staticAggregationHookFactory": "0x9B5f440bBb64Fee337F37e03362b628711Ea09C7",
     "merkleTreeHook": "0x748040afB89B8FdBb992799808215419d36A0930",
     "interchainGasPaymaster": "0x3b6044acd6767f017e99318AA6Ef93b7B06A5a22",
     "aggregationHook": "0xe0cb37cFc47296f1c4eD77EFf92Aed478644d10c",
@@ -54,7 +54,7 @@
     "validatorAnnounce": "0x1df063280C4166AF9a725e3828b4dAC6c7113B08",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0xa2931C37957f3079d3B21b877d56E1db930e02a5",
+    "domainRoutingIsmFactory": "0xa2931C37957f3079d3B21b877d56E1db930e02a5",
     "pausableHook": "0xEf30f29Dcd3FCB1DCcDA9C7Cbf2A5957E8Ee9Cc3",
     "fallbackRoutingHook": "0x9e8fFb1c26099e75Dd5D794030e2E9AA51471c25",
     "interchainSecurityModule": "0xD0DBBF922076352cC50B285A0023536561F00EEa"
@@ -62,10 +62,10 @@
   "optimism": {
     "storageGasOracle": "0x27e88AeB8EA4B159d81df06355Ea3d20bEB1de38",
     "proxyAdmin": "0xE047cb95FB3b7117989e911c6afb34771183fC35",
-    "merkleRootMultisigIsmFactory": "0xCA6Cb9Bc3cfF9E11003A06617cF934B684Bc78BC",
-    "messageIdMultisigIsmFactory": "0xAa4Be20E9957fE21602c74d7C3cF5CB1112EA9Ef",
-    "aggregationIsmFactory": "0x7491843F3A5Ba24E0f17a22645bDa04A1Ae2c584",
-    "aggregationHookFactory": "0x15DEeAB8dECDe553bb0B1F9C00984cbcae1af3D7",
+    "staticMerkleRootMultisigIsmFactory": "0xCA6Cb9Bc3cfF9E11003A06617cF934B684Bc78BC",
+    "staticMessageIdMultisigIsmFactory": "0xAa4Be20E9957fE21602c74d7C3cF5CB1112EA9Ef",
+    "staticAggregationIsmFactory": "0x7491843F3A5Ba24E0f17a22645bDa04A1Ae2c584",
+    "staticAggregationHookFactory": "0x15DEeAB8dECDe553bb0B1F9C00984cbcae1af3D7",
     "merkleTreeHook": "0x68eE9bec9B4dbB61f69D9D293Ae26a5AACb2e28f",
     "interchainGasPaymaster": "0xD8A76C4D91fCbB7Cc8eA795DFDF870E48368995C",
     "aggregationHook": "0x4ccC6d8eB79f2a1EC9bcb0f211fef7907631F91f",
@@ -74,7 +74,7 @@
     "validatorAnnounce": "0x30f5b08e01808643221528BB2f7953bf2830Ef38",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0xD2e905108c5e44dADA680274740f896Ea96Cf2Fb",
+    "domainRoutingIsmFactory": "0xD2e905108c5e44dADA680274740f896Ea96Cf2Fb",
     "pausableHook": "0xf753CA2269c8A7693ce1808b5709Fbf36a65D47A",
     "fallbackRoutingHook": "0xD4b132C6d4AA93A4247F1A91e1ED929c0572a43d",
     "interchainSecurityModule": "0x04938856bE60c8e734ffDe5f720E2238302BE8D2"
@@ -82,10 +82,10 @@
   "moonbeam": {
     "storageGasOracle": "0x448b7ADB0dA36d41AA2AfDc9d63b97541A7b3819",
     "proxyAdmin": "0x6A9cdA3dd1F593983BFd142Eb35e6ce4137bd5ce",
-    "merkleRootMultisigIsmFactory": "0xE2f485bc031Feb5a4C41C1967bf028653d75f0C3",
-    "messageIdMultisigIsmFactory": "0x84Df48F8f241f11d0fA302d09d73030429Bd9C73",
-    "aggregationIsmFactory": "0x40c6Abcb6A2CdC8882d4bEcaC47927005c7Bb8c2",
-    "aggregationHookFactory": "0x59cC3E7A49DdC4893eB8754c7908f96072A7DbE8",
+    "staticMerkleRootMultisigIsmFactory": "0xE2f485bc031Feb5a4C41C1967bf028653d75f0C3",
+    "staticMessageIdMultisigIsmFactory": "0x84Df48F8f241f11d0fA302d09d73030429Bd9C73",
+    "staticAggregationIsmFactory": "0x40c6Abcb6A2CdC8882d4bEcaC47927005c7Bb8c2",
+    "staticAggregationHookFactory": "0x59cC3E7A49DdC4893eB8754c7908f96072A7DbE8",
     "mailbox": "0x094d03E751f49908080EFf000Dd6FD177fd44CC3",
     "merkleTreeHook": "0x87403b85f6f316e7ba91ba1fa6C3Fb7dD4095547",
     "interchainGasPaymaster": "0x14760E32C0746094cF14D97124865BC7F0F7368F",
@@ -94,7 +94,7 @@
     "validatorAnnounce": "0x8c1001eBee6F25b31863A55EadfF149aF88B356F",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0x8061Af3A459093540d17823D651BC5E2A92669a7",
+    "domainRoutingIsmFactory": "0x8061Af3A459093540d17823D651BC5E2A92669a7",
     "pausableHook": "0xe28f2AEEB42ee83CAd068D9A9a449c8b868C137f",
     "fallbackRoutingHook": "0x6C2D6eA0969F7Aa0A850CCA88c7BFACa563B2361",
     "interchainSecurityModule": "0x373836DFa82f2D27ec79Ca32A197Aa1665F0E1e9"
@@ -102,10 +102,10 @@
   "gnosis": {
     "storageGasOracle": "0x5E01d8F34b629E3f92d69546bbc4142A7Adee7e9",
     "proxyAdmin": "0x81a92A1a272cb09d7b4970b07548463dC7aE0cB7",
-    "merkleRootMultisigIsmFactory": "0x8E273260EAd8B72A085B19346A676d355740e875",
-    "messageIdMultisigIsmFactory": "0x603f46cc520d2fc22957b81e206408590808F02F",
-    "aggregationIsmFactory": "0x11EF91d17c5ad3330DbCa709a8841743d3Af6819",
-    "aggregationHookFactory": "0xbC8AA096dabDf4A0200BB9f8D4Cbb644C3D86d7B",
+    "staticMerkleRootMultisigIsmFactory": "0x8E273260EAd8B72A085B19346A676d355740e875",
+    "staticMessageIdMultisigIsmFactory": "0x603f46cc520d2fc22957b81e206408590808F02F",
+    "staticAggregationIsmFactory": "0x11EF91d17c5ad3330DbCa709a8841743d3Af6819",
+    "staticAggregationHookFactory": "0xbC8AA096dabDf4A0200BB9f8D4Cbb644C3D86d7B",
     "mailbox": "0xaD09d78f4c6b9dA2Ae82b1D34107802d380Bb74f",
     "merkleTreeHook": "0x2684C6F89E901987E1FdB7649dC5Be0c57C61645",
     "interchainGasPaymaster": "0xDd260B99d302f0A3fF885728c086f729c06f227f",
@@ -114,16 +114,16 @@
     "validatorAnnounce": "0x87ED6926abc9E38b9C7C19f835B41943b622663c",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0xbB5Df000113e767dE11343A16f83De733e5bCC0F",
+    "domainRoutingIsmFactory": "0xbB5Df000113e767dE11343A16f83De733e5bCC0F",
     "pausableHook": "0xf728C884De5275a608dEC222dACd0f2BF2E23AB6",
     "fallbackRoutingHook": "0x24f5E353dD03E103Ba2372F7D6FC0cf3A66f849c",
     "interchainSecurityModule": "0x8e1aa0687B6d939D5a44304D13B7c922ebB012f1"
   },
   "base": {
-    "merkleRootMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-    "messageIdMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "aggregationIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-    "aggregationHookFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+    "staticMerkleRootMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+    "staticMessageIdMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+    "staticAggregationIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+    "staticAggregationHookFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
     "proxyAdmin": "0x4Ed7d626f1E96cD1C0401607Bf70D95243E3dEd1",
     "mailbox": "0xeA87ae93Fa0019a82A727bfd3eBd1cFCa8f64f1D",
     "merkleTreeHook": "0x19dc38aeae620380430C200a6E990D5Af5480117",
@@ -132,16 +132,16 @@
     "aggregationHook": "0x13f3d4B0Ee0a713430fded9E18f7fb6c91A6E41F",
     "protocolFee": "0x99ca8c74cE7Cfa9d72A51fbb05F9821f5f826b3a",
     "validatorAnnounce": "0x182E8d7c5F1B06201b102123FC7dF0EaeB445a7B",
-    "routingIsmFactory": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503",
+    "domainRoutingIsmFactory": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503",
     "pausableHook": "0x46fa3A5780e5B90Eaf34BDED554d5353B5ABE9E7",
     "fallbackRoutingHook": "0x4Eb82Ee35b0a1c1d776E3a3B547f9A9bA6FCC9f2",
     "interchainSecurityModule": "0x5D1e7D7c5B9e6dDC8439F67F10c578f2A1084f6F"
   },
   "scroll": {
-    "merkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
-    "messageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-    "aggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "aggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+    "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
+    "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+    "staticAggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+    "staticAggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
     "merkleTreeHook": "0x6119E37Bd66406A1Db74920aC79C15fB8411Ba76",
     "proxyAdmin": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
     "storageGasOracle": "0x481171eb1aad17eDE6a56005B7F1aB00C581ef13",
@@ -150,16 +150,16 @@
     "protocolFee": "0xc3F23848Ed2e04C0c6d41bd7804fa8f89F940B94",
     "mailbox": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
     "validatorAnnounce": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
-    "routingIsmFactory": "0xe03dad16074BC5EEA9A9311257BF02Eb0B6AAA2b",
+    "domainRoutingIsmFactory": "0xe03dad16074BC5EEA9A9311257BF02Eb0B6AAA2b",
     "pausableHook": "0x4Eb82Ee35b0a1c1d776E3a3B547f9A9bA6FCC9f2",
     "fallbackRoutingHook": "0xDa7cECb05C4aeB02c1aFDE277d4306a2da7Bd762",
     "interchainSecurityModule": "0xaDc0cB48E8DB81855A930C0C1165ea3dCe4Ba5C7"
   },
   "polygonzkevm": {
-    "merkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "messageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-    "aggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
-    "aggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
+    "staticMerkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+    "staticMessageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+    "staticAggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+    "staticAggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
     "merkleTreeHook": "0x149db7afD694722747035d5AEC7007ccb6F8f112",
     "proxyAdmin": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
     "storageGasOracle": "0x19dc38aeae620380430C200a6E990D5Af5480117",
@@ -168,7 +168,7 @@
     "protocolFee": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
     "mailbox": "0x3a464f746D23Ab22155710f44dB16dcA53e0775E",
     "validatorAnnounce": "0x2fa5F5C96419C222cDbCeC797D696e6cE428A7A9",
-    "routingIsmFactory": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d",
+    "domainRoutingIsmFactory": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d",
     "interchainSecurityModule": "0xf2BEE9D2c15Ba9D7e06799B5912dE1F05533c141",
     "fallbackRoutingHook": "0x01aE937A7B05d187bBCBE80F44F41879D3D335a4",
     "pausableHook": "0xc2FbB9411186AB3b1a6AFCCA702D1a80B48b197c"
@@ -176,10 +176,10 @@
   "celo": {
     "storageGasOracle": "0xD9A9966E7dA9a7f0032bF449FB12696a638E673C",
     "proxyAdmin": "0x90f9a2E9eCe93516d65FdaB726a3c62F5960a1b9",
-    "merkleRootMultisigIsmFactory": "0x4C96a1abc44dc846775CE702C9E9BE821D3b487c",
-    "messageIdMultisigIsmFactory": "0xaB402f227e892Ef37C105bf06619c0fa106a1fB2",
-    "aggregationIsmFactory": "0x1722dd970a1F56040712129f5Eeb76B003fd7500",
-    "aggregationHookFactory": "0xc3745652EFB8555A8b064A0EA78d295133d326D2",
+    "staticMerkleRootMultisigIsmFactory": "0x4C96a1abc44dc846775CE702C9E9BE821D3b487c",
+    "staticMessageIdMultisigIsmFactory": "0xaB402f227e892Ef37C105bf06619c0fa106a1fB2",
+    "staticAggregationIsmFactory": "0x1722dd970a1F56040712129f5Eeb76B003fd7500",
+    "staticAggregationHookFactory": "0xc3745652EFB8555A8b064A0EA78d295133d326D2",
     "merkleTreeHook": "0x04dB778f05854f26E67e0a66b740BBbE9070D366",
     "interchainGasPaymaster": "0x571f1435613381208477ac5d6974310d88AC7cB7",
     "aggregationHook": "0xc65890329066FB20c339Bc5C22f1756e9D3a4fF5",
@@ -188,7 +188,7 @@
     "validatorAnnounce": "0xCeF677b65FDaA6804d4403083bb12B8dB3991FE1",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0x2A2c22B0a8615ad24839fA6Af302E896Af32d1a3",
+    "domainRoutingIsmFactory": "0x2A2c22B0a8615ad24839fA6Af302E896Af32d1a3",
     "domainRoutingIsm": "0xf18E32428dad0802C5D6F723cB80A6Da889777c4",
     "pausableIsm": "0x6Bc4437ce69696C9461Cbc89582c259AC8847A58",
     "staticAggregationIsm": "0x99e8E56Dce3402D6E09A82718937fc1cA2A9491E",
@@ -199,10 +199,10 @@
   "ethereum": {
     "storageGasOracle": "0xc9a103990A8dB11b4f627bc5CD1D0c2685484Ec5",
     "proxyAdmin": "0x75EE15Ee1B4A75Fa3e2fDF5DF3253c25599cc659",
-    "merkleRootMultisigIsmFactory": "0x47e8aF9e30C32Ab91060ED587894288786761B45",
-    "messageIdMultisigIsmFactory": "0xfA21D9628ADce86531854C2B7ef00F07394B0B69",
-    "aggregationIsmFactory": "0x46FA191Ad972D9674Ed752B69f9659A0d7b22846",
-    "aggregationHookFactory": "0x6D2555A8ba483CcF4409C39013F5e9a3285D3C9E",
+    "staticMerkleRootMultisigIsmFactory": "0x47e8aF9e30C32Ab91060ED587894288786761B45",
+    "staticMessageIdMultisigIsmFactory": "0xfA21D9628ADce86531854C2B7ef00F07394B0B69",
+    "staticAggregationIsmFactory": "0x46FA191Ad972D9674Ed752B69f9659A0d7b22846",
+    "staticAggregationHookFactory": "0x6D2555A8ba483CcF4409C39013F5e9a3285D3C9E",
     "merkleTreeHook": "0x48e6c30B97748d1e2e03bf3e9FbE3890ca5f8CCA",
     "interchainGasPaymaster": "0x9e6B1022bE9BBF5aFd152483DAD9b88911bC8611",
     "aggregationHook": "0xb87AC8EA4533AE017604E44470F7c1E550AC6F10",
@@ -211,7 +211,7 @@
     "validatorAnnounce": "0xCe74905e51497b4adD3639366708b821dcBcff96",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0x28fA9552F19039b450498B0d8e5DEAe0d0aAc559",
+    "domainRoutingIsmFactory": "0x28fA9552F19039b450498B0d8e5DEAe0d0aAc559",
     "pausableHook": "0x3A66Dc852e56d3748838b3C27CF381105b83705b",
     "fallbackRoutingHook": "0x571f1435613381208477ac5d6974310d88AC7cB7",
     "interchainSecurityModule": "0x43Ce4Eb4aE3585dDe9Ac6967Db5b06f7f6764C8a"
@@ -219,10 +219,10 @@
   "avalanche": {
     "storageGasOracle": "0x175821F30AdCAA4bbB72Ce98eF76C2E0De2C3f21",
     "proxyAdmin": "0xd7CF8c05fd81b8cA7CfF8E6C49B08a9D63265c9B",
-    "merkleRootMultisigIsmFactory": "0x896cF1D1B66cD211633eDd589fF158E8Cfaf9B54",
-    "messageIdMultisigIsmFactory": "0x8819D653DF5b1FC0DdB32189a2704E471AF8483c",
-    "aggregationIsmFactory": "0xa5E13796eB7d2EDCc88012c8cfF90D69B51FcF9f",
-    "aggregationHookFactory": "0x3bF6Ac986C7Af9A9Ac356C0e99C0041EFd8D96e7",
+    "staticMerkleRootMultisigIsmFactory": "0x896cF1D1B66cD211633eDd589fF158E8Cfaf9B54",
+    "staticMessageIdMultisigIsmFactory": "0x8819D653DF5b1FC0DdB32189a2704E471AF8483c",
+    "staticAggregationIsmFactory": "0xa5E13796eB7d2EDCc88012c8cfF90D69B51FcF9f",
+    "staticAggregationHookFactory": "0x3bF6Ac986C7Af9A9Ac356C0e99C0041EFd8D96e7",
     "merkleTreeHook": "0x84eea61D679F42D92145fA052C89900CBAccE95A",
     "interchainGasPaymaster": "0x95519ba800BBd0d34eeAE026fEc620AD978176C0",
     "aggregationHook": "0x0165a22BA489F7DA37DAf6397781777D9FCB5708",
@@ -231,16 +231,16 @@
     "validatorAnnounce": "0x9Cad0eC82328CEE2386Ec14a12E81d070a27712f",
     "testRecipient": "0x36FdA966CfffF8a9Cdc814f546db0e6378bFef35",
     "testTokenRecipient": "0x85ac1164878e017b67660a74ff1f41f3D05C02Bb",
-    "routingIsmFactory": "0x28F7907911C7E321c596686AE6D1F20516450037",
+    "domainRoutingIsmFactory": "0x28F7907911C7E321c596686AE6D1F20516450037",
     "pausableHook": "0x239eB860770F1C48ABAC9bE9825d20e3E7c018df",
     "fallbackRoutingHook": "0x61D15D571D5f7A9eF0D1938f072f430bBF024747",
     "interchainSecurityModule": "0xA36B02a83564f52d9244310Ea439ee6F6AfeFb60"
   },
   "mantapacific": {
-    "merkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "messageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-    "aggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
-    "aggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
+    "staticMerkleRootMultisigIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+    "staticMessageIdMultisigIsmFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+    "staticAggregationIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+    "staticAggregationHookFactory": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
     "proxyAdmin": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
     "mailbox": "0x3a464f746D23Ab22155710f44dB16dcA53e0775E",
     "domainRoutingIsm": "0xDEed16fe4b1c9b2a93483EDFf34C77A9b57D31Ff",
@@ -250,7 +250,7 @@
     "aggregationHook": "0x8464aF853363B8d6844070F68b0AB34Cb6523d0F",
     "protocolFee": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
     "validatorAnnounce": "0x2fa5F5C96419C222cDbCeC797D696e6cE428A7A9",
-    "routingIsmFactory": "0x8358D8291e3bEDb04804975eEa0fe9fe0fAfB147",
+    "domainRoutingIsmFactory": "0x8358D8291e3bEDb04804975eEa0fe9fe0fAfB147",
     "testRecipient": "0x4E1c88DD261BEe2941e6c1814597e30F53330428",
     "testTokenRecipient": "0x5060eCD5dFAD300A90592C04e504600A7cdcF70b",
     "pausableHook": "0x7556a0E61d577D921Cba8Fca0d7D6299d36E607E",
@@ -258,11 +258,11 @@
     "interchainSecurityModule": "0xDEed16fe4b1c9b2a93483EDFf34C77A9b57D31Ff"
   },
   "inevm": {
-    "merkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
-    "messageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-    "aggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "aggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-    "routingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+    "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
+    "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+    "staticAggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+    "staticAggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+    "domainRoutingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
     "domainRoutingIsm": "0xBD70Ea9D599a0FC8158B026797177773C3445730",
     "proxyAdmin": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
     "storageGasOracle": "0x6119E37Bd66406A1Db74920aC79C15fB8411Ba76",
@@ -278,11 +278,11 @@
     "pausableHook": "0xBDa330Ea8F3005C421C8088e638fBB64fA71b9e0"
   },
   "viction": {
-    "merkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
-    "messageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
-    "aggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
-    "aggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
-    "routingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
+    "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
+    "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
+    "staticAggregationIsmFactory": "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A",
+    "staticAggregationHookFactory": "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6",
+    "domainRoutingIsmFactory": "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908",
     "mailbox": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
     "proxyAdmin": "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004",
     "validatorAnnounce": "0x2fa5F5C96419C222cDbCeC797D696e6cE428A7A9",
diff --git a/typescript/sdk/src/consts/environments/testnet.json b/typescript/sdk/src/consts/environments/testnet.json
index 1757affe7e..9e39bd1099 100644
--- a/typescript/sdk/src/consts/environments/testnet.json
+++ b/typescript/sdk/src/consts/environments/testnet.json
@@ -1,17 +1,17 @@
 {
   "alfajores": {
     "aggregationHook": "0xdBabD76358897E68E4964647C1fb8Bf524f5EFdB",
-    "aggregationHookFactory": "0x71bB34Ee833467443628CEdFAA188B2387827Cee",
-    "aggregationIsmFactory": "0x4bE8AC22f506B1504C93C3A5b1579C5e7c550D9C",
+    "staticAggregationHookFactory": "0x71bB34Ee833467443628CEdFAA188B2387827Cee",
+    "staticAggregationIsmFactory": "0x4bE8AC22f506B1504C93C3A5b1579C5e7c550D9C",
     "fallbackRoutingHook": "0x3528B1aeF3a3d29E0eae90ad777A2b4A6a48aC3F",
     "interchainGasPaymaster": "0x44769b0f4a6f01339e131a691cc2eebbb519d297",
     "mailbox": "0xEf9F292fcEBC3848bF4bB92a96a04F9ECBb78E59",
-    "merkleRootMultisigIsmFactory": "0xa9C7e306C0941896CA1fd528aA59089571D8D67E",
+    "staticMerkleRootMultisigIsmFactory": "0xa9C7e306C0941896CA1fd528aA59089571D8D67E",
     "merkleTreeHook": "0x221FA9CBaFcd6c1C3d206571Cf4427703e023FFa",
-    "messageIdMultisigIsmFactory": "0xC1b8c0e56D6a34940Ee2B86172450B54AFd633A7",
+    "staticMessageIdMultisigIsmFactory": "0xC1b8c0e56D6a34940Ee2B86172450B54AFd633A7",
     "protocolFee": "0xC9D50584F08Bf6cCD1004d14c7062044b45E3b48",
     "proxyAdmin": "0x4eDBf5846D973c53AF478cf62aB5bC92807521e3",
-    "routingIsmFactory": "0x30d9A03762431F8A917a0C469E7A62Bf55092Ca6",
+    "domainRoutingIsmFactory": "0x30d9A03762431F8A917a0C469E7A62Bf55092Ca6",
     "storageGasOracle": "0x8356113754C7aCa297Db3089b89F87CC125499fb",
     "testRecipient": "0x6489d13AcAd3B8dce4c5B31f375DE4f9451E7b38",
     "testTokenRecipient": "0x92dC0a76452a9D9358D2d2dEd8CddA209DF67c45",
@@ -19,14 +19,14 @@
   },
   "bsctestnet": {
     "aggregationHook": "0x3d675bB93250Ab7603F40cbb9194bae210784627",
-    "aggregationHookFactory": "0xa1145B39F1c7Ef9aA593BC1DB1634b00CC020942",
-    "aggregationIsmFactory": "0x40613dE82d672605Ab051C64079022Bb4F8bDE4f",
+    "staticAggregationHookFactory": "0xa1145B39F1c7Ef9aA593BC1DB1634b00CC020942",
+    "staticAggregationIsmFactory": "0x40613dE82d672605Ab051C64079022Bb4F8bDE4f",
     "fallbackRoutingHook": "0x2670ED2EC08cAd135307556685a96bD4c16b007b",
     "interchainGasPaymaster": "0x0dD20e410bdB95404f71c5a4e7Fa67B892A5f949",
     "mailbox": "0xF9F6F5646F478d5ab4e20B0F910C92F1CCC9Cc6D",
-    "merkleRootMultisigIsmFactory": "0x3E235B90197E1D6b5DB5ad5aD49f2c1ED6406382",
+    "staticMerkleRootMultisigIsmFactory": "0x3E235B90197E1D6b5DB5ad5aD49f2c1ED6406382",
     "merkleTreeHook": "0xc6cbF39A747f5E28d1bDc8D9dfDAb2960Abd5A8f",
-    "messageIdMultisigIsmFactory": "0x0D96aF0c01c4bbbadaaF989Eb489c8783F35B763",
+    "staticMessageIdMultisigIsmFactory": "0x0D96aF0c01c4bbbadaaF989Eb489c8783F35B763",
     "protocolFee": "0x3eF0a63B8976b838704Bcc93C78C56b6653E5a39",
     "proxyAdmin": "0xb12282d2E838Aa5f2A4F9Ee5f624a77b7199A078",
     "storageGasOracle": "0x124EBCBC018A5D4Efe639f02ED86f95cdC3f6498",
@@ -36,17 +36,17 @@
   },
   "fuji": {
     "aggregationHook": "0x8E9b4006171c6B75111823e7545Ee5400CEce0B3",
-    "aggregationHookFactory": "0x99554CC33cBCd6EDDd2f3fc9c7C9194Cb3b5df1E",
-    "aggregationIsmFactory": "0xF588129ed84F219A1f0f921bE7Aa1B2176516858",
+    "staticAggregationHookFactory": "0x99554CC33cBCd6EDDd2f3fc9c7C9194Cb3b5df1E",
+    "staticAggregationIsmFactory": "0xF588129ed84F219A1f0f921bE7Aa1B2176516858",
     "fallbackRoutingHook": "0xc684f7F50DB4b2563218512e021fBdd0BeD6b57E",
     "interchainGasPaymaster": "0x6895d3916B94b386fAA6ec9276756e16dAe7480E",
     "mailbox": "0x5b6CFf85442B851A8e6eaBd2A4E4507B5135B3B0",
-    "merkleRootMultisigIsmFactory": "0x93F50Ac4E5663DAAb03508008d592f6260964f62",
+    "staticMerkleRootMultisigIsmFactory": "0x93F50Ac4E5663DAAb03508008d592f6260964f62",
     "merkleTreeHook": "0x9ff6ac3dAf63103620BBf76136eA1AFf43c2F612",
-    "messageIdMultisigIsmFactory": "0x90e1F9918F304645e4F6324E5C0EAc70138C84Ce",
+    "staticMessageIdMultisigIsmFactory": "0x90e1F9918F304645e4F6324E5C0EAc70138C84Ce",
     "protocolFee": "0xEbA64c8a9b4a61a9210d5fe7E4375380999C821b",
     "proxyAdmin": "0x378dA02f7dC3c23A8B5ecE32b8056CdF01e8d477",
-    "routingIsmFactory": "0x683a81E0e1a238dcA7341e04c08d3bba6f0Cb74f",
+    "domainRoutingIsmFactory": "0x683a81E0e1a238dcA7341e04c08d3bba6f0Cb74f",
     "storageGasOracle": "0x9305dE34306886d615B096Bdf23b94a978f6a6c0",
     "testRecipient": "0x44a7e1d76fD8AfA244AdE7278336E3D5C658D398",
     "testTokenRecipient": "0x9CC10c844B3Bbae2444E39991aB027C4A05D1F2e",
@@ -54,17 +54,17 @@
   },
   "mumbai": {
     "aggregationHook": "0xD546273418733AcEC8c7A67EfB881c9Ea83851bf",
-    "aggregationHookFactory": "0x54CA9De95B37365909364672D363D2ecFC4e1Af4",
-    "aggregationIsmFactory": "0x54b0d9AB6a99E9C9425D20fa4D9eE9dbf067e886",
+    "staticAggregationHookFactory": "0x54CA9De95B37365909364672D363D2ecFC4e1Af4",
+    "staticAggregationIsmFactory": "0x54b0d9AB6a99E9C9425D20fa4D9eE9dbf067e886",
     "fallbackRoutingHook": "0x31191BA83143b4745745389fEe64990c65F36829",
     "interchainGasPaymaster": "0x8aB67CAF605c6ee83cbFeFb0D8d67FDd3BF7B591",
     "mailbox": "0x2d1889fe5B092CD988972261434F7E5f26041115",
-    "merkleRootMultisigIsmFactory": "0xda0780ed3eE577EfE0B856E00f983bF231603307",
+    "staticMerkleRootMultisigIsmFactory": "0xda0780ed3eE577EfE0B856E00f983bF231603307",
     "merkleTreeHook": "0x9AF85731EDd41E2E50F81Ef8a0A69D2fB836EDf9",
-    "messageIdMultisigIsmFactory": "0x23c2483ab814177bA79DCDCb5dFA1B105387AAB1",
+    "staticMessageIdMultisigIsmFactory": "0x23c2483ab814177bA79DCDCb5dFA1B105387AAB1",
     "protocolFee": "0x244d1F7e30Be144A87602905baBF86630e8f39DC",
     "proxyAdmin": "0xa99aD6B1c10E92DB8d3510f1865A6d2Ab43EAd58",
-    "routingIsmFactory": "0x832Ea28749C93C05E5AaF8207E4e61Bd56aE3877",
+    "domainRoutingIsmFactory": "0x832Ea28749C93C05E5AaF8207E4e61Bd56aE3877",
     "storageGasOracle": "0xBEd8Fd6d5c6cBd878479C25f4725C7c842a43821",
     "testRecipient": "0xF45A4D54223DA32bf7b5D43a9a460Ef3C94C713B",
     "testTokenRecipient": "0x57d098e6952B6C1c85Ce0B68C9Deada3dCf7D05A",
@@ -72,36 +72,36 @@
   },
   "plumetestnet": {
     "aggregationHook": "0x31dF0EEE7Dc7565665468698a0da221225619a1B",
-    "aggregationHookFactory": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
-    "aggregationIsmFactory": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
+    "staticAggregationHookFactory": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
+    "staticAggregationIsmFactory": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
     "fallbackRoutingHook": "0x19Be55D859368e02d7b9C00803Eb677BDC1359Bd",
     "interchainGasPaymaster": "0x28B02B97a850872C4D33C3E024fab6499ad96564",
     "interchainSecurityModule": "0x7B40deb01A127E3A5eECdbCDF263e41899a90078",
     "mailbox": "0x33dB966328Ea213b0f76eF96CA368AB37779F065",
-    "merkleRootMultisigIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
+    "staticMerkleRootMultisigIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
     "merkleTreeHook": "0xddf4C3e791caCaFd26D7fb275549739B38ae6e75",
-    "messageIdMultisigIsmFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
+    "staticMessageIdMultisigIsmFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
     "pausableHook": "0x5821f3B6eE05F3dC62b43B74AB1C8F8E6904b1C8",
     "protocolFee": "0x1b33611fCc073aB0737011d5512EF673Bff74962",
     "proxyAdmin": "0x589C201a07c26b4725A4A829d772f24423da480B",
-    "routingIsmFactory": "0x54148470292C24345fb828B003461a9444414517",
+    "domainRoutingIsmFactory": "0x54148470292C24345fb828B003461a9444414517",
     "storageGasOracle": "0x267B6B6eAf6790faE5D5E9070F28a9cE64CbF279",
     "testRecipient": "0xe0B988062A0C6492177d64823Ab95a9c256c2a5F",
     "validatorAnnounce": "0x20c44b1E3BeaDA1e9826CFd48BeEDABeE9871cE9"
   },
   "scrollsepolia": {
     "aggregationHook": "0x7b63Aa270335F8896717c2A809205F4b650E4268",
-    "aggregationHookFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
-    "aggregationIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
+    "staticAggregationHookFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2",
+    "staticAggregationIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
     "fallbackRoutingHook": "0xE1CCB130389f687bf745Dd6dc05E50da17d9ea96",
     "interchainGasPaymaster": "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD",
     "mailbox": "0x3C5154a193D6e2955650f9305c8d80c18C814A68",
-    "merkleRootMultisigIsmFactory": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7",
+    "staticMerkleRootMultisigIsmFactory": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7",
     "merkleTreeHook": "0x863E8c26621c52ACa1849C53500606e73BA272F0",
-    "messageIdMultisigIsmFactory": "0xeb6f11189197223c656807a83B0DD374f9A6dF44",
+    "staticMessageIdMultisigIsmFactory": "0xeb6f11189197223c656807a83B0DD374f9A6dF44",
     "protocolFee": "0x5821f3B6eE05F3dC62b43B74AB1C8F8E6904b1C8",
     "proxyAdmin": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8",
-    "routingIsmFactory": "0x17866ebE0e503784a9461d3e753dEeD0d3F61153",
+    "domainRoutingIsmFactory": "0x17866ebE0e503784a9461d3e753dEeD0d3F61153",
     "storageGasOracle": "0x6b1bb4ce664Bb4164AEB4d3D2E7DE7450DD8084C",
     "testRecipient": "0xa3AB7E6cE24E6293bD5320A53329Ef2f4DE73fCA",
     "testTokenRecipient": "0xc76E477437065093D353b7d56c81ff54D167B0Ab",
@@ -109,19 +109,19 @@
   },
   "sepolia": {
     "aggregationHook": "0xe3147d5618f5e2e100690B50ec923009a4cde14A",
-    "aggregationHookFactory": "0x160C28C92cA453570aD7C031972b58d5Dd128F72",
-    "aggregationIsmFactory": "0xC83e12EF2627ACE445C298e6eC418684918a6002",
+    "staticAggregationHookFactory": "0x160C28C92cA453570aD7C031972b58d5Dd128F72",
+    "staticAggregationIsmFactory": "0xC83e12EF2627ACE445C298e6eC418684918a6002",
     "fallbackRoutingHook": "0x17Dc724B7a2F09141C13b8AC33B396073785c2BC",
     "interchainGasPaymaster": "0x6f2756380FD49228ae25Aa7F2817993cB74Ecc56",
     "interchainSecurityModule": "0x958124472b14B7940Ed5317C44a2508791dB1d48",
     "mailbox": "0xfFAEF09B3cd11D9b20d1a19bECca54EEC2884766",
-    "merkleRootMultisigIsmFactory": "0x0a71AcC99967829eE305a285750017C4916Ca269",
+    "staticMerkleRootMultisigIsmFactory": "0x0a71AcC99967829eE305a285750017C4916Ca269",
     "merkleTreeHook": "0x4917a9746A7B6E0A57159cCb7F5a6744247f2d0d",
-    "messageIdMultisigIsmFactory": "0xFEb9585b2f948c1eD74034205a7439261a9d27DD",
+    "staticMessageIdMultisigIsmFactory": "0xFEb9585b2f948c1eD74034205a7439261a9d27DD",
     "pausableHook": "0xa68022e53Fd28119D07C8336a8eC84A298Fd38Fd",
     "protocolFee": "0x13AC3349Cb159fE86A22cf42DdA803D9f7309DB5",
     "proxyAdmin": "0x97Bbc6bBaFa5Ce3b2FA966c121Af63bD09e940f8",
-    "routingIsmFactory": "0x3F100cBBE5FD5466BdB4B3a15Ac226957e7965Ad",
+    "domainRoutingIsmFactory": "0x3F100cBBE5FD5466BdB4B3a15Ac226957e7965Ad",
     "storageGasOracle": "0x71775B071F77F1ce52Ece810ce084451a3045FFe",
     "testRecipient": "0xeDc1A3EDf87187085A3ABb7A9a65E1e7aE370C07",
     "testTokenRecipient": "0x031AD9c560D37baC7d6Bd2d27A2443bAfd10101A",