diff --git a/deployment-addresses/bob.json b/deployment-addresses/bob.json
index 26e439a..bd2b3dd 100644
--- a/deployment-addresses/bob.json
+++ b/deployment-addresses/bob.json
@@ -1,7 +1,7 @@
 {
-    "poolImplementation":  "0x10499d88Bd32AF443Fc936F67DE32bE1c8Bb374C",
-    "poolFactory":  "0x31832f2a97Fd20664D76Cc421207669b55CE4BC0",
-    "router":  "0x3a63171DD9BebF4D07BC782FECC7eb0b890C2A45",
+    "leafPoolImplementation":  "0x10499d88Bd32AF443Fc936F67DE32bE1c8Bb374C",
+    "leafPoolFactory":  "0x31832f2a97Fd20664D76Cc421207669b55CE4BC0",
+    "leafRouter":  "0x3a63171DD9BebF4D07BC782FECC7eb0b890C2A45",
     "tokenRegistry": "0x8d9c67488c154286B9D4ccaC6c4CBF30589107a7",
     "universalRouter": "0xc3F14F34EA43943e6fd677A2BDceA65882e67783",
     "mixedRouteQuoter": "0x0f3887909C548C41Eb8a6667a4B23FC6683EF8ba",
diff --git a/deployment-addresses/deployPartial/mode.json b/deployment-addresses/deployPartial/mode.json
deleted file mode 100644
index e75cc83..0000000
--- a/deployment-addresses/deployPartial/mode.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "ism": "0x0000000000000000000000000000000000000000",
-  "leafGaugeFactory": "0x42e403b73898320f23109708b0ba1Ae85838C445",
-  "leafMessageBridge": "0xF278761576f45472bdD721EACA19317cE159c011",
-  "leafMessageModule": "0xF385603a12Be8b7B885222329c581FDD1C30071D",
-  "leafPoolFactory": "0x31832f2a97Fd20664D76Cc421207669b55CE4BC0",
-  "leafPoolImplementation": "0x10499d88Bd32AF443Fc936F67DE32bE1c8Bb374C",
-  "leafRouter": "0x3a63171DD9BebF4D07BC782FECC7eb0b890C2A45",
-  "leafTokenBridge": "0xA7287a56C01ac8Baaf8e7B662bDB41b10889C7A6",
-  "leafVoter": "0x97cDBCe21B6fd0585d29E539B1B99dAd328a1123",
-  "leafVotingRewardsFactory": "0x7dc9fd82f91B36F416A89f5478375e4a79f4Fb2F",
-  "leafXFactory": "0x73CaE4450f11f4A33a49C880CE3E8E56a9294B31",
-  "leafXVelo": "0x7f9AdFbd38b669F03d1d11000Bc76b9AaEA28A81"
-}
\ No newline at end of file
diff --git a/deployment-addresses/mode.json b/deployment-addresses/mode.json
index 41ca97e..66db9ad 100644
--- a/deployment-addresses/mode.json
+++ b/deployment-addresses/mode.json
@@ -1,9 +1,14 @@
 {
-    "poolImplementation":  "0x10499d88Bd32AF443Fc936F67DE32bE1c8Bb374C",
-    "poolFactory":  "0x31832f2a97Fd20664D76Cc421207669b55CE4BC0",
-    "router":  "0x3a63171DD9BebF4D07BC782FECC7eb0b890C2A45",
-    "tokenRegistry": "0x8d9c67488c154286B9D4ccaC6c4CBF30589107a7",
-    "universalRouter": "0x29EC19fA20db90BeD7F813298C45A4f4cD90eE18",
-    "mixedRouteQuoter": "0x52DCddAFdD31bcD44881F6591A97dA1fF5808891",
-    "stakingRewardsFactory": "0xD2F998a46e4d9Dd57aF1a28EBa8C34E7dD3851D7"
-}
\ No newline at end of file
+  "ism": "0x0000000000000000000000000000000000000000",
+  "leafGaugeFactory": "0x42e403b73898320f23109708b0ba1Ae85838C445",
+  "leafMessageBridge": "0xF278761576f45472bdD721EACA19317cE159c011",
+  "leafMessageModule": "0xF385603a12Be8b7B885222329c581FDD1C30071D",
+  "leafPoolFactory": "0x31832f2a97Fd20664D76Cc421207669b55CE4BC0",
+  "leafPoolImplementation": "0x10499d88Bd32AF443Fc936F67DE32bE1c8Bb374C",
+  "leafRouter": "0x3a63171DD9BebF4D07BC782FECC7eb0b890C2A45",
+  "leafTokenBridge": "0xA7287a56C01ac8Baaf8e7B662bDB41b10889C7A6",
+  "leafVoter": "0x97cDBCe21B6fd0585d29E539B1B99dAd328a1123",
+  "leafVotingRewardsFactory": "0x7dc9fd82f91B36F416A89f5478375e4a79f4Fb2F",
+  "leafXFactory": "0x73CaE4450f11f4A33a49C880CE3E8E56a9294B31",
+  "leafXVelo": "0x7f9AdFbd38b669F03d1d11000Bc76b9AaEA28A81"
+}
diff --git a/script/deployPartial/01_DeployPartialBaseFixture.s.sol b/script/deployPartial/01_DeployPartialBaseFixture.s.sol
index b6ba5d9..70271a8 100644
--- a/script/deployPartial/01_DeployPartialBaseFixture.s.sol
+++ b/script/deployPartial/01_DeployPartialBaseFixture.s.sol
@@ -60,9 +60,9 @@ abstract contract DeployPartialBaseFixture is DeployFixture {
         addresses = vm.readFile(path);
 
         /// @dev Use contracts from existing deployment
-        leafPoolImplementation = Pool(vm.parseJsonAddress(addresses, ".poolImplementation"));
-        leafPoolFactory = PoolFactory(vm.parseJsonAddress(addresses, ".poolFactory"));
-        leafRouter = Router(payable(vm.parseJsonAddress(addresses, ".router")));
+        leafPoolImplementation = Pool(vm.parseJsonAddress(addresses, ".leafPoolImplementation"));
+        leafPoolFactory = PoolFactory(vm.parseJsonAddress(addresses, ".leafPoolFactory"));
+        leafRouter = Router(payable(vm.parseJsonAddress(addresses, ".leafRouter")));
     }
 
     /// @dev Override if deploying extensions
