style(ctb): short library names (#3047)

Shortens library names. Woot.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

.changeset/tender-bags-melt.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Shortens library names

packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { OptimismPortal } from "./OptimismPortal.sol";
 import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
 import { Semver } from "../universal/Semver.sol";
@@ -35,10 +35,7 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
     function initialize() public initializer {
         address[] memory blockedSystemAddresses = new address[](1);
         blockedSystemAddresses[0] = address(this);
-        __CrossDomainMessenger_init(
-            PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER,
-            blockedSystemAddresses
-        );
+        __CrossDomainMessenger_init(Predeploys.L2_CROSS_DOMAIN_MESSENGER, blockedSystemAddresses);
     }
 
     /**

packages/contracts-bedrock/contracts/L1/L1StandardBridge.sol

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { StandardBridge } from "../universal/StandardBridge.sol";
 import { Semver } from "../universal/Semver.sol";
 
@@ -100,7 +100,7 @@ contract L1StandardBridge is StandardBridge, Semver {
      * @param _messenger Address of the L1CrossDomainMessenger.
      */
     function initialize(address payable _messenger) public initializer {
-        __StandardBridge_init(_messenger, payable(PredeployAddresses.L2_STANDARD_BRIDGE));
+        __StandardBridge_init(_messenger, payable(Predeploys.L2_STANDARD_BRIDGE));
     }
 
     /**

packages/contracts-bedrock/contracts/L2/GasPriceOracle.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import { Semver } from "../universal/Semver.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { L1Block } from "../L2/L1Block.sol";
 
 /**
@@ -92,7 +92,7 @@ contract GasPriceOracle is Ownable, Semver {
      * @return Latest known L1 base fee.
      */
     function l1BaseFee() public view returns (uint256) {
-        return L1Block(PredeployAddresses.L1_BLOCK_ATTRIBUTES).basefee();
+        return L1Block(Predeploys.L1_BLOCK_ATTRIBUTES).basefee();
     }
 
     /**

packages/contracts-bedrock/contracts/L2/L1BlockNumber.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.10;
 
 import { L1Block } from "./L1Block.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { Semver } from "../universal/Semver.sol";
 
 /**
@@ -50,6 +50,6 @@ contract L1BlockNumber is Semver {
      * @return Latest L1 block number.
      */
     function getL1BlockNumber() public view returns (uint256) {
-        return L1Block(PredeployAddresses.L1_BLOCK_ATTRIBUTES).number();
+        return L1Block(Predeploys.L1_BLOCK_ATTRIBUTES).number();
     }
 }

packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.9;
 
 import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
 import { Semver } from "../universal/Semver.sol";
 import { L2ToL1MessagePasser } from "./L2ToL1MessagePasser.sol";
@@ -33,7 +33,7 @@ contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
     function initialize(address _l1CrossDomainMessenger) public initializer {
         address[] memory blockedSystemAddresses = new address[](2);
         blockedSystemAddresses[0] = address(this);
-        blockedSystemAddresses[1] = PredeployAddresses.L2_TO_L1_MESSAGE_PASSER;
+        blockedSystemAddresses[1] = Predeploys.L2_TO_L1_MESSAGE_PASSER;
         __CrossDomainMessenger_init(_l1CrossDomainMessenger, blockedSystemAddresses);
     }
 
