diff --git a/packages/ovault-composer-evm/README.md b/packages/ovault-composer-evm/README.md
deleted file mode 100644
index e67d0c0b88..0000000000
--- a/packages/ovault-composer-evm/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<p align="center">
-  <a href="https://layerzero.network">
-    <img alt="LayerZero" style="max-width: 500px" src="https://d3a2dpnnrypp5h.cloudfront.net/bridge-app/lz.png"/>
-  </a>
-</p>
-
-<h1 align="center">@layerzerolabs/ovault-composer</h1>
-
-<!-- The badges section -->
-<p align="center">
-  <!-- Shields.io NPM published package version -->
-  <a href="https://www.npmjs.com/package/@layerzerolabs/ovault-composer"><img alt="NPM Version" src="https://img.shields.io/npm/v/@layerzerolabs/ovault-composer"/></a>
-  <!-- Shields.io NPM downloads -->
-  <a href="https://www.npmjs.com/package/@layerzerolabs/ovault-composer"><img alt="Downloads" src="https://img.shields.io/npm/dm/@layerzerolabs/ovault-composer"/></a>
-  <!-- Shields.io license badge -->
-  <a href="https://www.npmjs.com/package/@layerzerolabs/ovault-composer"><img alt="NPM License" src="https://img.shields.io/npm/l/@layerzerolabs/ovault-composer"/></a>
-</p>
-
-## Installation
-
-```bash
-pnpm install @layerzerolabs/ovault-composer
-```
-
-```bash
-yarn install @layerzerolabs/ovault-composer
-```
-
-```bash
-npm install @layerzerolabs/ovault-composer
-```
diff --git a/packages/ovault-composer-evm/.gitignore b/packages/ovault-evm/.gitignore
similarity index 100%
rename from packages/ovault-composer-evm/.gitignore
rename to packages/ovault-evm/.gitignore
diff --git a/packages/ovault-evm/README.md b/packages/ovault-evm/README.md
new file mode 100644
index 0000000000..a58b2b73b3
--- /dev/null
+++ b/packages/ovault-evm/README.md
@@ -0,0 +1,27 @@
+<p align="center">
+  <a href="https://layerzero.network">
+    <img alt="LayerZero" style="max-width: 500px" src="https://d3a2dpnnrypp5h.cloudfront.net/bridge-app/lz.png"/>
+  </a>
+</p>
+
+<h1 align="center">@layerzerolabs/ovault-evm</h1>
+
+<!-- The badges section -->
+<p align="center">
+  <!-- Shields.io NPM published package version -->
+  <a href="https://www.npmjs.com/package/@layerzerolabs/ovault-evm"><img alt="NPM Version" src="https://img.shields.io/npm/v/@layerzerolabs/ovault-evm"/></a>
+  <!-- Shields.io NPM downloads -->
+  <a href="https://www.npmjs.com/package/@layerzerolabs/ovault-evm"><img alt="Downloads" src="https://img.shields.io/npm/dm/@layerzerolabs/ovault-evm"/></a>
+  <!-- Shields.io license badge -->
+  <a href="https://www.npmjs.com/package/@layerzerolabs/ovault-evm"><img alt="NPM License" src="https://img.shields.io/npm/l/@layerzerolabs/ovault-evm"/></a>
+</p>
+
+## Installation
+
+```bash
+pnpm install @layerzerolabs/ovault-evm
+```
+
+```bash
+npm install @layerzerolabs/ovault-evm
+```
diff --git a/packages/ovault-composer-evm/contracts/OVault.sol b/packages/ovault-evm/contracts/OVault.sol
similarity index 100%
rename from packages/ovault-composer-evm/contracts/OVault.sol
rename to packages/ovault-evm/contracts/OVault.sol
diff --git a/packages/ovault-composer-evm/contracts/OVaultComposer.sol b/packages/ovault-evm/contracts/OVaultComposer.sol
similarity index 100%
rename from packages/ovault-composer-evm/contracts/OVaultComposer.sol
rename to packages/ovault-evm/contracts/OVaultComposer.sol
diff --git a/packages/ovault-composer-evm/contracts/OVaultUpgradeable.sol b/packages/ovault-evm/contracts/OVaultUpgradeable.sol
similarity index 100%
rename from packages/ovault-composer-evm/contracts/OVaultUpgradeable.sol
rename to packages/ovault-evm/contracts/OVaultUpgradeable.sol
diff --git a/packages/ovault-composer-evm/contracts/interfaces/IOVaultComposer.sol b/packages/ovault-evm/contracts/interfaces/IOVaultComposer.sol
similarity index 100%
rename from packages/ovault-composer-evm/contracts/interfaces/IOVaultComposer.sol
rename to packages/ovault-evm/contracts/interfaces/IOVaultComposer.sol
diff --git a/packages/ovault-composer-evm/foundry.toml b/packages/ovault-evm/foundry.toml
similarity index 100%
rename from packages/ovault-composer-evm/foundry.toml
rename to packages/ovault-evm/foundry.toml
diff --git a/packages/ovault-composer-evm/package.json b/packages/ovault-evm/package.json
similarity index 90%
rename from packages/ovault-composer-evm/package.json
rename to packages/ovault-evm/package.json
index dd85f85845..a743ece840 100644
--- a/packages/ovault-composer-evm/package.json
+++ b/packages/ovault-evm/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@layerzerolabs/ovault-composer-evm",
+  "name": "@layerzerolabs/ovault-evm",
   "version": "0.0.1",
