diff --git a/solidity/contracts/HyperlaneConnectionClient.sol b/solidity/contracts/HyperlaneConnectionClient.sol
index 179a5f7c9..e03c024cc 100644
--- a/solidity/contracts/HyperlaneConnectionClient.sol
+++ b/solidity/contracts/HyperlaneConnectionClient.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.6.11;
 
 // ============ Internal Imports ============
 import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
-import {IMailbox} from "../interfaces/IMailboxV2.sol";
+import {IMailbox} from "../interfaces/IMailbox.sol";
 
 // ============ External Imports ============
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
diff --git a/solidity/contracts/MailboxV2.sol b/solidity/contracts/Mailbox.sol
similarity index 98%
rename from solidity/contracts/MailboxV2.sol
rename to solidity/contracts/Mailbox.sol
index f79e4ea9a..39b01e061 100644
--- a/solidity/contracts/MailboxV2.sol
+++ b/solidity/contracts/Mailbox.sol
@@ -4,11 +4,11 @@ pragma solidity >=0.8.0;
 // ============ Internal Imports ============
 import {Versioned} from "./upgrade/Versioned.sol";
 import {MerkleLib} from "./libs/Merkle.sol";
-import {Message} from "./libs/MessageV2.sol";
+import {Message} from "./libs/Message.sol";
 import {TypeCasts} from "./libs/TypeCasts.sol";
 import {IMessageRecipient} from "../interfaces/IMessageRecipient.sol";
 import {IInterchainSecurityModule, ISpecifiesInterchainSecurityModule} from "../interfaces/IInterchainSecurityModule.sol";
-import {IMailbox} from "../interfaces/IMailboxV2.sol";
+import {IMailbox} from "../interfaces/IMailbox.sol";
 
 // ============ External Imports ============
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
diff --git a/solidity/contracts/Router.sol b/solidity/contracts/Router.sol
index 3158266c8..7d155edf5 100644
--- a/solidity/contracts/Router.sol
+++ b/solidity/contracts/Router.sol
@@ -5,7 +5,7 @@ pragma solidity >=0.6.11;
 import {HyperlaneConnectionClient} from "./HyperlaneConnectionClient.sol";
 import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
 import {IMessageRecipient} from "../interfaces/IMessageRecipient.sol";
-import {IMailbox} from "../interfaces/IMailboxV2.sol";
+import {IMailbox} from "../interfaces/IMailbox.sol";
 
 abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
     string constant NO_ROUTER_ENROLLED_REVERT_MESSAGE =
diff --git a/solidity/contracts/isms/MultisigIsm.sol b/solidity/contracts/isms/MultisigIsm.sol
index 3eaa7373e..a5411b595 100644
--- a/solidity/contracts/isms/MultisigIsm.sol
+++ b/solidity/contracts/isms/MultisigIsm.sol
@@ -8,7 +8,7 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 
 // ============ Internal Imports ============
 import {IMultisigIsm} from "../../interfaces/IMultisigIsm.sol";
-import {Message} from "../libs/MessageV2.sol";
+import {Message} from "../libs/Message.sol";
 import {MultisigIsmMetadata} from "../libs/MultisigIsmMetadata.sol";
 import {MerkleLib} from "../libs/Merkle.sol";
 
diff --git a/solidity/contracts/libs/MessageV2.sol b/solidity/contracts/libs/Message.sol
similarity index 100%
rename from solidity/contracts/libs/MessageV2.sol
rename to solidity/contracts/libs/Message.sol
diff --git a/solidity/contracts/test/TestHyperlaneConnectionClient.sol b/solidity/contracts/test/TestHyperlaneConnectionClient.sol
index 659e5af71..af90bdced 100644
--- a/solidity/contracts/test/TestHyperlaneConnectionClient.sol
+++ b/solidity/contracts/test/TestHyperlaneConnectionClient.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 pragma solidity >=0.6.11;
 import {HyperlaneConnectionClient} from "../HyperlaneConnectionClient.sol";
