diff --git a/README.md b/README.md
index 01c6523..5074d76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# smart-contracts-core
+# contract-libs
 
 The collections of smart contracts that power the Axie Land Delegation.
 
diff --git a/foundry.toml b/foundry.toml
index db742ed..9082196 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -6,13 +6,6 @@ ffi = true
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 
-remappings = [
-    'contract-libs/=src/',
-    'forge-std/=lib/forge-std/src/',
-    'ds-test/=lib/forge-std/lib/ds-test/src/',
-    '@openzeppelin/=lib/openzeppelin-contracts/',
-]
-
 solc = '0.8.23'
 evm_version = 'istanbul'
 use_literal_content = true
diff --git a/lib/forge-std b/lib/forge-std
index bdea49f..2f11269 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit bdea49f9bb3c58c8c35850c3bdc17eaeea756e9a
+Subproject commit 2f112697506eab12d433a65fdc31a639548fe365
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
index 932fddf..bd325d5 160000
--- a/lib/openzeppelin-contracts
+++ b/lib/openzeppelin-contracts
@@ -1 +1 @@
-Subproject commit 932fddf69a699a9a80fd2396fd1a2ab91cdda123
+Subproject commit bd325d56b4c62c9c5c1aff048c37c6bb18ac0290
diff --git a/test/transfers/LibNativeTransfer.t.sol b/test/transfers/LibNativeTransfer.t.sol
index 0a24d69..0c70d35 100644
--- a/test/transfers/LibNativeTransfer.t.sol
+++ b/test/transfers/LibNativeTransfer.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.23;
 
 import { Test } from "forge-std/Test.sol";
-import { LibNativeTransfer } from "contract-libs/transfers/LibNativeTransfer.sol";
+import { LibNativeTransfer } from "src/transfers/LibNativeTransfer.sol";
 
 contract LibNativeTransferTest is Test {
   function testFork_RevertWhen_TransferNativeToContractWithoutFallback_safeTransfer(