diff --git a/src/interfaces/IPoolManager.sol b/src/interfaces/IPoolManager.sol
index 07d926f3d..67eea4a18 100644
--- a/src/interfaces/IPoolManager.sol
+++ b/src/interfaces/IPoolManager.sol
@@ -140,7 +140,7 @@ interface IPoolManager is IProtocolFees, IERC6909Claims, IExtsload, IExttload {
     /// @param hookData Any data to pass to the callback, via `IUnlockCallback(msg.sender).unlockCallback(data)`
     /// @return swapDeltas The balance delta of the address swapping
     /// @dev Swapping on low liquidity pools may cause unexpected swap amounts when liquidity available is less than amountSpecified.
-    /// Additionally note that if interacting with hooks that have the BEFORE_SWAP_RETURNS_DELTAS_FLAG or AFTER_SWAP_RETURNS_DELTA_FLAG
+    /// Additionally note that if interacting with hooks that have the BEFORE_SWAP_RETURN_DELTAS_FLAG or AFTER_SWAP_RETURN_DELTA_FLAG
     /// the hook may alter the swap input/output. Integrators should perform checks on the returned swapDeltas.
     function swap(PoolKey memory key, SwapParams memory params, bytes calldata hookData)
         external
diff --git a/src/libraries/Hooks.sol b/src/libraries/Hooks.sol
index 35f75b0ea..73f7c85be 100644
--- a/src/libraries/Hooks.sol
+++ b/src/libraries/Hooks.sol
@@ -40,10 +40,10 @@ library Hooks {
     uint160 internal constant BEFORE_DONATE_FLAG = 1 << 5;
     uint160 internal constant AFTER_DONATE_FLAG = 1 << 4;
 
-    uint160 internal constant BEFORE_SWAP_RETURNS_DELTAS_FLAG = 1 << 3;
-    uint160 internal constant AFTER_SWAP_RETURNS_DELTA_FLAG = 1 << 2;
-    uint160 internal constant AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG = 1 << 1;
-    uint160 internal constant AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG = 1 << 0;
+    uint160 internal constant BEFORE_SWAP_RETURN_DELTAS_FLAG = 1 << 3;
+    uint160 internal constant AFTER_SWAP_RETURN_DELTA_FLAG = 1 << 2;
+    uint160 internal constant AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG = 1 << 1;
+    uint160 internal constant AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG = 1 << 0;
 
     struct Permissions {
         bool beforeInitialize;
@@ -91,11 +91,11 @@ library Hooks {
                 || permissions.afterSwap != self.hasPermission(AFTER_SWAP_FLAG)
                 || permissions.beforeDonate != self.hasPermission(BEFORE_DONATE_FLAG)
                 || permissions.afterDonate != self.hasPermission(AFTER_DONATE_FLAG)
-                || permissions.beforeSwapReturnDeltas != self.hasPermission(BEFORE_SWAP_RETURNS_DELTAS_FLAG)
-                || permissions.afterSwapReturnDelta != self.hasPermission(AFTER_SWAP_RETURNS_DELTA_FLAG)
-                || permissions.afterAddLiquidityReturnDeltas != self.hasPermission(AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG)
+                || permissions.beforeSwapReturnDeltas != self.hasPermission(BEFORE_SWAP_RETURN_DELTAS_FLAG)
+                || permissions.afterSwapReturnDelta != self.hasPermission(AFTER_SWAP_RETURN_DELTA_FLAG)
+                || permissions.afterAddLiquidityReturnDeltas != self.hasPermission(AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG)
                 || permissions.afterRemoveLiquidityReturnDeltas
-                    != self.hasPermission(AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG)
+                    != self.hasPermission(AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG)
         ) {
             HookAddressNotValid.selector.revertWith(address(self));
         }
@@ -106,15 +106,15 @@ library Hooks {
     /// @return bool True if the hook address is valid
     function isValidHookAddress(IHooks self, uint24 fee) internal pure returns (bool) {
         // The hook can only have a flag to return a hook delta on an action if it also has the corresponding action flag
-        if (!self.hasPermission(BEFORE_SWAP_FLAG) && self.hasPermission(BEFORE_SWAP_RETURNS_DELTAS_FLAG)) return false;
-        if (!self.hasPermission(AFTER_SWAP_FLAG) && self.hasPermission(AFTER_SWAP_RETURNS_DELTA_FLAG)) return false;
-        if (!self.hasPermission(AFTER_ADD_LIQUIDITY_FLAG) && self.hasPermission(AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG))
+        if (!self.hasPermission(BEFORE_SWAP_FLAG) && self.hasPermission(BEFORE_SWAP_RETURN_DELTAS_FLAG)) return false;
+        if (!self.hasPermission(AFTER_SWAP_FLAG) && self.hasPermission(AFTER_SWAP_RETURN_DELTA_FLAG)) return false;
+        if (!self.hasPermission(AFTER_ADD_LIQUIDITY_FLAG) && self.hasPermission(AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG))
         {
             return false;
         }
         if (
             !self.hasPermission(AFTER_REMOVE_LIQUIDITY_FLAG)
-                && self.hasPermission(AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG)
+                && self.hasPermission(AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG)
         ) return false;
 
         // If there is no hook contract set, then fee cannot be dynamic
@@ -228,7 +228,7 @@ library Hooks {
                 hookDeltas = BalanceDeltas.wrap(
                     self.callHookWithReturnDeltas(
                         abi.encodeCall(IHooks.afterAddLiquidity, (msg.sender, key, params, deltas, hookData)),
-                        self.hasPermission(AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG)
+                        self.hasPermission(AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG)
                     )
                 );
                 callerDeltas = callerDeltas - hookDeltas;
@@ -238,7 +238,7 @@ library Hooks {
                 hookDeltas = BalanceDeltas.wrap(
                     self.callHookWithReturnDeltas(
                         abi.encodeCall(IHooks.afterRemoveLiquidity, (msg.sender, key, params, deltas, hookData)),
-                        self.hasPermission(AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG)
+                        self.hasPermission(AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG)
                     )
                 );
                 callerDeltas = callerDeltas - hookDeltas;
@@ -261,7 +261,7 @@ library Hooks {
             if (key.fee.isDynamicFee()) lpFeeOverride = result.parseFee();
 
             // skip this logic for the case where the hook return is 0
-            if (self.hasPermission(BEFORE_SWAP_RETURNS_DELTAS_FLAG)) {
+            if (self.hasPermission(BEFORE_SWAP_RETURN_DELTAS_FLAG)) {
                 hookReturn = BeforeSwapDeltas.wrap(result.parseReturnDeltas());
 
                 // any return in unspecified is passed to the afterSwap hook for handling
@@ -291,20 +291,20 @@ library Hooks {
         if (msg.sender == address(self)) return (swapDeltas, BalanceDeltasLibrary.ZERO_DELTAS);
 
         int128 hookDeltaSpecified = beforeSwapHookReturn.getSpecifiedDelta();
-        int128 hookDeltasUnspecified = beforeSwapHookReturn.getUnspecifiedDelta();
+        int128 hookDeltaUnspecified = beforeSwapHookReturn.getUnspecifiedDelta();
 
         if (self.hasPermission(AFTER_SWAP_FLAG)) {
-            hookDeltasUnspecified += self.callHookWithReturnDeltas(
+            hookDeltaUnspecified += self.callHookWithReturnDeltas(
                 abi.encodeCall(IHooks.afterSwap, (msg.sender, key, params, swapDeltas, hookData)),
-                self.hasPermission(AFTER_SWAP_RETURNS_DELTA_FLAG)
+                self.hasPermission(AFTER_SWAP_RETURN_DELTA_FLAG)
             ).toInt128();
         }
 
         BalanceDeltas hookDeltas;
-        if (hookDeltasUnspecified != 0 || hookDeltaSpecified != 0) {
+        if (hookDeltaUnspecified != 0 || hookDeltaSpecified != 0) {
             hookDeltas = (params.amountSpecified < 0 == params.zeroForOne)
-                ? toBalanceDeltas(hookDeltaSpecified, hookDeltasUnspecified)
-                : toBalanceDeltas(hookDeltasUnspecified, hookDeltaSpecified);
+                ? toBalanceDeltas(hookDeltaSpecified, hookDeltaUnspecified)
+                : toBalanceDeltas(hookDeltaUnspecified, hookDeltaSpecified);
 
             // the caller has to pay for (or receive) the hook's deltas
             swapDeltas = swapDeltas - hookDeltas;
diff --git a/src/test/CustomCurveHook.sol b/src/test/CustomCurveHook.sol
index 5c3cf6ef4..77e8cc57b 100644
--- a/src/test/CustomCurveHook.sol
+++ b/src/test/CustomCurveHook.sol
@@ -53,7 +53,7 @@ contract CustomCurveHook is BaseTestHooks {
         address, /* sender **/
         PoolKey calldata, /* key **/
         IPoolManager.ModifyLiquidityParams calldata, /* params **/
-        BalanceDeltas, /* delta **/
+        BalanceDeltas, /* deltas **/
         bytes calldata /* hookData **/
     ) external view override onlyPoolManager returns (bytes4, BalanceDeltas) {
         revert AddLiquidityDirectToHook();
diff --git a/test/CustomAccounting.t.sol b/test/CustomAccounting.t.sol
index 931d0de7d..c3ae1c512 100644
--- a/test/CustomAccounting.t.sol
+++ b/test/CustomAccounting.t.sol
@@ -25,13 +25,13 @@ contract CustomAccountingTest is Test, Deployers, GasSnapshot {
     }
 
     function _setUpDeltaReturnFuzzPool() internal {
-        address hookAddr = address(uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
+        address hookAddr = address(uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
         address impl = address(new DeltaReturningHook(manager));
         _etchHookAndInitPool(hookAddr, impl);
     }
 
     function _setUpCustomCurvePool() internal {
-        address hookAddr = address(uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
+        address hookAddr = address(uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
         address impl = address(new CustomCurveHook(manager));
         _etchHookAndInitPool(hookAddr, impl);
     }
@@ -39,9 +39,9 @@ contract CustomAccountingTest is Test, Deployers, GasSnapshot {
     function _setUpFeeTakingPool() internal {
         address hookAddr = address(
             uint160(
-                Hooks.AFTER_SWAP_FLAG | Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG | Hooks.AFTER_ADD_LIQUIDITY_FLAG
-                    | Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG | Hooks.AFTER_REMOVE_LIQUIDITY_FLAG
-                    | Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG
+                Hooks.AFTER_SWAP_FLAG | Hooks.AFTER_SWAP_RETURN_DELTA_FLAG | Hooks.AFTER_ADD_LIQUIDITY_FLAG
+                    | Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG | Hooks.AFTER_REMOVE_LIQUIDITY_FLAG
+                    | Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG
             )
         );
         address impl = address(new FeeTakingHook(manager));
diff --git a/test/Reserves.t.sol b/test/Reserves.t.sol
index 99c5ada75..c6c2775c4 100644
--- a/test/Reserves.t.sol
+++ b/test/Reserves.t.sol
@@ -25,13 +25,13 @@ contract ReservesTest is Test {
         assertEq(value, 0);
     }
 
-    function test_getReserves_returns_set() public {
+    function test_getReserves_RETURN_set() public {
         currency0.setReserves(100);
         uint256 value = currency0.getReserves();
         assertEq(value, 100);
     }
 
-    function test_set_twice_returns_correct_value() public {
+    function test_set_twice_RETURN_correct_value() public {
         currency0.setReserves(100);
         currency0.setReserves(200);
         uint256 value = currency0.getReserves();
diff --git a/test/libraries/Hooks.t.sol b/test/libraries/Hooks.t.sol
index d2b36a794..705ce399f 100644
--- a/test/libraries/Hooks.t.sol
+++ b/test/libraries/Hooks.t.sol
@@ -227,10 +227,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeInitialize(uint160 addr) public view {
@@ -266,10 +266,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_afterInitialize(uint160 addr) public view {
@@ -305,10 +305,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeAndAfterInitialize(uint160 addr) public view {
@@ -343,10 +343,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeAddLiquidity(uint160 addr) public view {
@@ -381,10 +381,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_afterAddLiquidity(uint160 addr) public view {
@@ -419,10 +419,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeAndAfterAddLiquidity(uint160 addr) public view {
@@ -458,10 +458,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeRemoveLiquidity(uint160 addr) public view {
@@ -496,10 +496,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_afterRemoveLiquidity(uint160 addr) public view {
@@ -534,10 +534,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeAfterRemoveLiquidity(uint160 addr) public view {
@@ -573,10 +573,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeInitializeAfterAddLiquidity(uint160 addr) public view {
@@ -612,10 +612,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeSwap(uint160 addr) public view {
@@ -650,10 +650,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_afterSwap(uint160 addr) public view {
@@ -688,10 +688,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertTrue(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeAndAfterSwap(uint160 addr) public view {
@@ -726,10 +726,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertTrue(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeDonate(uint160 addr) public view {
@@ -764,10 +764,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertTrue(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_afterDonate(uint160 addr) public view {
@@ -802,10 +802,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertFalse(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertTrue(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_beforeAndAfterDonate(uint160 addr) public view {
@@ -840,10 +840,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertTrue(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertTrue(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertFalse(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookPermissions_allHooks(uint160 addr) public view {
@@ -879,10 +879,10 @@ contract HooksTest is Test, Deployers, GasSnapshot {
         assertTrue(hookAddr.hasPermission(Hooks.AFTER_SWAP_FLAG));
         assertTrue(hookAddr.hasPermission(Hooks.BEFORE_DONATE_FLAG));
         assertTrue(hookAddr.hasPermission(Hooks.AFTER_DONATE_FLAG));
-        assertTrue(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG));
-        assertTrue(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG));
-        assertTrue(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG));
-        assertTrue(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG));
+        assertTrue(hookAddr.hasPermission(Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG));
+        assertTrue(hookAddr.hasPermission(Hooks.AFTER_SWAP_RETURN_DELTA_FLAG));
+        assertTrue(hookAddr.hasPermission(Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG));
+        assertTrue(hookAddr.hasPermission(Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG));
     }
 
     function test_fuzz_validateHookAddress_failsAllHooks(uint160 addr, uint16 mask) public {
@@ -967,13 +967,13 @@ contract HooksTest is Test, Deployers, GasSnapshot {
 
     function test_fuzz_isValidHookAddress_invalid_returnsDeltaWithoutHookFlag(uint160 addr) public view {
         uint160 preAddr = addr & clearAllHookPermissionsMask;
-        IHooks hookAddr = IHooks(address(uint160(preAddr | Hooks.BEFORE_SWAP_RETURNS_DELTAS_FLAG)));
+        IHooks hookAddr = IHooks(address(uint160(preAddr | Hooks.BEFORE_SWAP_RETURN_DELTAS_FLAG)));
         assertFalse(Hooks.isValidHookAddress(hookAddr, 3000));
-        hookAddr = IHooks(address(uint160(preAddr | Hooks.AFTER_SWAP_RETURNS_DELTA_FLAG)));
+        hookAddr = IHooks(address(uint160(preAddr | Hooks.AFTER_SWAP_RETURN_DELTA_FLAG)));
         assertFalse(Hooks.isValidHookAddress(hookAddr, 3000));
-        hookAddr = IHooks(address(uint160(preAddr | Hooks.AFTER_ADD_LIQUIDITY_RETURNS_DELTAS_FLAG)));
+        hookAddr = IHooks(address(uint160(preAddr | Hooks.AFTER_ADD_LIQUIDITY_RETURN_DELTAS_FLAG)));
         assertFalse(Hooks.isValidHookAddress(hookAddr, 3000));
-        hookAddr = IHooks(address(uint160(preAddr | Hooks.AFTER_REMOVE_LIQUIDITY_RETURNS_DELTAS_FLAG)));
+        hookAddr = IHooks(address(uint160(preAddr | Hooks.AFTER_REMOVE_LIQUIDITY_RETURN_DELTAS_FLAG)));
         assertFalse(Hooks.isValidHookAddress(hookAddr, 3000));
     }