Rename OVM_L2StandardTokenFactory to L2StandardTokenFactory

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

@@ -7,13 +7,13 @@ import { L2StandardERC20 } from "../../libraries/standards/L2StandardERC20.sol";
 import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 
 /**
- * @title OVM_L2StandardTokenFactory
+ * @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 OVM_L2StandardTokenFactory {
+contract L2StandardTokenFactory {
 
     event StandardL2TokenCreated(address indexed _l1Token, address indexed _l2Token);
 

packages/contracts/src/predeploys.ts

@@ -15,7 +15,7 @@ export const predeploys = {
   OVM_GasPriceOracle: '0x420000000000000000000000000000000000000F',
   L2StandardBridge: '0x4200000000000000000000000000000000000010',
   OVM_SequencerFeeVault: '0x4200000000000000000000000000000000000011',
-  OVM_L2StandardTokenFactory: '0x4200000000000000000000000000000000000012',
+  L2StandardTokenFactory: '0x4200000000000000000000000000000000000012',
   OVM_L1BlockNumber: '0x4200000000000000000000000000000000000013',
 
   // We're temporarily disabling OVM_ETH because the jury is still out on whether or not ETH as an

packages/contracts/test/contracts/L2/messaging/OVM_L2StandardTokenFactory.spec.ts → packages/contracts/test/contracts/L2/messaging/L2StandardTokenFactory.spec.ts

@@ -8,11 +8,11 @@ import { smoddit } from '@eth-optimism/smock'
 /* Internal Imports */
 import { predeploys, getContractInterface } from '../../../../src'
 
-describe('OVM_L2StandardTokenFactory', () => {
+describe('L2StandardTokenFactory', () => {
   let signer: Signer
   let Factory__L1ERC20: ContractFactory
   let L1ERC20: Contract
-  let OVM_L2StandardTokenFactory: Contract
+  let L2StandardTokenFactory: Contract
   before(async () => {
     ;[signer] = await ethers.getSigners()
     // deploy an ERC20 contract on L1
@@ -21,14 +21,14 @@ describe('OVM_L2StandardTokenFactory', () => {
     )
     L1ERC20 = await Factory__L1ERC20.deploy('L1ERC20', 'ERC')
 
-    OVM_L2StandardTokenFactory = await (
-      await ethers.getContractFactory('OVM_L2StandardTokenFactory')
+    L2StandardTokenFactory = await (
+      await ethers.getContractFactory('L2StandardTokenFactory')
     ).deploy()
   })
 
   describe('Standard token factory', () => {
     it('should be able to create a standard token', async () => {
-      const tx = await OVM_L2StandardTokenFactory.createStandardL2Token(
+      const tx = await L2StandardTokenFactory.createStandardL2Token(
         L1ERC20.address,
         'L2ERC20',
         'ERC'
@@ -55,7 +55,7 @@ describe('OVM_L2StandardTokenFactory', () => {
 
     it('should not be able to create a standard token with a 0 address for l1 token', async () => {
       await expect(
-        OVM_L2StandardTokenFactory.createStandardL2Token(
+        L2StandardTokenFactory.createStandardL2Token(
           ethers.constants.AddressZero,
           'L2ERC20',
           'ERC'