diff --git a/contracts/core/Modifier.sol b/contracts/core/Modifier.sol
index b1153de4..2e4d454a 100644
--- a/contracts/core/Modifier.sol
+++ b/contracts/core/Modifier.sol
@@ -25,7 +25,7 @@ abstract contract Modifier is Module, MiniAvatar, IAvatar {
         uint256 value,
         bytes calldata data,
         Enum.Operation operation
-    ) public virtual override onlyOwner returns (bool success) {}
+    ) public virtual override moduleOnly returns (bool success) {}
 
     /// @dev Passes a transaction to the modifier, expects return data.
     /// @notice Can only be called by enabled modules.
@@ -42,7 +42,7 @@ abstract contract Modifier is Module, MiniAvatar, IAvatar {
         public
         virtual
         override
-        onlyOwner
+        moduleOnly
         returns (bool success, bytes memory returnData)
     {}
 }
diff --git a/contracts/core/ModifierGuardable.sol b/contracts/core/ModifierGuardable.sol
index f2aa7261..90f81495 100644
--- a/contracts/core/ModifierGuardable.sol
+++ b/contracts/core/ModifierGuardable.sol
@@ -24,7 +24,7 @@ abstract contract ModifierGuardable is ModuleGuardable, MiniAvatar, IAvatar {
         uint256 value,
         bytes calldata data,
         Enum.Operation operation
-    ) public virtual override onlyOwner returns (bool success) {}
+    ) public virtual override moduleOnly returns (bool success) {}
 
     /// @dev Passes a transaction to the modifier, expects return data.
     /// @notice Can only be called by enabled modules.
@@ -41,7 +41,7 @@ abstract contract ModifierGuardable is ModuleGuardable, MiniAvatar, IAvatar {
         public
         virtual
         override
-        onlyOwner
+        moduleOnly
         returns (bool success, bytes memory returnData)
     {}
 }