diff --git a/solidity_contracts/src/CairoPrecompiles/DualVmToken.sol b/solidity_contracts/src/CairoPrecompiles/DualVmToken.sol
index 779eb2e10..d6e388375 100644
--- a/solidity_contracts/src/CairoPrecompiles/DualVmToken.sol
+++ b/solidity_contracts/src/CairoPrecompiles/DualVmToken.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.27;
 
 import {WhitelistedCallCairoLib} from "./WhitelistedCallCairoLib.sol";
 import {CairoLib} from "kakarot-lib/CairoLib.sol";
-import {NoDelegateCall} from "../Security/NoDelegateCall.sol";
+import {NoDelegateCall} from "../NoDelegateCall/NoDelegateCall.sol";
 
 /// @notice EVM adapter into a Cairo ERC20 token
 /// @dev This implementation is highly experimental
diff --git a/solidity_contracts/src/L1L2Messaging/L2KakarotMessaging.sol b/solidity_contracts/src/L1L2Messaging/L2KakarotMessaging.sol
index 2018aab02..becbeebe5 100644
--- a/solidity_contracts/src/L1L2Messaging/L2KakarotMessaging.sol
+++ b/solidity_contracts/src/L1L2Messaging/L2KakarotMessaging.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.27;
 
 import {CairoLib} from "kakarot-lib/CairoLib.sol";
-import {NoDelegateCall} from "../Security/NoDelegateCall.sol";
+import {NoDelegateCall} from "../NoDelegateCall/NoDelegateCall.sol";
 
 contract L2KakarotMessaging is NoDelegateCall {
     /// @notice Sends a message to a contract on L1.
diff --git a/solidity_contracts/src/Security/DualVmTokenHack.sol b/solidity_contracts/src/NoDelegateCall/DualVmTokenHack.sol
similarity index 100%
rename from solidity_contracts/src/Security/DualVmTokenHack.sol
rename to solidity_contracts/src/NoDelegateCall/DualVmTokenHack.sol
diff --git a/solidity_contracts/src/Security/DualVmTokenWithoutModifier.sol b/solidity_contracts/src/NoDelegateCall/DualVmTokenWithoutModifier.sol
similarity index 100%
rename from solidity_contracts/src/Security/DualVmTokenWithoutModifier.sol
rename to solidity_contracts/src/NoDelegateCall/DualVmTokenWithoutModifier.sol
diff --git a/solidity_contracts/src/Security/L2KakarotMessagingHack.sol b/solidity_contracts/src/NoDelegateCall/L2KakarotMessagingHack.sol
similarity index 100%
rename from solidity_contracts/src/Security/L2KakarotMessagingHack.sol
rename to solidity_contracts/src/NoDelegateCall/L2KakarotMessagingHack.sol
diff --git a/solidity_contracts/src/Security/NoDelegateCall.sol b/solidity_contracts/src/NoDelegateCall/NoDelegateCall.sol
similarity index 100%
rename from solidity_contracts/src/Security/NoDelegateCall.sol
rename to solidity_contracts/src/NoDelegateCall/NoDelegateCall.sol
diff --git a/tests/end_to_end/Security/test_dual_vm_token_hack.py b/tests/end_to_end/NoDelegateCall/test_dual_vm_token_hack.py
similarity index 98%
rename from tests/end_to_end/Security/test_dual_vm_token_hack.py
rename to tests/end_to_end/NoDelegateCall/test_dual_vm_token_hack.py
index 5db2cca8a..2761c2f81 100644
--- a/tests/end_to_end/Security/test_dual_vm_token_hack.py
+++ b/tests/end_to_end/NoDelegateCall/test_dual_vm_token_hack.py
@@ -30,7 +30,7 @@ async def starknet_token(owner):
     scope="package",
     params=[
         ("CairoPrecompiles", "DualVmToken"),
-        ("Security", "DualVmTokenWithoutModifier"),
+        ("NoDelegateCallTesting", "DualVmTokenWithoutModifier"),
     ],
     ids=["Modifier", "NoModifier"],
 )
diff --git a/tests/end_to_end/Security/test_l2_messaging_hack.py b/tests/end_to_end/NoDelegateCall/test_l2_messaging_hack.py
similarity index 97%
rename from tests/end_to_end/Security/test_l2_messaging_hack.py
rename to tests/end_to_end/NoDelegateCall/test_l2_messaging_hack.py
index bd6ef0a0e..a73eb6215 100644
--- a/tests/end_to_end/Security/test_l2_messaging_hack.py
+++ b/tests/end_to_end/NoDelegateCall/test_l2_messaging_hack.py
@@ -9,7 +9,7 @@
 @pytest_asyncio.fixture(scope="function")
 async def messaging_hack_contract(owner):
     return await deploy(
-        "Security",
+        "NoDelegateCallTesting",
         "L2MessagingHack",
         _target=to_checksum_address(
             get_evm_deployments()["L2KakarotMessaging"]["address"]