diff --git a/src/BaseStrategy.sol b/src/BaseStrategy.sol
index 86fc8d6..ef438ba 100644
--- a/src/BaseStrategy.sol
+++ b/src/BaseStrategy.sol
@@ -52,7 +52,7 @@ abstract contract BaseStrategy {
      * @dev Use to assure that the call is coming from the strategies management.
      */
     modifier onlyManagement() {
-        TokenizedStrategy.isManagement(msg.sender);
+        require(TokenizedStrategy.isManagement(msg.sender), "!management");
         _;
     }
 
@@ -61,7 +61,7 @@ abstract contract BaseStrategy {
      * management or the keeper.
      */
     modifier onlyKeepers() {
-        TokenizedStrategy.isKeeperOrManagement(msg.sender);
+        require(TokenizedStrategy.isKeeperOrManagement(msg.sender), "!keeper");
         _;
     }
 
@@ -70,7 +70,10 @@ abstract contract BaseStrategy {
      * management or the emergency admin.
      */
     modifier onlyEmergencyAuthorized() {
-        TokenizedStrategy.isEmergencyAuthorized(msg.sender);
+        require(
+            TokenizedStrategy.isEmergencyAuthorized(msg.sender),
+            "!emergency authorized"
+        );
         _;
     }
 
@@ -145,7 +148,7 @@ abstract contract BaseStrategy {
         // Initialize the strategy's storage variables.
         _delegateCall(
             abi.encodeCall(
-                ITokenizedStrategy.init,
+                ITokenizedStrategy.initialize,
                 (_asset, _name, msg.sender, msg.sender, msg.sender)
             )
         );
diff --git a/src/TokenizedStrategy.sol b/src/TokenizedStrategy.sol
index 5fb72e7..2182806 100644
--- a/src/TokenizedStrategy.sol
+++ b/src/TokenizedStrategy.sol
@@ -254,7 +254,7 @@ contract TokenizedStrategy {
      * @dev Require that the call is coming from the strategies management.
      */
     modifier onlyManagement() {
-        isManagement(msg.sender);
+        require(isManagement(msg.sender), "!management");
         _;
     }
 
@@ -263,7 +263,7 @@ contract TokenizedStrategy {
      * management or the keeper.
      */
     modifier onlyKeepers() {
-        isKeeperOrManagement(msg.sender);
+        require(isKeeperOrManagement(msg.sender), "!keeper");
         _;
     }
 
@@ -272,7 +272,7 @@ contract TokenizedStrategy {
      * management or the emergency admin.
      */
     modifier onlyEmergencyAuthorized() {
-        isEmergencyAuthorized(msg.sender);
+        require(isEmergencyAuthorized(msg.sender), "!emergency authorized");
         _;
     }
 
@@ -306,8 +306,7 @@ contract TokenizedStrategy {
      * @param _sender The original msg.sender.
      */
     function isManagement(address _sender) public view returns (bool) {
-        require(_sender == _strategyStorage().management, "!management");
-        return true;
+        return _sender == _strategyStorage().management;
     }
 
     /**
@@ -324,8 +323,7 @@ contract TokenizedStrategy {
      */
     function isKeeperOrManagement(address _sender) public view returns (bool) {
         StrategyData storage S = _strategyStorage();
-        require(_sender == S.keeper || _sender == S.management, "!keeper");
-        return true;
+        return _sender == S.keeper || _sender == S.management;
     }
 
     /**
@@ -342,11 +340,7 @@ contract TokenizedStrategy {
      */
     function isEmergencyAuthorized(address _sender) public view returns (bool) {
         StrategyData storage S = _strategyStorage();
-        require(
-            _sender == S.emergencyAdmin || _sender == S.management,
-            "!emergency authorized"
-        );
-        return true;
+        return _sender == S.emergencyAdmin || _sender == S.management;
     }
 
     /*//////////////////////////////////////////////////////////////
@@ -440,7 +434,7 @@ contract TokenizedStrategy {
      * @param _performanceFeeRecipient Address to receive performance fees.
      * @param _keeper Address to set as strategies `keeper`.
      */
-    function init(
+    function initialize(
         address _asset,
         string memory _name,
         address _management,
diff --git a/src/interfaces/ITokenizedStrategy.sol b/src/interfaces/ITokenizedStrategy.sol
index 201fe8d..c610350 100644
--- a/src/interfaces/ITokenizedStrategy.sol
+++ b/src/interfaces/ITokenizedStrategy.sol
@@ -40,7 +40,7 @@ interface ITokenizedStrategy is IERC4626, IERC20Permit {
                            INITIALIZATION
     //////////////////////////////////////////////////////////////*/
 
-    function init(
+    function initialize(
         address _asset,
         string memory _name,
         address _management,
diff --git a/src/test/AccessControl.t.sol b/src/test/AccessControl.t.sol
index 4fe82c3..4c1367c 100644
--- a/src/test/AccessControl.t.sol
+++ b/src/test/AccessControl.t.sol
@@ -240,7 +240,7 @@ contract AccessControlTest is Setup {
         assertEq(tokenizedStrategy.keeper(), address(0));
 
         vm.expectRevert("initialized");
-        tokenizedStrategy.init(
+        tokenizedStrategy.initialize(
             address(asset),
             name_,
             _address,