Rename OVM_CrossDomainEnabled to CrossDomainEnabled

packages/contracts/contracts/L1/messaging/IL1CrossDomainMessenger.sol

@@ -6,12 +6,12 @@ pragma experimental ABIEncoderV2;
 import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
 /* Interface Imports */
-import { iOVM_CrossDomainMessenger } from "../../libraries/bridge/iOVM_CrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "../../libraries/bridge/ICrossDomainMessenger.sol";
 
 /**
  * @title IL1CrossDomainMessenger
  */
-interface IL1CrossDomainMessenger is iOVM_CrossDomainMessenger {
+interface IL1CrossDomainMessenger is ICrossDomainMessenger {
 
     /*******************
      * Data Structures *

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

@@ -10,7 +10,7 @@ import { IL2ERC20Bridge } from "../../L2/messaging/IL2ERC20Bridge.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /* Library Imports */
-import { OVM_CrossDomainEnabled } from "../../libraries/bridge/OVM_CrossDomainEnabled.sol";
+import { CrossDomainEnabled } from "../../libraries/bridge/CrossDomainEnabled.sol";
 import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
@@ -24,7 +24,7 @@ import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
  *
  * Runtime target: EVM
  */
-contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled {
+contract L1StandardBridge is IL1StandardBridge, CrossDomainEnabled {
     using SafeMath for uint;
     using SafeERC20 for IERC20;
 
@@ -43,7 +43,7 @@ contract L1StandardBridge is IL1StandardBridge, OVM_CrossDomainEnabled {
 
     // This contract lives behind a proxy, so the constructor parameters will go unused.
     constructor()
-        OVM_CrossDomainEnabled(address(0))
+        CrossDomainEnabled(address(0))
     {}
 
     /******************

packages/contracts/contracts/L2/messaging/IL2CrossDomainMessenger.sol

@@ -3,12 +3,12 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Interface Imports */
-import { iOVM_CrossDomainMessenger } from "../../libraries/bridge/iOVM_CrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "../../libraries/bridge/ICrossDomainMessenger.sol";
 
 /**
  * @title IL2CrossDomainMessenger
  */
-interface IL2CrossDomainMessenger is iOVM_CrossDomainMessenger {
+interface IL2CrossDomainMessenger is ICrossDomainMessenger {
 
     /********************
      * Public Functions *

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

@@ -9,7 +9,7 @@ import { IL2ERC20Bridge } from "./IL2ERC20Bridge.sol";
 
 /* Library Imports */
 import { ERC165Checker } from "@openzeppelin/contracts/introspection/ERC165Checker.sol";
-import { OVM_CrossDomainEnabled } from "../../libraries/bridge/OVM_CrossDomainEnabled.sol";
+import { CrossDomainEnabled } from "../../libraries/bridge/CrossDomainEnabled.sol";
 import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 
 /* Contract Imports */
@@ -26,7 +26,7 @@ import { IL2StandardERC20 } from "../../libraries/standards/IL2StandardERC20.sol
  *
  * Runtime target: OVM
  */
-contract L2StandardBridge is IL2ERC20Bridge, OVM_CrossDomainEnabled {
+contract L2StandardBridge is IL2ERC20Bridge, CrossDomainEnabled {
 
     /********************************
      * External Contract References *
@@ -46,7 +46,7 @@ contract L2StandardBridge is IL2ERC20Bridge, OVM_CrossDomainEnabled {
         address _l2CrossDomainMessenger,
         address _l1TokenBridge
     )
-        OVM_CrossDomainEnabled(_l2CrossDomainMessenger)
+        CrossDomainEnabled(_l2CrossDomainMessenger)
     {
         l1TokenBridge = _l1TokenBridge;
     }

packages/contracts/contracts/libraries/bridge/OVM_CrossDomainEnabled.sol → packages/contracts/contracts/libraries/bridge/CrossDomainEnabled.sol

@@ -2,16 +2,16 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
-import { iOVM_CrossDomainMessenger } from "./iOVM_CrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "./ICrossDomainMessenger.sol";
 
 /**
- * @title OVM_CrossDomainEnabled
+ * @title CrossDomainEnabled
  * @dev Helper contract for contracts performing cross-domain communications
  *
  * Compiler used: defined by inheriting contract
  * Runtime target: defined by inheriting contract
  */
-contract OVM_CrossDomainEnabled {
+contract CrossDomainEnabled {
 
     /*************
      * Variables *
@@ -74,10 +74,10 @@ contract OVM_CrossDomainEnabled {
         internal
         virtual
         returns (
-            iOVM_CrossDomainMessenger
+            ICrossDomainMessenger
         )
     {
-        return iOVM_CrossDomainMessenger(messenger);
+        return ICrossDomainMessenger(messenger);
     }
 
     /**

packages/contracts/contracts/libraries/bridge/iOVM_CrossDomainMessenger.sol → packages/contracts/contracts/libraries/bridge/ICrossDomainMessenger.sol

@@ -3,9 +3,9 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /**
- * @title iOVM_CrossDomainMessenger
+ * @title ICrossDomainMessenger
  */
-interface iOVM_CrossDomainMessenger {
+interface ICrossDomainMessenger {
 
     /**********
      * Events *