diff --git a/test/unit/concrete/deploy/deployPartial/bob/deployPartialBase.t.sol b/test/unit/concrete/deploy/deployPartial/bob/deployPartialBase.t.sol
index 3c4969d..68c0573 100644
--- a/test/unit/concrete/deploy/deployPartial/bob/deployPartialBase.t.sol
+++ b/test/unit/concrete/deploy/deployPartial/bob/deployPartialBase.t.sol
@@ -79,9 +79,9 @@ contract BobDeployPartialBaseTest is BaseFixture {
         // assertNotEq(address(leafIsm), address(0));
         assertNotEq(address(leafRouter), address(0));
 
-        assertEq(address(leafPoolImplementation), vm.parseJsonAddress(addresses, ".poolImplementation"));
-        assertEq(address(leafPoolFactory), vm.parseJsonAddress(addresses, ".poolFactory"));
-        assertEq(address(leafRouter), vm.parseJsonAddress(addresses, ".router"));
+        assertEq(address(leafPoolImplementation), vm.parseJsonAddress(addresses, ".leafPoolImplementation"));
+        assertEq(address(leafPoolFactory), vm.parseJsonAddress(addresses, ".leafPoolFactory"));
+        assertEq(address(leafRouter), vm.parseJsonAddress(addresses, ".leafRouter"));
 
         assertEq(leafPoolFactory.implementation(), address(leafPoolImplementation));
         assertEq(leafPoolFactory.isPaused(), false);
diff --git a/test/unit/concrete/deploy/deployPartial/mode/deployPartialBase.t.sol b/test/unit/concrete/deploy/deployPartial/mode/deployPartialBase.t.sol
index 83a07d8..15ba7de 100644
--- a/test/unit/concrete/deploy/deployPartial/mode/deployPartialBase.t.sol
+++ b/test/unit/concrete/deploy/deployPartial/mode/deployPartialBase.t.sol
@@ -84,9 +84,9 @@ contract ModeDeployPartialBaseTest is BaseFixture {
         // assertNotEq(address(leafIsm), address(0));
         assertNotEq(address(leafRouter), address(0));
 
-        assertEq(address(leafPoolImplementation), vm.parseJsonAddress(addresses, ".poolImplementation"));
-        assertEq(address(leafPoolFactory), vm.parseJsonAddress(addresses, ".poolFactory"));
-        assertEq(address(leafRouter), vm.parseJsonAddress(addresses, ".router"));
+        assertEq(address(leafPoolImplementation), vm.parseJsonAddress(addresses, ".leafPoolImplementation"));
+        assertEq(address(leafPoolFactory), vm.parseJsonAddress(addresses, ".leafPoolFactory"));
+        assertEq(address(leafRouter), vm.parseJsonAddress(addresses, ".leafRouter"));
 
         assertEq(leafPoolFactory.implementation(), address(leafPoolImplementation));
         assertEq(leafPoolFactory.isPaused(), false);