diff --git a/contracts/arbitrum/connectors/spell/events.sol b/contracts/arbitrum/connectors/spell/events.sol
index 75048eff..036c990f 100644
--- a/contracts/arbitrum/connectors/spell/events.sol
+++ b/contracts/arbitrum/connectors/spell/events.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
 pragma abicoder v2;
 
 contract Events {
-	event LogCastDSA(
+	event LogCastOnDSA(
 		address indexed targetDSA,
 		string[] connectors,
 		bytes[] datas
 	);
-	event LogCastSpells(string[] eventNames, bytes[] eventParams);
+	event LogRetrySpell(string[] eventNames, bytes[] eventParams);
 }
diff --git a/contracts/arbitrum/connectors/spell/main.sol b/contracts/arbitrum/connectors/spell/main.sol
index 47d65d38..54d26cec 100644
--- a/contracts/arbitrum/connectors/spell/main.sol
+++ b/contracts/arbitrum/connectors/spell/main.sol
@@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castDSA(
+	function castOnDSA(
 		address targetDSA,
 		string[] memory connectors,
 		bytes[] memory datas
@@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
 
 		AccountInterface(targetDSA).cast(connectors, datas, address(this));
 
-		_eventName = "LogCastDSA(address,string[],bytes[])";
+		_eventName = "LogCastOnDSA(address,string[],bytes[])";
 		_eventParam = abi.encode(targetDSA, connectors, datas);
 	}
 
@@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castSpells(string[] memory connectors, bytes[] memory datas)
+	function retrySpell(string[] memory connectors, bytes[] memory datas)
 		external
 		payable
 		returns (string memory eventName, bytes memory eventParam)
@@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
 		for (uint256 i = 0; i < _length; i++) {
 			(bool success, bytes memory returnData) = _connectors[i]
 				.delegatecall(datas[i]);
-			require(success, "spells-failed");
-			(_eventNames[i], _eventParams[i]) = abi.decode(
-				returnData,
-				(string, bytes)
-			);
+
+			if (success) {
+				(_eventNames[i], _eventParams[i]) = abi.decode(
+					returnData,
+					(string, bytes)
+				);
+			}
 		}
 
-		eventName = "LogCastSpells(string[],bytes[])";
+		eventName = "LogRetrySpell(string[],bytes[])";
 		eventParam = abi.encode(_eventNames, _eventParams);
 	}
 }
diff --git a/contracts/avalanche/connectors/spell/events.sol b/contracts/avalanche/connectors/spell/events.sol
index 75048eff..036c990f 100644
--- a/contracts/avalanche/connectors/spell/events.sol
+++ b/contracts/avalanche/connectors/spell/events.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
 pragma abicoder v2;
 
 contract Events {
-	event LogCastDSA(
+	event LogCastOnDSA(
 		address indexed targetDSA,
 		string[] connectors,
 		bytes[] datas
 	);
-	event LogCastSpells(string[] eventNames, bytes[] eventParams);
+	event LogRetrySpell(string[] eventNames, bytes[] eventParams);
 }
diff --git a/contracts/avalanche/connectors/spell/main.sol b/contracts/avalanche/connectors/spell/main.sol
index d203022e..b09a80b9 100644
--- a/contracts/avalanche/connectors/spell/main.sol
+++ b/contracts/avalanche/connectors/spell/main.sol
@@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castDSA(
+	function castOnDSA(
 		address targetDSA,
 		string[] memory connectors,
 		bytes[] memory datas
@@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
 
 		AccountInterface(targetDSA).cast(connectors, datas, address(this));
 
-		_eventName = "LogCastDSA(address,string[],bytes[])";
+		_eventName = "LogCastOnDSA(address,string[],bytes[])";
 		_eventParam = abi.encode(targetDSA, connectors, datas);
 	}
 
@@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castSpells(string[] memory connectors, bytes[] memory datas)
+	function retrySpell(string[] memory connectors, bytes[] memory datas)
 		external
 		payable
 		returns (string memory eventName, bytes memory eventParam)
@@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
 		for (uint256 i = 0; i < _length; i++) {
 			(bool success, bytes memory returnData) = _connectors[i]
 				.delegatecall(datas[i]);
-			require(success, "spells-failed");
-			(_eventNames[i], _eventParams[i]) = abi.decode(
-				returnData,
-				(string, bytes)
-			);
+
+			if (success) {
+				(_eventNames[i], _eventParams[i]) = abi.decode(
+					returnData,
+					(string, bytes)
+				);
+			}
 		}
 
-		eventName = "LogCastSpells(string[],bytes[])";
+		eventName = "LogRetrySpell(string[],bytes[])";
 		eventParam = abi.encode(_eventNames, _eventParams);
 	}
 }