@@ -70,7 +70,7 @@ contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
         uint256 _value,
         bytes memory _data
     ) internal override {
-        L2ToL1MessagePasser(payable(PredeployAddresses.L2_TO_L1_MESSAGE_PASSER)).initiateWithdrawal{
+        L2ToL1MessagePasser(payable(Predeploys.L2_TO_L1_MESSAGE_PASSER)).initiateWithdrawal{
             value: _value
         }(_to, _gasLimit, _data);
     }

packages/contracts-bedrock/contracts/L2/L2StandardBridge.sol

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { StandardBridge } from "../universal/StandardBridge.sol";
 import { Semver } from "../universal/Semver.sol";
 import { OptimismMintableERC20 } from "../universal/OptimismMintableERC20.sol";
@@ -93,7 +93,7 @@ contract L2StandardBridge is StandardBridge, Semver {
      * @param _otherBridge Address of the L1StandardBridge.
      */
     function initialize(address payable _otherBridge) public initializer {
-        __StandardBridge_init(payable(PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER), _otherBridge);
+        __StandardBridge_init(payable(Predeploys.L2_CROSS_DOMAIN_MESSENGER), _otherBridge);
     }
 
     /**
@@ -157,7 +157,7 @@ contract L2StandardBridge is StandardBridge, Semver {
         uint256 _amount,
         bytes calldata _extraData
     ) external payable virtual {
-        if (_l1Token == address(0) && _l2Token == PredeployAddresses.LEGACY_ERC20_ETH) {
+        if (_l1Token == address(0) && _l2Token == Predeploys.LEGACY_ERC20_ETH) {
             finalizeBridgeETH(_from, _to, _amount, _extraData);
         } else {
             finalizeBridgeERC20(_l2Token, _l1Token, _from, _to, _amount, _extraData);
@@ -185,7 +185,7 @@ contract L2StandardBridge is StandardBridge, Semver {
         bytes calldata _extraData
     ) internal {
         address l1Token = OptimismMintableERC20(_l2Token).l1Token();
-        if (_l2Token == PredeployAddresses.LEGACY_ERC20_ETH) {
+        if (_l2Token == Predeploys.LEGACY_ERC20_ETH) {
             require(
                 msg.value == _amount,
                 "L2StandardBridge: ETH withdrawals must include sufficient ETH value"

packages/contracts-bedrock/contracts/L2/SequencerFeeVault.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.9;
 
 import { Semver } from "../universal/Semver.sol";
 import { L2StandardBridge } from "./L2StandardBridge.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 
 /**
  * @custom:proxied
@@ -42,8 +42,8 @@ contract SequencerFeeVault is Semver {
             "SequencerFeeVault: withdrawal amount must be greater than minimum withdrawal amount"
         );
 
-        L2StandardBridge(payable(PredeployAddresses.L2_STANDARD_BRIDGE)).withdrawTo{
+        L2StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE)).withdrawTo{
             value: address(this).balance
-        }(PredeployAddresses.LEGACY_ERC20_ETH, l1FeeWallet, address(this).balance, 0, bytes(""));
+        }(Predeploys.LEGACY_ERC20_ETH, l1FeeWallet, address(this).balance, 0, bytes(""));
     }
 }

packages/contracts-bedrock/contracts/legacy/LegacyERC20ETH.sol

 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.10;
 
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { OptimismMintableERC20 } from "../universal/OptimismMintableERC20.sol";
 
 /**
@@ -19,7 +19,7 @@ contract LegacyERC20ETH is OptimismMintableERC20 {
      * @notice Initializes the contract as an Optimism Mintable ERC20.
      */
     constructor()
-        OptimismMintableERC20(PredeployAddresses.L2_STANDARD_BRIDGE, address(0), "Ether", "ETH")
+        OptimismMintableERC20(Predeploys.L2_STANDARD_BRIDGE, address(0), "Ether", "ETH")
     {}
 
     /**

packages/contracts-bedrock/contracts/libraries/BytesUtils.sol → packages/contracts-bedrock/contracts/libraries/Bytes.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.9;
 
 /**
- * @title BytesUtils
- * @notice BytesUtils is a library for manipulating byte arrays.
+ * @title Bytes
+ * @notice Bytes is a library for manipulating byte arrays.
  */
-library BytesUtils {
+library Bytes {
     /**
      * @custom:attribution https://github.com/GNSPS/solidity-bytes-utils
      * @notice Slices a byte array with a given starting index and length. Returns a new byte array

packages/contracts-bedrock/contracts/libraries/PredeployAddresses.sol → packages/contracts-bedrock/contracts/libraries/Predeploys.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.9;
 
 /**
- * @title PredeployAddresses
+ * @title Predeploys
  * @notice Contains constant addresses for contracts that are pre-deployed to the L2 system.
  */
-library PredeployAddresses {
+library Predeploys {
     /**
      * @notice Address of the L2ToL1MessagePasser predeploy.
      */

packages/contracts-bedrock/contracts/libraries/trie/MerkleTrie.sol

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import { BytesUtils } from "../BytesUtils.sol";
+import { Bytes } from "../Bytes.sol";
 import { RLPReader } from "../rlp/RLPReader.sol";
 import { RLPWriter } from "../rlp/RLPWriter.sol";
 
@@ -80,7 +80,7 @@ library MerkleTrie {
         bytes32 _root
     ) internal pure returns (bool) {
         (bool exists, bytes memory value) = get(_key, _proof, _root);
-        return (exists && BytesUtils.equal(_value, value));
+        return (exists && Bytes.equal(_value, value));
     }
 
     /**
@@ -140,7 +140,7 @@ library MerkleTrie {
         )
     {
         uint256 pathLength = 0;
-        bytes memory key = BytesUtils.toNibbles(_key);
+        bytes memory key = Bytes.toNibbles(_key);
 
         bytes32 currentNodeID = _root;
         uint256 currentKeyIndex = 0;
@@ -194,8 +194,8 @@ library MerkleTrie {
                 bytes memory path = _getNodePath(currentNode);
                 uint8 prefix = uint8(path[0]);
                 uint8 offset = 2 - (prefix % 2);
-                bytes memory pathRemainder = BytesUtils.slice(path, offset);
-                bytes memory keyRemainder = BytesUtils.slice(key, currentKeyIndex);
+                bytes memory pathRemainder = Bytes.slice(path, offset);
+                bytes memory keyRemainder = Bytes.slice(key, currentKeyIndex);
                 uint256 sharedNibbleLength = _getSharedNibbleLength(pathRemainder, keyRemainder);
 
                 if (prefix == PREFIX_LEAF_EVEN || prefix == PREFIX_LEAF_ODD) {
@@ -235,7 +235,7 @@ library MerkleTrie {
 
         // If our node ID is NULL, then we're at a dead end.
         bool isFinalNode = currentNodeID == bytes32(RLP_NULL);
-        return (pathLength, BytesUtils.slice(key, currentKeyIndex), isFinalNode);
+        return (pathLength, Bytes.slice(key, currentKeyIndex), isFinalNode);
     }
 
     /**
@@ -287,7 +287,7 @@ library MerkleTrie {
      * @return Node path, converted to an array of nibbles.
      */
     function _getNodePath(TrieNode memory _node) private pure returns (bytes memory) {
-        return BytesUtils.toNibbles(RLPReader.readBytes(_node.decoded[0]));
+        return Bytes.toNibbles(RLPReader.readBytes(_node.decoded[0]));
     }
 
     /**

packages/contracts-bedrock/contracts/test/CommonTest.t.sol

@@ -15,7 +15,7 @@ import { L1CrossDomainMessenger } from "../L1/L1CrossDomainMessenger.sol";
 import { L2CrossDomainMessenger } from "../L2/L2CrossDomainMessenger.sol";
 import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
 import { LegacyERC20ETH } from "../legacy/LegacyERC20ETH.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { Proxy } from "../universal/Proxy.sol";
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
@@ -157,9 +157,9 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
     AddressManager addressManager;
     L1CrossDomainMessenger L1Messenger;
     L2CrossDomainMessenger L2Messenger =
-        L2CrossDomainMessenger(PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER);
+        L2CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
     L2ToL1MessagePasser messagePasser =
-        L2ToL1MessagePasser(payable(PredeployAddresses.L2_TO_L1_MESSAGE_PASSER));
+        L2ToL1MessagePasser(payable(Predeploys.L2_TO_L1_MESSAGE_PASSER));
 
     event SentMessage(
         address indexed target,
@@ -219,7 +219,7 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
         L1Messenger.initialize();
 
         vm.etch(
-            PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER,
+            Predeploys.L2_CROSS_DOMAIN_MESSENGER,
             address(new L2CrossDomainMessenger(address(L1Messenger))).code
         );
 
@@ -227,7 +227,7 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
 
         // Set the L2ToL1MessagePasser at the correct address
         vm.etch(
-            PredeployAddresses.L2_TO_L1_MESSAGE_PASSER,
+            Predeploys.L2_TO_L1_MESSAGE_PASSER,
             address(new L2ToL1MessagePasser()).code
         );
 
@@ -235,9 +235,9 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
         vm.label(address(addressManager), "AddressManager");
         vm.label(address(L1MessengerImpl), "L1CrossDomainMessenger_Impl");
         vm.label(address(L1Messenger), "L1CrossDomainMessenger_Proxy");
-        vm.label(PredeployAddresses.LEGACY_ERC20_ETH, "LegacyERC20ETH");
-        vm.label(PredeployAddresses.L2_TO_L1_MESSAGE_PASSER, "L2ToL1MessagePasser");
-        vm.label(PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER, "L2CrossDomainMessenger");
+        vm.label(Predeploys.LEGACY_ERC20_ETH, "LegacyERC20ETH");
+        vm.label(Predeploys.L2_TO_L1_MESSAGE_PASSER, "L2ToL1MessagePasser");
+        vm.label(Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L2CrossDomainMessenger");
 
         vm.label(
             AddressAliasHelper.applyL1ToL2Alias(address(L1Messenger)),
@@ -361,8 +361,8 @@ contract Bridge_Initializer is Messenger_Initializer {
     function setUp() public virtual override {
         super.setUp();
 
-        vm.label(PredeployAddresses.L2_STANDARD_BRIDGE, "L2StandardBridge");
-        vm.label(PredeployAddresses.OPTIMISM_MINTABLE_ERC20_FACTORY, "OptimismMintableERC20Factory");
+        vm.label(Predeploys.L2_STANDARD_BRIDGE, "L2StandardBridge");
+        vm.label(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY, "OptimismMintableERC20Factory");
 
         // Deploy the L1 bridge and initialize it with the address of the
         // L1CrossDomainMessenger
@@ -386,21 +386,21 @@ contract Bridge_Initializer is Messenger_Initializer {
 
         // Deploy the L2StandardBridge, move it to the correct predeploy
         // address and then initialize it
-        L2StandardBridge l2B = new L2StandardBridge(payable(PredeployAddresses.L2_STANDARD_BRIDGE));
-        vm.etch(PredeployAddresses.L2_STANDARD_BRIDGE, address(l2B).code);
-        L2Bridge = L2StandardBridge(payable(PredeployAddresses.L2_STANDARD_BRIDGE));
+        L2StandardBridge l2B = new L2StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE));
+        vm.etch(Predeploys.L2_STANDARD_BRIDGE, address(l2B).code);
+        L2Bridge = L2StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE));
         L2Bridge.initialize(payable(address(L1Bridge)));
 
         // Set up the L2 mintable token factory
         OptimismMintableERC20Factory factory = new OptimismMintableERC20Factory(
-            PredeployAddresses.L2_STANDARD_BRIDGE
+            Predeploys.L2_STANDARD_BRIDGE
         );
-        vm.etch(PredeployAddresses.OPTIMISM_MINTABLE_ERC20_FACTORY, address(factory).code);
+        vm.etch(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY, address(factory).code);
         L2TokenFactory = OptimismMintableERC20Factory(
-            PredeployAddresses.OPTIMISM_MINTABLE_ERC20_FACTORY
+            Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY
         );
 
-        vm.etch(PredeployAddresses.LEGACY_ERC20_ETH, address(new LegacyERC20ETH()).code);
+        vm.etch(Predeploys.LEGACY_ERC20_ETH, address(new LegacyERC20ETH()).code);
 
         L1Token = new ERC20("Native L1 Token", "L1T");
 

packages/contracts-bedrock/contracts/test/GasPriceOracle.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.10;
 import { CommonTest } from "./CommonTest.t.sol";
 import { GasPriceOracle } from "../L2/GasPriceOracle.sol";
 import { L1Block } from "../L2/L1Block.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 
 contract GasPriceOracle_Test is CommonTest {
 
@@ -19,11 +19,11 @@ contract GasPriceOracle_Test is CommonTest {
     function setUp() external {
         // place the L1Block contract at the predeploy address
         vm.etch(
-            PredeployAddresses.L1_BLOCK_ATTRIBUTES,
+            Predeploys.L1_BLOCK_ATTRIBUTES,
             address(new L1Block()).code
         );
 
-        l1Block = L1Block(PredeployAddresses.L1_BLOCK_ATTRIBUTES);
+        l1Block = L1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
         depositor = l1Block.DEPOSITOR_ACCOUNT();
 
         // We are not setting the gas oracle at its predeploy

packages/contracts-bedrock/contracts/test/L1BlockNumber.t.sol

@@ -4,15 +4,15 @@ pragma solidity 0.8.10;
 import { Test } from "forge-std/Test.sol";
 import { L1Block } from "../L2/L1Block.sol";
 import { L1BlockNumber } from "../L2/L1BlockNumber.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 
 contract L1BlockNumberTest is Test {
     L1Block lb;
     L1BlockNumber bn;
 
     function setUp() external {
-        vm.etch(PredeployAddresses.L1_BLOCK_ATTRIBUTES, address(new L1Block()).code);
-        lb = L1Block(PredeployAddresses.L1_BLOCK_ATTRIBUTES);
+        vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, address(new L1Block()).code);
+        lb = L1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
         bn = new L1BlockNumber();
         vm.prank(lb.DEPOSITOR_ACCOUNT());
         lb.setL1BlockValues(uint64(999), uint64(2), 3, keccak256(abi.encode(1)), uint64(4));

packages/contracts-bedrock/contracts/test/L1CrossDomainMessenger.t.sol

@@ -7,7 +7,7 @@ import { L2OutputOracle_Initializer } from "./L2OutputOracle.t.sol";
 
 /* Libraries */
 import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { Hashing } from "../libraries/Hashing.sol";
 import { Encoding } from "../libraries/Encoding.sol";
 
@@ -69,7 +69,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
             address(op),
             abi.encodeWithSelector(
                 OptimismPortal.depositTransaction.selector,
-                PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER,
+                Predeploys.L2_CROSS_DOMAIN_MESSENGER,
                 0,
                 L1Messenger.baseGas(hex"ff", 100),
                 false,
@@ -88,7 +88,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         vm.expectEmit(true, true, true, true);
         emitTransactionDeposited(
             AddressAliasHelper.applyL1ToL2Alias(address(L1Messenger)),
-            PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER,
+            Predeploys.L2_CROSS_DOMAIN_MESSENGER,
             0,
             0,
             L1Messenger.baseGas(hex"ff", 100),
@@ -132,7 +132,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     // relayMessage: should send a successful call to the target contract
     function test_L1MessengerRelayMessageSucceeds() external {
         address target = address(0xabcd);
-        address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
 
         vm.expectCall(target, hex"1111");
 
@@ -166,7 +166,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     function test_L1MessengerRelayMessageToSystemContract() external {
         // set the target to be the OptimismPortal
         address target = address(op);
-        address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
         bytes memory message = hex"1111";
 
         vm.prank(address(op));
@@ -181,7 +181,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     // relayMessage: should revert if eth is sent from a contract other than the standard bridge
     function test_L1MessengerReplayMessageWithValue() external {
         address target = address(0xabcd);
-        address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
         bytes memory message = hex"1111";
 
         vm.expectRevert(
@@ -195,7 +195,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         vm.expectRevert("CrossDomainMessenger: xDomainMessageSender is not set");
         L1Messenger.xDomainMessageSender();
 
-        address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
 
         uint256 senderSlotIndex = 51;
 
@@ -220,7 +220,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     // fails and ETH gets stuck, but the second message succeeds
     function test_L1MessengerRelayMessageFirstStuckSecondSucceeds() external {
         address target = address(0xabcd);
-        address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
         uint256 value = 100;
 
         vm.expectCall(target, hex"1111");
@@ -270,7 +270,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     // relayMessage: should revert if recipient is trying to reenter
     function test_L1MessengerRelayMessageRevertsOnReentrancy() external {
         address target = address(0xabcd);
-        address sender = PredeployAddresses.L2_CROSS_DOMAIN_MESSENGER;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
         bytes memory message = abi.encodeWithSelector(
             L1Messenger.relayMessage.selector,
             0,

packages/contracts-bedrock/contracts/test/L1StandardBridge.t.sol

@@ -5,7 +5,7 @@ import { Bridge_Initializer } from "./CommonTest.t.sol";
 import { StandardBridge } from "../universal/StandardBridge.sol";
 import { L2StandardBridge } from "../L2/L2StandardBridge.sol";
 import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { stdStorage, StdStorage } from "forge-std/Test.sol";
@@ -25,12 +25,12 @@ contract L1StandardBridge_Test is Bridge_Initializer {
 
         assertEq(
             address(L1Bridge.otherBridge()),
-            PredeployAddresses.L2_STANDARD_BRIDGE
+            Predeploys.L2_STANDARD_BRIDGE
         );
 
         assertEq(
             address(L2Bridge),
-            PredeployAddresses.L2_STANDARD_BRIDGE
+            Predeploys.L2_STANDARD_BRIDGE
         );
     }
 

packages/contracts-bedrock/contracts/test/L2StandardBridge.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.10;
 import { Bridge_Initializer } from "./CommonTest.t.sol";
 import { stdStorage, StdStorage } from "forge-std/Test.sol";
 import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 import { console } from "forge-std/console.sol";
 
 contract L2StandardBridge_Test is Bridge_Initializer {
@@ -53,7 +53,7 @@ contract L2StandardBridge_Test is Bridge_Initializer {
         vm.expectRevert("L2StandardBridge: ETH withdrawals must include sufficient ETH value");
         vm.prank(alice, alice);
         L2Bridge.withdraw(
-            address(PredeployAddresses.LEGACY_ERC20_ETH),
+            address(Predeploys.LEGACY_ERC20_ETH),
             100,
             1000,
             hex""

packages/contracts-bedrock/contracts/test/LegacyERC20ETH.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.9;
 
 import { CommonTest } from "./CommonTest.t.sol";
 import { LegacyERC20ETH } from "../legacy/LegacyERC20ETH.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 
 contract LegacyERC20ETH_Test is CommonTest {
     LegacyERC20ETH eth;
@@ -19,7 +19,7 @@ contract LegacyERC20ETH_Test is CommonTest {
     }
 
     function test_crossDomain() external {
-        assertEq(eth.l2Bridge(), PredeployAddresses.L2_STANDARD_BRIDGE);
+        assertEq(eth.l2Bridge(), Predeploys.L2_STANDARD_BRIDGE);
         assertEq(eth.l1Token(), address(0));
     }
 

packages/contracts-bedrock/contracts/test/SequencerFeeVault.t.sol

@@ -5,23 +5,23 @@ import { Bridge_Initializer } from "./CommonTest.t.sol";
 
 import { SequencerFeeVault } from "../L2/SequencerFeeVault.sol";
 import { L2StandardBridge } from "../L2/L2StandardBridge.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
 
 contract SequencerFeeVault_Test is Bridge_Initializer {
     SequencerFeeVault vault =
-        SequencerFeeVault(payable(PredeployAddresses.SEQUENCER_FEE_WALLET));
+        SequencerFeeVault(payable(Predeploys.SEQUENCER_FEE_WALLET));
     address constant recipient = address(256);
 
     function setUp() public override {
         super.setUp();
 
         vm.etch(
-            PredeployAddresses.SEQUENCER_FEE_WALLET,
+            Predeploys.SEQUENCER_FEE_WALLET,
             address(new SequencerFeeVault()).code
         );
 
         vm.store(
-            PredeployAddresses.SEQUENCER_FEE_WALLET,
+            Predeploys.SEQUENCER_FEE_WALLET,
             bytes32(uint256(0)),
             bytes32(uint256(uint160(recipient)))
         );
@@ -70,10 +70,10 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
         vm.deal(address(vault), vault.MIN_WITHDRAWAL_AMOUNT() + 1);
 
         vm.expectCall(
-            PredeployAddresses.L2_STANDARD_BRIDGE,
+            Predeploys.L2_STANDARD_BRIDGE,
             abi.encodeWithSelector(
                 L2StandardBridge.withdrawTo.selector,
-                PredeployAddresses.LEGACY_ERC20_ETH,
+                Predeploys.LEGACY_ERC20_ETH,
                 vault.l1FeeWallet(),
                 address(vault).balance,
                 0,

packages/contracts-bedrock/contracts/universal/OptimismMintableERC20Factory.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.9;
 
 /* Contract Imports */
 import { OptimismMintableERC20 } from "../universal/OptimismMintableERC20.sol";
-import { PredeployAddresses } from "../libraries/PredeployAddresses.sol";
 
 /**
  * @custom:proxied