Assorted instances of OVM prefix removed

packages/contracts/contracts/L1/messaging/L1StandardBridge.sol

 // SPDX-License-Identifier: MIT
-// @unsupported: ovm
 pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 

packages/contracts/contracts/L1/rollup/CanonicalTransactionChain.sol

 // SPDX-License-Identifier: MIT
-// @unsupported: ovm
 pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 

packages/contracts/contracts/L2/messaging/IL2ERC20Bridge.sol

@@ -92,7 +92,7 @@ interface IL2ERC20Bridge {
     /**
      * @dev Complete a deposit from L1 to L2, and credits funds to the recipient's balance of this
      * L2 token. This call will fail if it did not originate from a corresponding deposit in
-     * OVM_l1TokenGateway.
+     * L1StandardTokenBridge.
      * @param _l1Token Address for the l1 token this is called with
      * @param _l2Token Address for the l2 token this is called with
      * @param _from Account to pull the deposit from on L2.

packages/contracts/contracts/L2/messaging/L2CrossDomainMessenger.sol

@@ -23,8 +23,7 @@ import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.s
  * @dev The L2 Cross Domain Messenger contract sends messages from L2 to L1, and is the entry point
  * for L2 messages sent via the L1 Cross Domain Messenger.
  *
- * Runtime target: OVM
-  */
+*/
 contract L2CrossDomainMessenger is
     IL2CrossDomainMessenger,
     ReentrancyGuard

packages/contracts/contracts/L2/messaging/L2StandardBridge.sol

@@ -23,8 +23,6 @@ import { IL2StandardERC20 } from "../../libraries/standards/IL2StandardERC20.sol
  * bridge.
  * This contract also acts as a burner of the tokens intended for withdrawal, informing the L1
  * bridge to release L1 funds.
- *
- * Runtime target: OVM
  */
 contract L2StandardBridge is IL2ERC20Bridge, CrossDomainEnabled {
 

packages/contracts/contracts/L2/messaging/L2StandardTokenFactory.sol

@@ -10,8 +10,6 @@ import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployA
  * @title L2StandardTokenFactory
  * @dev Factory contract for creating standard L2 token representations of L1 ERC20s
  * compatible with and working on the standard bridge.
- *
- * Runtime target: OVM
  */
 contract L2StandardTokenFactory {
 

packages/contracts/contracts/L2/predeploys/OVM_DeployerWhitelist.sol

@@ -7,8 +7,6 @@ pragma solidity >0.5.0 <0.8.0;
  * initial phases of our mainnet roll out. It is owned by the Optimism team, and defines accounts
  * which are allowed to deploy contracts on Layer2. The Execution Manager will only allow an
  * ovmCREATE or ovmCREATE2 operation to proceed if the deployer's address whitelisted.
- *
- * Runtime target: OVM
  */
 contract OVM_DeployerWhitelist {
 

packages/contracts/contracts/L2/predeploys/OVM_ETH.sol

@@ -11,8 +11,6 @@ import { L2StandardERC20 } from "../../libraries/standards/L2StandardERC20.sol";
  * @title OVM_ETH
  * @dev The ETH predeploy provides an ERC20 interface for ETH deposited to Layer 2. Note that
  * unlike on Layer 1, Layer 2 accounts do not have a balance field.
- *
- * Runtime target: OVM
  */
 contract OVM_ETH is L2StandardERC20 {
 

packages/contracts/contracts/L2/predeploys/OVM_GasPriceOracle.sol

@@ -10,8 +10,6 @@ import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
  * currently is. This measure is used by the Sequencer to determine what fee to charge for
  * transactions. When the system is more congested, the l2 gas price will increase and fees
  * will also increase as a result.
- *
- * Runtime target: OVM
  */
 contract OVM_GasPriceOracle is Ownable {
 

packages/contracts/contracts/L2/predeploys/OVM_L2ToL1MessagePasser.sol

@@ -10,8 +10,6 @@ import { iOVM_L2ToL1MessagePasser } from "./iOVM_L2ToL1MessagePasser.sol";
  * of a message on L2. The L1 Cross Domain Messenger performs this proof in its
  * _verifyStorageProof function, which verifies the existence of the transaction hash in this
  * contract's `sentMessages` mapping.
- *
- * Runtime target: OVM
  */
 contract OVM_L2ToL1MessagePasser is iOVM_L2ToL1MessagePasser {
 

packages/contracts/contracts/L2/predeploys/OVM_SequencerFeeVault.sol

@@ -11,8 +11,6 @@ import { L2StandardBridge } from "../messaging/L2StandardBridge.sol";
  * @title OVM_SequencerFeeVault
  * @dev Simple holding contract for fees paid to the Sequencer. Likely to be replaced in the future
  * but "good enough for now".
- *
- * Runtime target: OVM
  */
 contract OVM_SequencerFeeVault {
 

packages/contracts/deploy/011-fund-accounts.ts

@@ -58,7 +58,7 @@ const deployFn: DeployFunction = async (hre) => {
   }
 }
 
-deployFn.dependencies = ['Proxy__OVM_L1ETHGateway']
+deployFn.dependencies = ['Proxy__L1StandardBridge']
 deployFn.tags = ['fund-accounts']
 
 export default deployFn

packages/contracts/scripts/generate-markdown.js

@@ -74,7 +74,7 @@ const networks = {
       if (contracts[i] === 'L1CrossDomainMessenger') {
         proxiedContracts.push(contracts.splice(i, 1)[0])
       }
-      if (contracts[i] === 'OVM_L1ETHGateway') {
+      if (contracts[i] === 'Proxy__L1StandardBridge') {
         proxiedContracts.push(contracts.splice(i, 1)[0])
       }
     }

packages/contracts/test/contracts/L2/predeploys/OVM_SequencerFeeVault.spec.ts

@@ -16,7 +16,7 @@ describe('OVM_SequencerFeeVault', () => {
 
   let Mock__L2StandardBridge: MockContract
   before(async () => {
-    Mock__L2StandardBridge = await smockit('OVM_L2StandardBridge', {
+    Mock__L2StandardBridge = await smockit('L2StandardBridge', {
       address: predeploys.L2StandardBridge,
     })
   })