diff --git a/contracts/fantom/connectors/spell/events.sol b/contracts/fantom/connectors/spell/events.sol
index 75048eff..036c990f 100644
--- a/contracts/fantom/connectors/spell/events.sol
+++ b/contracts/fantom/connectors/spell/events.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
 pragma abicoder v2;
 
 contract Events {
-	event LogCastDSA(
+	event LogCastOnDSA(
 		address indexed targetDSA,
 		string[] connectors,
 		bytes[] datas
 	);
-	event LogCastSpells(string[] eventNames, bytes[] eventParams);
+	event LogRetrySpell(string[] eventNames, bytes[] eventParams);
 }
diff --git a/contracts/fantom/connectors/spell/main.sol b/contracts/fantom/connectors/spell/main.sol
index 15bce48d..6c86a123 100644
--- a/contracts/fantom/connectors/spell/main.sol
+++ b/contracts/fantom/connectors/spell/main.sol
@@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castDSA(
+	function castOnDSA(
 		address targetDSA,
 		string[] memory connectors,
 		bytes[] memory datas
@@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
 
 		AccountInterface(targetDSA).cast(connectors, datas, address(this));
 
-		_eventName = "LogCastDSA(address,string[],bytes[])";
+		_eventName = "LogCastOnDSA(address,string[],bytes[])";
 		_eventParam = abi.encode(targetDSA, connectors, datas);
 	}
 
@@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castSpells(string[] memory connectors, bytes[] memory datas)
+	function retrySpell(string[] memory connectors, bytes[] memory datas)
 		external
 		payable
 		returns (string memory eventName, bytes memory eventParam)
@@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
 		for (uint256 i = 0; i < _length; i++) {
 			(bool success, bytes memory returnData) = _connectors[i]
 				.delegatecall(datas[i]);
-			require(success, "spells-failed");
-			(_eventNames[i], _eventParams[i]) = abi.decode(
-				returnData,
-				(string, bytes)
-			);
+
+			if (success) {
+				(_eventNames[i], _eventParams[i]) = abi.decode(
+					returnData,
+					(string, bytes)
+				);
+			}
 		}
 
-		eventName = "LogCastSpells(string[],bytes[])";
+		eventName = "LogRetrySpell(string[],bytes[])";
 		eventParam = abi.encode(_eventNames, _eventParams);
 	}
 }
diff --git a/contracts/mainnet/connectors/spell/events.sol b/contracts/mainnet/connectors/spell/events.sol
index 75048eff..036c990f 100644
--- a/contracts/mainnet/connectors/spell/events.sol
+++ b/contracts/mainnet/connectors/spell/events.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
 pragma abicoder v2;
 
 contract Events {
-	event LogCastDSA(
+	event LogCastOnDSA(
 		address indexed targetDSA,
 		string[] connectors,
 		bytes[] datas
 	);
-	event LogCastSpells(string[] eventNames, bytes[] eventParams);
+	event LogRetrySpell(string[] eventNames, bytes[] eventParams);
 }
diff --git a/contracts/mainnet/connectors/spell/main.sol b/contracts/mainnet/connectors/spell/main.sol
index d2ca441e..c1a92dea 100644
--- a/contracts/mainnet/connectors/spell/main.sol
+++ b/contracts/mainnet/connectors/spell/main.sol
@@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castDSA(
+	function castOnDSA(
 		address targetDSA,
 		string[] memory connectors,
 		bytes[] memory datas
@@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
 
 		AccountInterface(targetDSA).cast(connectors, datas, address(this));
 
-		_eventName = "LogCastDSA(address,string[],bytes[])";
+		_eventName = "LogCastOnDSA(address,string[],bytes[])";
 		_eventParam = abi.encode(targetDSA, connectors, datas);
 	}
 
@@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castSpells(string[] memory connectors, bytes[] memory datas)
+	function retrySpell(string[] memory connectors, bytes[] memory datas)
 		external
 		payable
 		returns (string memory eventName, bytes memory eventParam)
@@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
 		for (uint256 i = 0; i < _length; i++) {
 			(bool success, bytes memory returnData) = _connectors[i]
 				.delegatecall(datas[i]);
-			require(success, "spells-failed");
-			(_eventNames[i], _eventParams[i]) = abi.decode(
-				returnData,
-				(string, bytes)
-			);
+
+			if (success) {
+				(_eventNames[i], _eventParams[i]) = abi.decode(
+					returnData,
+					(string, bytes)
+				);
+			}
 		}
 
-		eventName = "LogCastSpells(string[],bytes[])";
+		eventName = "LogRetrySpell(string[],bytes[])";
 		eventParam = abi.encode(_eventNames, _eventParams);
 	}
 }
