diff --git a/packages/protocol/test/genesis/GenerateGenesis.g.sol b/packages/protocol/test/genesis/GenerateGenesis.g.sol
index dc06d7c4021..7de3ed5243b 100644
--- a/packages/protocol/test/genesis/GenerateGenesis.g.sol
+++ b/packages/protocol/test/genesis/GenerateGenesis.g.sol
@@ -56,18 +56,18 @@ contract TestGenerateGenesis is Test, AddressResolver {
 
     function testAddressManager() public {
         AddressManager addressManager = AddressManager(
-            getPredeployedContractAddress("ProxiedAddressManager")
+            getPredeployedContractAddress("AddressManagerProxy")
         );
 
         assertEq(owner, addressManager.owner());
 
-        checkSavedAddress(addressManager, "ProxiedBridge", "bridge");
-        checkSavedAddress(addressManager, "ProxiedTokenVault", "token_vault");
-        checkSavedAddress(addressManager, "ProxiedEtherVault", "ether_vault");
-        checkSavedAddress(addressManager, "ProxiedTaikoL2", "taiko");
+        checkSavedAddress(addressManager, "BridgeProxy", "bridge");
+        checkSavedAddress(addressManager, "TokenVaultProxy", "token_vault");
+        checkSavedAddress(addressManager, "EtherVaultProxy", "ether_vault");
+        checkSavedAddress(addressManager, "TaikoL2Proxy", "taiko");
         checkSavedAddress(
             addressManager,
-            "ProxiedSignalService",
+            "SignalServiceProxy",
             "signal_service"
         );
     }
@@ -156,7 +156,7 @@ contract TestGenerateGenesis is Test, AddressResolver {
 
     function testTokenVault() public {
         address tokenVaultAddress = getPredeployedContractAddress(
-            "ProxiedTokenVault"
+            "TokenVaultProxy"
         );
         address bridgeAddress = getPredeployedContractAddress("BridgeProxy");
 
diff --git a/packages/protocol/utils/generate_genesis/taikoL2.ts b/packages/protocol/utils/generate_genesis/taikoL2.ts
index 29851ee2955..60ba7873620 100644
--- a/packages/protocol/utils/generate_genesis/taikoL2.ts
+++ b/packages/protocol/utils/generate_genesis/taikoL2.ts
@@ -270,19 +270,19 @@ async function generateContractConfigs(
                     [chainId]: {
                         [ethers.utils.hexlify(
                             ethers.utils.toUtf8Bytes("taiko")
-                        )]: addressMap.ProxiedTaikoL2,
+                        )]: addressMap.TaikoL2Proxy,
                         [ethers.utils.hexlify(
                             ethers.utils.toUtf8Bytes("bridge")
-                        )]: addressMap.ProxiedBridge,
+                        )]: addressMap.BridgeProxy,
                         [ethers.utils.hexlify(
                             ethers.utils.toUtf8Bytes("token_vault")
-                        )]: addressMap.ProxiedTokenVault,
+                        )]: addressMap.TokenVaultProxy,
                         [ethers.utils.hexlify(
                             ethers.utils.toUtf8Bytes("ether_vault")
-                        )]: addressMap.ProxiedEtherVault,
+                        )]: addressMap.EtherVaultProxy,
                         [ethers.utils.hexlify(
                             ethers.utils.toUtf8Bytes("signal_service")
-                        )]: addressMap.ProxiedSignalService,
+                        )]: addressMap.SignalServiceProxy,
                     },
                 },
             },
@@ -353,7 +353,7 @@ async function generateContractConfigs(
                 // OwnableUpgradeable
                 _owner: contractOwner,
                 // AddressResolver
-                _addressManager: addressMap.ProxiedAddressManager,
+                _addressManager: addressMap.AddressManagerProxy,
                 // Bridge
                 _state: {},
             },
@@ -381,7 +381,7 @@ async function generateContractConfigs(
                 // OwnableUpgradeable
                 _owner: contractOwner,
                 // AddressResolver
-                _addressManager: addressMap.ProxiedAddressManager,
+                _addressManager: addressMap.AddressManagerProxy,
             },
         },
         TokenVaultProxy: {
@@ -407,10 +407,10 @@ async function generateContractConfigs(
                 // OwnableUpgradeable
                 _owner: contractOwner,
                 // AddressResolver
-                _addressManager: addressMap.ProxiedAddressManager,
+                _addressManager: addressMap.AddressManagerProxy,
                 // EtherVault
                 // Authorize L2 bridge
-                _authorizedAddrs: { [`${addressMap.ProxiedBridge}`]: true },
+                _authorizedAddrs: { [`${addressMap.BridgeProxy}`]: true },
             },
         },
         EtherVaultProxy: {
@@ -438,7 +438,7 @@ async function generateContractConfigs(
                 // OwnableUpgradeable
                 _owner: contractOwner,
                 // AddressResolver
-                _addressManager: addressMap.ProxiedAddressManager,
+                _addressManager: addressMap.AddressManagerProxy,
             },
         },
         SignalServiceProxy: {