-import {IMailbox} from "../../interfaces/IMailboxV2.sol";
+import {IMailbox} from "../../interfaces/IMailbox.sol";
 
 contract TestHyperlaneConnectionClient is HyperlaneConnectionClient {
     function initialize(address _abacusConnectionManager) external initializer {
diff --git a/solidity/contracts/test/TestMailboxV2.sol b/solidity/contracts/test/TestMailbox.sol
similarity index 96%
rename from solidity/contracts/test/TestMailboxV2.sol
rename to solidity/contracts/test/TestMailbox.sol
index 62e02098d..6d195df07 100644
--- a/solidity/contracts/test/TestMailboxV2.sol
+++ b/solidity/contracts/test/TestMailbox.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 pragma solidity >=0.8.0;
 
-import {Mailbox} from "../MailboxV2.sol";
+import {Mailbox} from "../Mailbox.sol";
 import {TypeCasts} from "../libs/TypeCasts.sol";
 import {MerkleLib} from "../libs/Merkle.sol";
 import {IMessageRecipient} from "../../interfaces/IMessageRecipient.sol";
diff --git a/solidity/contracts/test/TestMessageV2.sol b/solidity/contracts/test/TestMessage.sol
similarity index 97%
rename from solidity/contracts/test/TestMessageV2.sol
rename to solidity/contracts/test/TestMessage.sol
index b30815f3e..7521f0cdf 100644
--- a/solidity/contracts/test/TestMessageV2.sol
+++ b/solidity/contracts/test/TestMessage.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 pragma solidity >=0.6.11;
 
-import {Message} from "../libs/MessageV2.sol";
+import {Message} from "../libs/Message.sol";
 
 contract TestMessage {
     using Message for bytes;
diff --git a/solidity/contracts/test/TestSendReceiver.sol b/solidity/contracts/test/TestSendReceiver.sol
index ff0da3b1c..fe4381c02 100644
--- a/solidity/contracts/test/TestSendReceiver.sol
+++ b/solidity/contracts/test/TestSendReceiver.sol
@@ -5,7 +5,7 @@ import {TypeCasts} from "../libs/TypeCasts.sol";
 
 import {IInterchainGasPaymaster} from "../../interfaces/IInterchainGasPaymaster.sol";
 import {IMessageRecipient} from "../../interfaces/IMessageRecipient.sol";
-import {IMailbox} from "../../interfaces/IMailboxV2.sol";
+import {IMailbox} from "../../interfaces/IMailbox.sol";
 
 contract TestSendReceiver is IMessageRecipient {
     using TypeCasts for address;
diff --git a/solidity/interfaces/IMailboxV2.sol b/solidity/interfaces/IMailbox.sol
similarity index 100%
rename from solidity/interfaces/IMailboxV2.sol
rename to solidity/interfaces/IMailbox.sol
diff --git a/solidity/test/lib/mailboxes.ts b/solidity/test/lib/mailboxes.ts
index ff6b2c63b..e72bcad0f 100644
--- a/solidity/test/lib/mailboxes.ts
+++ b/solidity/test/lib/mailboxes.ts
@@ -4,7 +4,7 @@ import { ethers } from 'ethers';
 import { Validator, types, utils } from '@hyperlane-xyz/utils';
 
 import { MultisigIsm, TestMailbox } from '../../types';
-import { DispatchEvent } from '../../types/contracts/MailboxV2.sol/Mailbox';
+import { DispatchEvent } from '../../types/contracts/Mailbox';
 
 export type MessageAndProof = {
   proof: types.MerkleProof;
diff --git a/solidity/test/mailboxv2.test.ts b/solidity/test/mailbox.test.ts
similarity index 100%
rename from solidity/test/mailboxv2.test.ts
rename to solidity/test/mailbox.test.ts
diff --git a/solidity/test/messagev2.test.ts b/solidity/test/message.test.ts
similarity index 100%
rename from solidity/test/messagev2.test.ts
rename to solidity/test/message.test.ts
diff --git a/typescript/infra/test/core.test.ts b/typescript/infra/test/core.test.ts
index d8deac634..bad0d5fcb 100644
--- a/typescript/infra/test/core.test.ts
+++ b/typescript/infra/test/core.test.ts
@@ -36,11 +36,11 @@ describe('core', async () => {
     // This is kind of awkward and really these tests shouldn't live here
     multiProvider = getTestMultiProvider(signer, testConfig.transactionConfigs);
     coreConfig = testConfig.core;
-    deployer = new HyperlaneCoreInfraDeployer(multiProvider, coreConfig);
     owners = objMap(testConfig.transactionConfigs, () => owner.address);
   });
 
   it('deploys', async () => {
+    deployer = new HyperlaneCoreInfraDeployer(multiProvider, coreConfig);
     contracts = await deployer.deploy();
   });
 
@@ -58,6 +58,7 @@ describe('core', async () => {
 
   describe('failure modes', async () => {
     beforeEach(async () => {
+      deployer = new HyperlaneCoreInfraDeployer(multiProvider, coreConfig);
       const stub = sinon.stub(deployer, 'deployContracts');
       stub.withArgs('test3', sinon.match.any).rejects();
       // @ts-ignore
diff --git a/typescript/sdk/src/core/events.ts b/typescript/sdk/src/core/events.ts
index c8effe0ae..852b8e4f6 100644
--- a/typescript/sdk/src/core/events.ts
+++ b/typescript/sdk/src/core/events.ts
@@ -1,7 +1,7 @@
 import type {
   DispatchEvent,
   ProcessEvent,
-} from '@hyperlane-xyz/core/dist/contracts/MailboxV2.sol/Mailbox';
+} from '@hyperlane-xyz/core/dist/contracts/Mailbox';
 
 import { Annotated } from '../events';