-  "description": "LayerZero Labs reference EVM OVault composer implementation",
+  "description": "LayerZero Labs reference EVM OVault + composer implementation",
   "keywords": [
     "LayerZero",
     "OVault",
@@ -14,7 +14,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/LayerZero-Labs/devtools.git",
-    "directory": "packages/ovault-composer-evm"
+    "directory": "packages/ovault-evm"
   },
   "license": "MIT",
   "exports": {
diff --git a/packages/ovault-composer-evm/test/OVault.t.sol b/packages/ovault-evm/test/OVault.t.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/OVault.t.sol
rename to packages/ovault-evm/test/OVault.t.sol
diff --git a/packages/ovault-composer-evm/test/composer/OVaultComposer_Base.t.sol b/packages/ovault-evm/test/composer/OVaultComposer_Base.t.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/composer/OVaultComposer_Base.t.sol
rename to packages/ovault-evm/test/composer/OVaultComposer_Base.t.sol
diff --git a/packages/ovault-composer-evm/test/composer/OVaultComposer_E2E.t.sol b/packages/ovault-evm/test/composer/OVaultComposer_E2E.t.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/composer/OVaultComposer_E2E.t.sol
rename to packages/ovault-evm/test/composer/OVaultComposer_E2E.t.sol
diff --git a/packages/ovault-composer-evm/test/composer/OVaultComposer_Unit.t.sol b/packages/ovault-evm/test/composer/OVaultComposer_Unit.t.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/composer/OVaultComposer_Unit.t.sol
rename to packages/ovault-evm/test/composer/OVaultComposer_Unit.t.sol
diff --git a/packages/ovault-composer-evm/test/mocks/MockERC20.sol b/packages/ovault-evm/test/mocks/MockERC20.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/mocks/MockERC20.sol
rename to packages/ovault-evm/test/mocks/MockERC20.sol
diff --git a/packages/ovault-composer-evm/test/mocks/MockOFT.sol b/packages/ovault-evm/test/mocks/MockOFT.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/mocks/MockOFT.sol
rename to packages/ovault-evm/test/mocks/MockOFT.sol
diff --git a/packages/ovault-composer-evm/test/mocks/MockOVault.sol b/packages/ovault-evm/test/mocks/MockOVault.sol
similarity index 100%
rename from packages/ovault-composer-evm/test/mocks/MockOVault.sol
rename to packages/ovault-evm/test/mocks/MockOVault.sol
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4de6b1ee97..488ec978a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4368,7 +4368,7 @@ importers:
         specifier: ^6.0.1
         version: 6.0.1
 
-  packages/ovault-composer-evm:
+  packages/ovault-evm:
     devDependencies:
       '@layerzerolabs/lz-evm-messagelib-v2':
         specifier: ^3.0.75