diff --git a/contracts/CMTAT_STANDALONE.sol b/contracts/CMTAT_STANDALONE.sol
index 5a35501d..dfe10c6d 100644
--- a/contracts/CMTAT_STANDALONE.sol
+++ b/contracts/CMTAT_STANDALONE.sol
@@ -29,7 +29,7 @@ contract CMTAT_STANDALONE is CMTAT_BASE {
         uint8 decimalsIrrevocable,
         string memory tokenId_,
         string memory terms_,
-        IRuleEngineCMTAT ruleEngine_,
+        IRuleEngine ruleEngine_,
         string memory information_,
         uint256 flag_
     ) MetaTxModule(forwarderIrrevocable) {
diff --git a/contracts/interfaces/engine/IRuleEngineCMTAT.sol b/contracts/interfaces/engine/IRuleEngine.sol
similarity index 88%
rename from contracts/interfaces/engine/IRuleEngineCMTAT.sol
rename to contracts/interfaces/engine/IRuleEngine.sol
index 097ee62f..7c523212 100644
--- a/contracts/interfaces/engine/IRuleEngineCMTAT.sol
+++ b/contracts/interfaces/engine/IRuleEngine.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 
 import "../draft-IERC1404/draft-IERC1404Wrapper.sol";
 
-interface IRuleEngineCMTAT is IERC1404Wrapper {
+interface IRuleEngine is IERC1404Wrapper {
     /**
      * @dev Returns true if the operation is a success, and false otherwise.
      */
diff --git a/contracts/mocks/RuleEngine/RuleEngineMock.sol b/contracts/mocks/RuleEngine/RuleEngineMock.sol
index a63fecc5..409b515a 100644
--- a/contracts/mocks/RuleEngine/RuleEngineMock.sol
+++ b/contracts/mocks/RuleEngine/RuleEngineMock.sol
@@ -3,14 +3,14 @@
 pragma solidity ^0.8.20;
 
 import "./interfaces/IRule.sol";
-import "./interfaces/IRuleEngine.sol";
+import "./interfaces/IRuleEngineMock.sol";
 import "./RuleMock.sol";
 import "./CodeList.sol";
 
 /*
 @title a mock for testing, not suitable for production
 */
-contract RuleEngineMock is IRuleEngine {
+contract RuleEngineMock is IRuleEngineMock {
     IRule[] internal _rules;
 
     constructor() {
diff --git a/contracts/mocks/RuleEngine/interfaces/IRuleEngine.sol b/contracts/mocks/RuleEngine/interfaces/IRuleEngineMock.sol
similarity index 85%
rename from contracts/mocks/RuleEngine/interfaces/IRuleEngine.sol
rename to contracts/mocks/RuleEngine/interfaces/IRuleEngineMock.sol
index aca217cc..0257418b 100644
--- a/contracts/mocks/RuleEngine/interfaces/IRuleEngine.sol
+++ b/contracts/mocks/RuleEngine/interfaces/IRuleEngineMock.sol
@@ -3,9 +3,9 @@
 pragma solidity ^0.8.0;
 
 import "./IRule.sol";
-import "../../../interfaces/engine/IRuleEngineCMTAT.sol";
+import "../../../interfaces/engine/IRuleEngine.sol";
 
-interface IRuleEngine is IRuleEngineCMTAT {
+interface IRuleEngineMock is IRuleEngine {
     /**
      * @dev define the rules, the precedent rules will be overwritten
      */
diff --git a/contracts/modules/CMTAT_BASE.sol b/contracts/modules/CMTAT_BASE.sol
index 801df619..d9362d28 100644
--- a/contracts/modules/CMTAT_BASE.sol
+++ b/contracts/modules/CMTAT_BASE.sol
@@ -62,7 +62,7 @@ abstract contract CMTAT_BASE is
         uint8 decimalsIrrevocable,
         string memory tokenId_,
         string memory terms_,
-        IRuleEngineCMTAT ruleEngine_,
+        IRuleEngine ruleEngine_,
         string memory information_, 
         uint256 flag_
     ) public initializer {
@@ -91,7 +91,7 @@ abstract contract CMTAT_BASE is
         uint8 decimalsIrrevocable,
         string memory tokenId_,
         string memory terms_,
-        IRuleEngineCMTAT ruleEngine_,
+        IRuleEngine ruleEngine_,
         string memory information_,
         uint256 flag_
     ) internal onlyInitializing {
diff --git a/contracts/modules/internal/ValidationModuleInternal.sol b/contracts/modules/internal/ValidationModuleInternal.sol
index 40d1efbe..a8efbbc2 100644
--- a/contracts/modules/internal/ValidationModuleInternal.sol
+++ b/contracts/modules/internal/ValidationModuleInternal.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
 import "../../../openzeppelin-contracts-upgradeable/contracts/utils/ContextUpgradeable.sol";
 import "../../../openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol";
 import "../../interfaces/draft-IERC1404/draft-IERC1404Wrapper.sol";
-import "../../interfaces/engine/IRuleEngineCMTAT.sol";
+import "../../interfaces/engine/IRuleEngine.sol";
 /**
  * @dev Validation module.
  *
@@ -18,12 +18,12 @@ abstract contract ValidationModuleInternal is
     /**
      * @dev Emitted when a rule engine is set.
      */
-    event RuleEngine(IRuleEngineCMTAT indexed newRuleEngine);
+    event RuleEngine(IRuleEngine indexed newRuleEngine);
 
-    IRuleEngineCMTAT public ruleEngine;
+    IRuleEngine public ruleEngine;
 
     function __Validation_init_unchained(
-        IRuleEngineCMTAT ruleEngine_
+        IRuleEngine ruleEngine_
     ) internal onlyInitializing {
         if (address(ruleEngine_) != address(0)) {
             ruleEngine = ruleEngine_;
diff --git a/contracts/modules/wrapper/controllers/ValidationModule.sol b/contracts/modules/wrapper/controllers/ValidationModule.sol
index ef699c20..60e9a91e 100644
--- a/contracts/modules/wrapper/controllers/ValidationModule.sol
+++ b/contracts/modules/wrapper/controllers/ValidationModule.sol
@@ -33,7 +33,7 @@ abstract contract ValidationModule is
     @param ruleEngine_ the call will be reverted if the new value of ruleEngine is the same as the current one
     */
     function setRuleEngine(
-        IRuleEngineCMTAT ruleEngine_
+        IRuleEngine ruleEngine_
     ) external onlyRole(DEFAULT_ADMIN_ROLE) {
         if (ruleEngine == ruleEngine_)
             revert Errors.CMTAT_ValidationModule_SameValue();
diff --git a/contracts/test/CMTATSnapshot/CMTATSnapshotStandaloneTest.sol b/contracts/test/CMTATSnapshot/CMTATSnapshotStandaloneTest.sol
index 7aaa4bcb..599e3a5a 100644
--- a/contracts/test/CMTATSnapshot/CMTATSnapshotStandaloneTest.sol
+++ b/contracts/test/CMTATSnapshot/CMTATSnapshotStandaloneTest.sol
@@ -27,7 +27,7 @@ contract CMTATSnapshotStandaloneTest is CMTAT_BASE_SnapshotTest {
         uint8 decimalsIrrevocable,
         string memory tokenId_,
         string memory terms_,
-        IRuleEngineCMTAT ruleEngine_,
+        IRuleEngine ruleEngine_,
         string memory information_,
         uint256 flag_
     ) MetaTxModule(forwarderIrrevocable) {
diff --git a/contracts/test/CMTATSnapshot/CMTAT_BASE_SnapshotTest.sol b/contracts/test/CMTATSnapshot/CMTAT_BASE_SnapshotTest.sol
index c8785f33..0e17785f 100644
--- a/contracts/test/CMTATSnapshot/CMTAT_BASE_SnapshotTest.sol
+++ b/contracts/test/CMTATSnapshot/CMTAT_BASE_SnapshotTest.sol
@@ -53,7 +53,7 @@ abstract contract CMTAT_BASE_SnapshotTest is
         uint8 decimalsIrrevocable,
         string memory tokenId_,
         string memory terms_,
-        IRuleEngineCMTAT ruleEngine_,
+        IRuleEngine ruleEngine_,
         string memory information_,
         uint256 flag_
     ) public initializer {
@@ -82,7 +82,7 @@ abstract contract CMTAT_BASE_SnapshotTest is
         uint8 decimalsIrrevocable,
         string memory tokenId_,
         string memory terms_,
-        IRuleEngineCMTAT ruleEngine_,
+        IRuleEngine ruleEngine_,
         string memory information_,
         uint256 flag_
     ) internal onlyInitializing {