diff --git a/contracts/optimism/connectors/spell/events.sol b/contracts/optimism/connectors/spell/events.sol
index 75048eff..036c990f 100644
--- a/contracts/optimism/connectors/spell/events.sol
+++ b/contracts/optimism/connectors/spell/events.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
 pragma abicoder v2;
 
 contract Events {
-	event LogCastDSA(
+	event LogCastOnDSA(
 		address indexed targetDSA,
 		string[] connectors,
 		bytes[] datas
 	);
-	event LogCastSpells(string[] eventNames, bytes[] eventParams);
+	event LogRetrySpell(string[] eventNames, bytes[] eventParams);
 }
diff --git a/contracts/optimism/connectors/spell/main.sol b/contracts/optimism/connectors/spell/main.sol
index 821c6b0b..557aeed0 100644
--- a/contracts/optimism/connectors/spell/main.sol
+++ b/contracts/optimism/connectors/spell/main.sol
@@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castDSA(
+	function castOnDSA(
 		address targetDSA,
 		string[] memory connectors,
 		bytes[] memory datas
@@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
 
 		AccountInterface(targetDSA).cast(connectors, datas, address(this));
 
-		_eventName = "LogCastDSA(address,string[],bytes[])";
+		_eventName = "LogCastOnDSA(address,string[],bytes[])";
 		_eventParam = abi.encode(targetDSA, connectors, datas);
 	}
 
@@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castSpells(string[] memory connectors, bytes[] memory datas)
+	function retrySpell(string[] memory connectors, bytes[] memory datas)
 		external
 		payable
 		returns (string memory eventName, bytes memory eventParam)
@@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
 		for (uint256 i = 0; i < _length; i++) {
 			(bool success, bytes memory returnData) = _connectors[i]
 				.delegatecall(datas[i]);
-			require(success, "spells-failed");
-			(_eventNames[i], _eventParams[i]) = abi.decode(
-				returnData,
-				(string, bytes)
-			);
+
+			if (success) {
+				(_eventNames[i], _eventParams[i]) = abi.decode(
+					returnData,
+					(string, bytes)
+				);
+			}
 		}
 
-		eventName = "LogCastSpells(string[],bytes[])";
+		eventName = "LogRetrySpell(string[],bytes[])";
 		eventParam = abi.encode(_eventNames, _eventParams);
 	}
 }
diff --git a/contracts/polygon/connectors/spell/events.sol b/contracts/polygon/connectors/spell/events.sol
index 75048eff..036c990f 100644
--- a/contracts/polygon/connectors/spell/events.sol
+++ b/contracts/polygon/connectors/spell/events.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
 pragma abicoder v2;
 
 contract Events {
-	event LogCastDSA(
+	event LogCastOnDSA(
 		address indexed targetDSA,
 		string[] connectors,
 		bytes[] datas
 	);
-	event LogCastSpells(string[] eventNames, bytes[] eventParams);
+	event LogRetrySpell(string[] eventNames, bytes[] eventParams);
 }
diff --git a/contracts/polygon/connectors/spell/main.sol b/contracts/polygon/connectors/spell/main.sol
index 0252cc63..3d44cb3a 100644
--- a/contracts/polygon/connectors/spell/main.sol
+++ b/contracts/polygon/connectors/spell/main.sol
@@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castDSA(
+	function castOnDSA(
 		address targetDSA,
 		string[] memory connectors,
 		bytes[] memory datas
@@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
 
 		AccountInterface(targetDSA).cast(connectors, datas, address(this));
 
-		_eventName = "LogCastDSA(address,string[],bytes[])";
+		_eventName = "LogCastOnDSA(address,string[],bytes[])";
 		_eventParam = abi.encode(targetDSA, connectors, datas);
 	}
 
@@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
 	 *@param connectors Array of connector names.
 	 *@param datas Array of connector calldatas.
 	 */
-	function castSpells(string[] memory connectors, bytes[] memory datas)
+	function retrySpell(string[] memory connectors, bytes[] memory datas)
 		external
 		payable
 		returns (string memory eventName, bytes memory eventParam)
@@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
 		for (uint256 i = 0; i < _length; i++) {
 			(bool success, bytes memory returnData) = _connectors[i]
 				.delegatecall(datas[i]);
-			require(success, "spells-failed");
-			(_eventNames[i], _eventParams[i]) = abi.decode(
-				returnData,
-				(string, bytes)
-			);
+
+			if (success) {
+				(_eventNames[i], _eventParams[i]) = abi.decode(
+					returnData,
+					(string, bytes)
+				);
+			}
 		}
 
-		eventName = "LogCastSpells(string[],bytes[])";
+		eventName = "LogRetrySpell(string[],bytes[])";
 		eventParam = abi.encode(_eventNames, _eventParams);
 	}
 }