diff --git a/src/Base.sol b/src/Base.sol
index 87315b8..3594032 100644
--- a/src/Base.sol
+++ b/src/Base.sol
@@ -7,12 +7,10 @@ library Base {
     /*** Token Addresses                                                                                            ***/
     /******************************************************************************************************************/
 
-    address internal constant SKY        = 0x60e3c701e65DEE30c23c9Fb78c3866479cc0944a;
-    address internal constant SUSDS      = 0x5875eEE11Cf8398102FdAd704C9E96607675467a;
-    address internal constant SUSDS_IMPL = 0x982f2DF63Fe38AB8d55f4B1464e8cfDc8eA5dEC8;
-    address internal constant USDC       = 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913;
-    address internal constant USDS       = 0x820C137fa70C8691f0e44Dc420a5e53c168921Dc;
-    address internal constant USDS_IMPL  = 0x191CD41681a3fE15aa15a0bec415821CE24CAd5e;
+    address internal constant SKY   = 0x60e3c701e65DEE30c23c9Fb78c3866479cc0944a;
+    address internal constant SUSDS = 0x5875eEE11Cf8398102FdAd704C9E96607675467a;
+    address internal constant USDC  = 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913;
+    address internal constant USDS  = 0x820C137fa70C8691f0e44Dc420a5e53c168921Dc;
 
     /******************************************************************************************************************/
     /*** Bridging Addresses                                                                                         ***/
@@ -20,10 +18,8 @@ library Base {
 
     address internal constant CCTP_TOKEN_MESSENGER = 0x1682Ae6375C4E4A97e4B583BC394c861A46D8962;
 
-    address internal constant SKY_GOV_RELAY      = 0xdD0BCc201C9E47c6F6eE68E4dB05b652Bb6aC255;
-    address internal constant TOKEN_BRIDGE       = 0xee44cdb68D618d58F75d9fe0818B640BD7B8A7B7;
-    address internal constant TOKEN_BRIDGE_IMPL  = 0x289A37BE5D6CCeF7A8f2b90535B3BB6bD3905f72;
-    address internal constant TOKEN_BRIDGE_SPELL = 0x6f29C3A29A3F056A71FB0714551C8D3547268D62;
+    address internal constant SKY_GOV_RELAY = 0xdD0BCc201C9E47c6F6eE68E4dB05b652Bb6aC255;
+    address internal constant TOKEN_BRIDGE  = 0xee44cdb68D618d58F75d9fe0818B640BD7B8A7B7;
 
     /******************************************************************************************************************/
     /*** Governance Relay Addresses                                                                                 ***/
diff --git a/src/Ethereum.sol b/src/Ethereum.sol
index a58e34b..a21080e 100644
--- a/src/Ethereum.sol
+++ b/src/Ethereum.sol
@@ -200,13 +200,12 @@ library Ethereum {
     /*** Base Addresses                                                                                             ***/
     /******************************************************************************************************************/
 
-    address internal constant DSR_FORWARDER_BASE = 0x8Ed551D485701fe489c215E13E42F6fc59563e0e;
-    address internal constant SSR_FORWARDER_BASE = 0xB2833392527f41262eB0E3C7b47AFbe030ef188E;
+    address internal constant BASE_DSR_FORWARDER = 0x8Ed551D485701fe489c215E13E42F6fc59563e0e;
+    address internal constant BASE_SSR_FORWARDER = 0xB2833392527f41262eB0E3C7b47AFbe030ef188E;
 
-    address internal constant BASE_TOKEN_BRIDGE      = 0xA5874756416Fa632257eEA380CAbd2E87cED352A;
-    address internal constant BASE_TOKEN_BRIDGE_IMPL = 0xaeFd31c2e593Dc971f9Cb42cBbD5d4AD7F1970b6;
-    address internal constant BASE_ESCROW            = 0x7F311a4D48377030bD810395f4CCfC03bdbe9Ef3;
-    address internal constant BASE_SKY_GOV_RELAY     = 0x1Ee0AE8A993F2f5abDB51EAF4AC2876202b65c3b;
+    address internal constant BASE_ESCROW        = 0x7F311a4D48377030bD810395f4CCfC03bdbe9Ef3;
+    address internal constant BASE_SKY_GOV_RELAY = 0x1Ee0AE8A993F2f5abDB51EAF4AC2876202b65c3b;
+    address internal constant BASE_TOKEN_BRIDGE  = 0xA5874756416Fa632257eEA380CAbd2E87cED352A;
 
     /******************************************************************************************************************/
     /*** Multisigs                                                                                                  ***/